Add Support for cpp:identifier Metadata, and the Groundwork for xxx:identifier Metadata in General

cpp/src/Slice/MetadataValidation.cpp

@@ -83,9 +83,9 @@ Slice::validateMetadata(const UnitPtr& p, string_view prefix, map<string, Metada
     MetadataInfo deprecatedInfo = {
         .validOn =
             {typeid(InterfaceDecl),
-             typeid(ClassDecl),
              typeid(Operation),
-             typeid(Exception),
+             typeid(ClassDecl),
+             typeid(Slice::Exception),
              typeid(Struct),
              typeid(Sequence),
              typeid(Dictionary),

cpp/src/Slice/Parser.cpp

@@ -38,6 +38,9 @@ compareTag(const T& lhs, const T& rhs)
     return lhs->tag() < rhs->tag();
 }
 
+// NOTE: It is important that this list is kept in alphabetical order!
+constexpr string_view languages[] = {"cpp", "cs", "java", "js", "matlab", "php", "python", "ruby", "swift"};
+
 // Forward declare things from Bison and Flex the parser can use.
 extern int slice_parse();
 extern int slice_lineno;
@@ -104,8 +107,6 @@ Slice::Metadata::Metadata(string rawMetadata, string file, int line) : GrammarBa
     if (firstColonPos != string::npos)
     {
         // Check if the metadata starts with a language prefix.
-        // NOTE: It is important that this list is kept in alphabetical order!
-        constexpr string_view languages[] = {"cpp", "cs", "java", "js", "matlab", "php", "python", "rb", "swift"};
         string prefix = rawMetadata.substr(0, firstColonPos);
         bool hasLangPrefix = binary_search(&languages[0], &languages[sizeof(languages) / sizeof(*languages)], prefix);
         if (hasLangPrefix)
@@ -554,35 +555,37 @@ Slice::Contained::container() const
 }
 
 string
-Slice::Contained::name() const
+Slice::Contained::name(bool mappedName) const
 {
-    return _name;
-}
+    // If the mapped name was requested, we first check if any 'xxx:identifier' has been applied to this element.
+    // If so, we return that instead of the element's Slice identifier.
+    if (mappedName)
+    {
+        static const string metadata = string(_unit->languagePrefix()) + ":identifier";
+        if (auto customName = getMetadataArgs(metadata))
+        {
+            return *customName;
+        }
+    }
 
-string
-Slice::Contained::scoped() const
-{
-    return _scoped;
+    return _name;
 }
 
 string
-Slice::Contained::scope() const
+Slice::Contained::scoped(bool mappedName) const
 {
-    string::size_type idx = _scoped.rfind("::");
-    assert(idx != string::npos);
-    return string(_scoped, 0, idx + 2);
+    return scope(mappedName) + name(mappedName);
 }
 
 string
-Slice::Contained::flattenedScope() const
+Slice::Contained::scope(bool mappedName) const
 {
-    string s = scope();
-    string::size_type pos = 0;
-    while ((pos = s.find("::", pos)) != string::npos)
+    string scoped;
+    if (auto container = dynamic_pointer_cast<Contained>(_container))
     {
-        s.replace(pos, 2, "_");
+        scoped = container->scoped(mappedName);
     }
-    return s;
+    return scoped + "::";
 }
 
 string
@@ -1050,12 +1053,6 @@ Slice::Contained::Contained(const ContainerPtr& container, const string& name)
       _container(container),
       _name(name)
 {
-    ContainedPtr cont = dynamic_pointer_cast<Contained>(_container);
-    if (cont)
-    {
-        _scoped = cont->scoped();
-    }
-    _scoped += "::" + _name;
     assert(_unit);
     _file = _unit->currentFile();
     _line = _unit->currentLine();
@@ -4555,19 +4552,25 @@ Slice::DataMember::DataMember(
 // ----------------------------------------------------------------------
 
 UnitPtr
-Slice::Unit::createUnit(bool all, const StringList& defaultFileMetadata)
+Slice::Unit::createUnit(string_view languagePrefix, bool all, const StringList& defaultFileMetadata)
 {
     MetadataList defaultMetadata;
     for (const auto& metadataString : defaultFileMetadata)
     {
         defaultMetadata.push_back(make_shared<Metadata>(metadataString, "<command-line>", 0));
     }
 
-    UnitPtr unit{new Unit{all, std::move(defaultMetadata)}};
+    UnitPtr unit{new Unit{languagePrefix, all, std::move(defaultMetadata)}};
     unit->_unit = unit;
     return unit;
 }
 
+string_view
+Slice::Unit::languagePrefix() const
+{
+    return _languagePrefix;
+}
+
 void
 Slice::Unit::setDocComment(const string& comment)
 {
@@ -5017,15 +5020,16 @@ Slice::Unit::getTopLevelModules(const string& file) const
     }
 }
 
-Slice::Unit::Unit(bool all, MetadataList defaultFileMetadata)
+Slice::Unit::Unit(std::string_view languagePrefix, bool all, MetadataList defaultFileMetadata)
     : SyntaxTreeBase(nullptr),
       Container(nullptr),
+      _languagePrefix(languagePrefix),
       _all(all),
       _defaultFileMetadata(std::move(defaultFileMetadata)),
       _errors(0),
       _currentIncludeLevel(0)
-
 {
+    assert(binary_search(&languages[0], &languages[sizeof(languages) / sizeof(*languages)], _languagePrefix));
 }
 
 // ----------------------------------------------------------------------

cpp/src/Slice/Parser.h

@@ -363,10 +363,11 @@ namespace Slice
     {
     public:
         [[nodiscard]] ContainerPtr container() const;
-        [[nodiscard]] std::string name() const;
-        [[nodiscard]] std::string scoped() const;
-        [[nodiscard]] std::string scope() const;
-        [[nodiscard]] std::string flattenedScope() const;
+
+        [[nodiscard]] std::string name(bool mappedName = false) const;
+        [[nodiscard]] std::string scoped(bool mappedName = false) const;
+        [[nodiscard]] std::string scope(bool mappedName = false) const;
+
         [[nodiscard]] std::string file() const;
         [[nodiscard]] int line() const;
 
@@ -401,7 +402,6 @@ namespace Slice
 
         ContainerPtr _container;
         std::string _name;
-        std::string _scoped;
         std::string _file;
         int _line;
         std::string _docComment;
@@ -453,7 +453,6 @@ namespace Slice
         EnumeratorList enumerators() const;
         EnumeratorList enumerators(const std::string& identifier) const;
         ContainedList contents() const;
-        std::string thisScope() const;
         void visit(ParserVisitor* visitor) override;
 
         bool checkIntroduced(const std::string& scopedName, ContainedPtr namedThing = nullptr);
@@ -483,6 +482,8 @@ namespace Slice
         }
 
     protected:
+        std::string thisScope() const;
+
         bool validateConstant(
             const std::string& name,
             const TypePtr& type,
@@ -988,7 +989,10 @@ namespace Slice
     class Unit final : public virtual Container
     {
     public:
-        static UnitPtr createUnit(bool all, const StringList& defaultFileMetadata = StringList());
+        static UnitPtr
+        createUnit(std::string_view languagePrefix, bool all, const StringList& defaultFileMetadata = StringList());
+
+        [[nodiscard]] std::string_view languagePrefix() const;
 
         void setDocComment(const std::string& comment);
         void addToDocComment(const std::string& comment);
@@ -1040,11 +1044,12 @@ namespace Slice
         std::set<std::string> getTopLevelModules(const std::string& file) const;
 
     private:
-        Unit(bool all, MetadataList defaultFileMetadata);
+        Unit(std::string_view languagePrefix, bool all, MetadataList defaultFileMetadata);
 
         void pushDefinitionContext();
         void popDefinitionContext();
 
+        const std::string_view _languagePrefix;
         bool _all;
         MetadataList _defaultFileMetadata;
         int _errors;

cpp/src/ice2slice/Main.cpp

@@ -176,7 +176,7 @@ compile(const vector<string>& argv)
         }
         else
         {
-            UnitPtr p = Unit::createUnit(false);
+            UnitPtr p = Unit::createUnit("icerpc", false);
             int parseStatus = p->parse(*i, cppHandle, debug);
 
             if (!icecpp->close())