summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Slice/JavaUtil.cpp8
-rw-r--r--cpp/src/Slice/Parser.cpp12
-rw-r--r--cpp/src/Slice/Python.cpp2
-rw-r--r--cpp/src/Slice/PythonUtil.cpp10
-rw-r--r--cpp/src/Slice/Scanner.cpp2
-rw-r--r--cpp/src/Slice/Scanner.l2
-rw-r--r--cpp/src/slice2cpp/Gen.cpp18
-rw-r--r--cpp/src/slice2cpp/Gen.h8
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp4
-rw-r--r--cpp/src/slice2java/Main.cpp2
-rw-r--r--cpp/src/slice2js/Gen.cpp4
-rw-r--r--cpp/src/slice2js/JsUtil.cpp2
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp8
-rw-r--r--cpp/test/Slice/errorDetection/WarningInvalidMetaData.err22
14 files changed, 52 insertions, 52 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 78dd64f2080..51b2a512181 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -139,7 +139,7 @@ public:
static const string prefix = "java:";
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
//
StringList files = p->allFiles();
@@ -166,7 +166,7 @@ public:
}
else
{
- dc->warning(InvalidMetaData, file, "", "ignoring invalid global metadata `" + s + "'");
+ dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'");
globalMetaData.remove(s);
continue;
}
@@ -953,7 +953,7 @@ Slice::JavaCompatGenerator::getPackagePrefix(const ContainedPtr& cont) const
assert(m);
//
- // The java:package metadata can be defined as global metadata or applied to a top-level module.
+ // The java:package metadata can be defined as file metadata or applied to a top-level module.
// We check for the metadata at the top-level module first and then fall back to the global scope.
//
static const string prefix = "java:package:";
@@ -3433,7 +3433,7 @@ Slice::JavaGenerator::getPackagePrefix(const ContainedPtr& cont) const
assert(m);
//
- // The java:package metadata can be defined as global metadata or applied to a top-level module.
+ // The java:package metadata can be defined as file metadata or applied to a top-level module.
// We check for the metadata at the top-level module first and then fall back to the global scope.
//
static const string prefix = "java:package:";
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 8843aeddb02..51f8386163f 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -329,7 +329,7 @@ Slice::DefinitionContext::initSuppressedWarnings()
else
{
warning(InvalidMetaData, "", "", string("invalid category `") + s +
- "' in global metadata suppress-warning");
+ "' in file metadata suppress-warning");
}
}
}
@@ -2716,7 +2716,7 @@ Slice::Container::mergeModules()
}
//
- // Compare the global metadata of the two modules being merged.
+ // Compare the file metadata of the two modules being merged.
//
DefinitionContextPtr dc2 = mod2->definitionContext();
assert(dc2);
@@ -2725,7 +2725,7 @@ Slice::Container::mergeModules()
metaData2.unique();
if(!checkGlobalMetaData(metaData1, metaData2))
{
- unit()->warning(All, "global metadata mismatch for module `" + mod1->name() + "' in files " +
+ unit()->warning(All, "file metadata mismatch for module `" + mod1->name() + "' in files " +
dc1->filename() + " and " + dc2->filename());
}
@@ -3065,7 +3065,7 @@ bool
Slice::Container::checkGlobalMetaData(const StringList& m1, const StringList& m2)
{
//
- // Not all global metadata mismatches represent actual problems. We are only concerned about
+ // Not all file metadata mismatches represent actual problems. We are only concerned about
// the prefixes listed below (also see bug 2766).
//
static const char* prefixes[] =
@@ -6546,12 +6546,12 @@ Slice::Unit::addGlobalMetaData(const StringList& metaData)
assert(dc);
if(dc->seenDefinition())
{
- error("global metadata must appear before any definitions");
+ error("file metadata must appear before any definitions");
}
else
{
//
- // Append the global metadata to any existing metadata (e.g., default global metadata).
+ // Append the file metadata to any existing metadata (e.g., default file metadata).
//
StringList l = dc->getMetaData();
copy(metaData.begin(), metaData.end(), back_inserter(l));
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index 7f9abaccc3f..524c9831d0d 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -685,7 +685,7 @@ Slice::Python::compile(const vector<string>& argv)
}
//
- // Check if the file contains the python:pkgdir global metadata.
+ // Check if the file contains the python:pkgdir file metadata.
//
const string pkgdir = getPackageDirectory(icecpp->getFileName(), u);
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 4ddb222a3d3..5649f9797d4 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -2852,7 +2852,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& ut)
//
//
- // Check if the file contains the python:pkgdir global metadata.
+ // Check if the file contains the python:pkgdir file metadata.
//
DefinitionContextPtr dc = ut->findDefinitionContext(file);
assert(dc);
@@ -2877,7 +2877,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const ve
//
//
- // Check if the file contains the python:pkgdir global metadata.
+ // Check if the file contains the python:pkgdir file metadata.
//
string pkgdir = getPackageDirectory(file, ut);
if(!pkgdir.empty())
@@ -3034,7 +3034,7 @@ Slice::Python::getPackageMetadata(const ContainedPtr& cont)
assert(m);
//
- // The python:package metadata can be defined as global metadata or applied to a top-level module.
+ // The python:package metadata can be defined as file metadata or applied to a top-level module.
// We check for the metadata at the top-level module first and then fall back to the global scope.
//
static const string prefix = "python:package:";
@@ -3101,7 +3101,7 @@ Slice::Python::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
static const string prefix = "python:";
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
//
StringList files = p->allFiles();
for(StringList::iterator q = files.begin(); q != files.end(); ++q)
@@ -3126,7 +3126,7 @@ Slice::Python::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
continue;
}
- dc->warning(InvalidMetaData, file, "", "ignoring invalid global metadata `" + s + "'");
+ dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'");
globalMetaData.remove(s);
}
}
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index f9bb314f518..c56cd86a529 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -2524,7 +2524,7 @@ int checkIdentifier(string& id)
{
DefinitionContextPtr dc = unit->currentDefinitionContext();
assert(dc);
- if(dc->findMetaData("underscore") != "underscore") // no 'underscore' global metadata
+ if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
{
unit->error("illegal underscore in identifier `" + name + "'");
}
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 0afdfebd34e..3ec429323c5 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -646,7 +646,7 @@ int checkIdentifier(string& id)
{
DefinitionContextPtr dc = unit->currentDefinitionContext();
assert(dc);
- if(dc->findMetaData("underscore") != "underscore") // no 'underscore' global metadata
+ if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
{
unit->error("illegal underscore in identifier `" + name + "'");
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 9832df7e4fa..fdabfd205e0 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -739,7 +739,7 @@ Slice::Gen::generate(const UnitPtr& p)
string file = p->topLevelFile();
//
- // Give precedence to header-ext/source-ext global metadata.
+ // Give precedence to header-ext/source-ext file metadata.
//
string headerExtension = getHeaderExt(file, p);
if(!headerExtension.empty())
@@ -987,7 +987,7 @@ Slice::Gen::generate(const UnitPtr& p)
else
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << md << "'";
+ ostr << "ignoring invalid file metadata `" << md << "'";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(md);
}
@@ -1001,7 +1001,7 @@ Slice::Gen::generate(const UnitPtr& p)
else
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << md << "'";
+ ostr << "ignoring invalid file metadata `" << md << "'";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(md);
}
@@ -5363,7 +5363,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
static const string prefix = "cpp:";
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
// Note that these metadata can only be cpp:, never cpp98: or cpp11:
//
StringList files = p->allFiles();
@@ -5403,7 +5403,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(headerExtension > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -5416,7 +5416,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(sourceExtension > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -5429,7 +5429,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(dllExport > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
@@ -5443,7 +5443,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
}
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s << "'";
+ ostr << "ignoring invalid file metadata `" << s << "'";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
}
@@ -5856,7 +5856,7 @@ Slice::Gen::NormalizeMetaDataVisitor::normalize(const StringList& metaData)
// + transform "cpp98:" into "cpp:" in front
//
- // Note: global metadata like header-ext exists only in cpp:
+ // Note: file metadata like header-ext exists only in cpp:
// form and are not processed at all
//
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index c2e798135fd..b9cae63c035 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -41,14 +41,14 @@ private:
void writeExtraHeaders(::IceUtilInternal::Output&);
//
- // Returns the header extension defined in the global metadata for a given file,
- // or an empty string if no global metadata was found.
+ // Returns the header extension defined in the file metadata for a given file,
+ // or an empty string if no file metadata was found.
//
std::string getHeaderExt(const std::string& file, const UnitPtr& unit);
//
- // Returns the source extension defined in the global metadata for a given file,
- // or an empty string if no global metadata was found.
+ // Returns the source extension defined in the file metadata for a given file,
+ // or an empty string if no file metadata was found.
//
std::string getSourceExt(const std::string& file, const UnitPtr& unit);
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 36db22c4350..c413b5ae381 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -2458,7 +2458,7 @@ bool
Slice::CsGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
{
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
//
StringList files = p->allFiles();
for(StringList::iterator q = files.begin(); q != files.end(); ++q)
@@ -2488,7 +2488,7 @@ Slice::CsGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(!(s.find(csTypeIdNsPrefix) == 0 && s.size() > csTypeIdNsPrefix.size()) &&
!(s.find(csAttributePrefix) == 0 && s.size() > csAttributePrefix.size()))
{
- dc->warning(InvalidMetaData, file, -1, "ignoring invalid global metadata `" + oldS + "'");
+ dc->warning(InvalidMetaData, file, -1, "ignoring invalid file metadata `" + oldS + "'");
continue;
}
}
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index d47fb0fd8f1..a62eb17ed25 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -76,7 +76,7 @@ usage(const string& n)
"--impl Generate sample implementations.\n"
"--impl-tie Generate sample tie implementations. (Java Compat Only)\n"
"--checksum CLASS Generate checksums for Slice definitions into CLASS.\n"
- "--meta META Define global metadata directive META.\n"
+ "--meta META Define file metadata directive META.\n"
"--list-generated Emit list of generated files in XML format.\n"
"--ice Allow reserved Ice prefix in Slice identifiers\n"
" deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index fa878d44a62..c85f0393748 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -714,12 +714,12 @@ Slice::Gen::generate(const UnitPtr& p)
printGeneratedHeader(_jsout, _fileBase + ".ice");
//
- // Check for global "js:module:ice" metadata. If this is set then we are building Ice.
+ // Check for file "js:module:ice" metadata. If this is set then we are building Ice.
//
bool icejs = module == "ice";
//
- // Check for global "js:es6-module" metadata. If this is set we are using es6 module mapping
+ // Check for file "js:es6-module" metadata. If this is set we are using es6 module mapping
//
bool es6module = dc->findMetaData("js:es6-module") == "js:es6-module";
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 4463682a609..73379cda811 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -214,7 +214,7 @@ string
Slice::JsGenerator::getModuleMetadata(const ContainedPtr& p)
{
//
- // Check if the file contains the js:module global metadata.
+ // Check if the file contains the js:module file metadata.
//
DefinitionContextPtr dc = p->definitionContext();
assert(dc);
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 7dd96a71688..1848cbcbf4d 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -1054,7 +1054,7 @@ bool
Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
{
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
//
StringList files = p->allFiles();
@@ -1080,7 +1080,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(headerDir > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -1093,7 +1093,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(dllExport > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -1102,7 +1102,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
}
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s << "'";
+ ostr << "ignoring invalid file metadata `" << s << "'";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err
index 6dc42d6d60e..81e615cd4c1 100644
--- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err
+++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err
@@ -1,14 +1,14 @@
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:header-ext:hh': directive can appear only once per file
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:source-ext:cc': directive can appear only once per file
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-export:Test': directive can appear only once per file
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:header-ext'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:header-ext:'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:source-ext'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:source-ext:'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-export'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-export:'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include'
-WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include:'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:header-ext:hh': directive can appear only once per file
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:source-ext:cc': directive can appear only once per file
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:dll-export:Test': directive can appear only once per file
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:header-ext'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:header-ext:'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:source-ext'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:source-ext:'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:dll-export'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:dll-export:'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:include'
+WarningInvalidMetaData.ice: warning: ignoring invalid file metadata `cpp:include:'
WarningInvalidMetaData.ice:32: warning: ignoring metadata `cpp:noexcept' for non local interface
WarningInvalidMetaData.ice:35: warning: ignoring invalid metadata `cpp:type:std::list< ::std::string>' for operation with void return type
WarningInvalidMetaData.ice:38: warning: ignoring invalid metadata `cpp:view-type:std::experimental::string_view' for operation with void return type
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:36:56 +0000