diff options
author | Bernard Normier <bernard@zeroc.com> | 2021-01-08 15:55:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 15:55:09 -0500 |
commit | cf623fd25b942c4f79d2c156e4cbcb622f061f46 (patch) | |
tree | 11efc86a57808519ce9ec95934cb6f7a7fef6664 /cpp/src/Slice/PythonUtil.cpp | |
parent | Added libedit (diff) | |
download | ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.bz2 ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.xz ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.zip |
Rename global metadata to local metadata. (#1231)
Fixes #828
Diffstat (limited to 'cpp/src/Slice/PythonUtil.cpp')
-rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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); } } |