Cleanup Class Logic in the Slice Compiler (#2264)

zeroc-ice · Jun 5, 2024 · 6a03462 · 6a03462
1 parent ae7e172
commit 6a03462
Show file tree

Hide file tree

Showing 20 changed files with 314 additions and 497 deletions.
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
@@ -94,13 +94,7 @@ namespace
         // Returns true if the type contains data types which can be referenced by user code and mutated after a
         // dispatch returns.
 
-        if (dynamic_pointer_cast<ClassDecl>(type))
-        {
-            return true;
-        }
-
-        BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(type);
-        if (builtin && builtin->usesClasses())
+        if (type->isClassType())
         {
             return true;
         }
@@ -381,6 +375,18 @@ Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr& unit) : _unit(unit)
 
 Slice::Type::Type(const UnitPtr& unit) : SyntaxTreeBase(unit) {}
 
+bool
+Slice::Type::isClassType() const
+{
+    return false;
+}
+
+bool
+Slice::Type::usesClasses() const
+{
+    return isClassType();
+}
+
 // ----------------------------------------------------------------------
 // Builtin
 // ----------------------------------------------------------------------
@@ -399,7 +405,7 @@ Slice::Builtin::typeId() const
 }
 
 bool
-Slice::Builtin::usesClasses() const
+Slice::Builtin::isClassType() const
 {
     return _kind == KindObject || _kind == KindValue;
 }
@@ -2813,7 +2819,7 @@ Slice::ClassDecl::containedType() const
 }
 
 bool
-Slice::ClassDecl::usesClasses() const
+Slice::ClassDecl::isClassType() const
 {
     return true;
 }
@@ -3038,13 +3044,9 @@ Slice::ClassDef::classDataMembers() const
     for (const auto& p : _contents)
     {
         DataMemberPtr q = dynamic_pointer_cast<DataMember>(p);
-        if (q)
+        if (q && q->type()->isClassType())
         {
-            BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(q->type());
-            if ((builtin && builtin->usesClasses()) || dynamic_pointer_cast<ClassDecl>(q->type()))
-            {
-                result.push_back(q);
-            }
+            result.push_back(q);
         }
     }
     return result;
@@ -3182,12 +3184,6 @@ Slice::InterfaceDecl::containedType() const
     return ContainedTypeInterface;
 }
 
-bool
-Slice::InterfaceDecl::usesClasses() const
-{
-    return false;
-}
-
 size_t
 Slice::InterfaceDecl::minWireSize() const
 {
@@ -3794,13 +3790,9 @@ Slice::Exception::classDataMembers() const
     for (const auto& p : _contents)
     {
         DataMemberPtr q = dynamic_pointer_cast<DataMember>(p);
-        if (q)
+        if (q && q->type()->isClassType())
         {
-            BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(q->type());
-            if ((builtin && builtin->usesClasses()) || dynamic_pointer_cast<ClassDecl>(q->type()))
-            {
-                result.push_back(q);
-            }
+            result.push_back(q);
         }
     }
     return result;
@@ -4030,13 +4022,9 @@ Slice::Struct::classDataMembers() const
     for (const auto& p : _contents)
     {
         DataMemberPtr q = dynamic_pointer_cast<DataMember>(p);
-        if (q)
+        if (q && q->type()->isClassType())
         {
-            BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(q->type());
-            if ((builtin && builtin->usesClasses()) || dynamic_pointer_cast<ClassDecl>(q->type()))
-            {
-                result.push_back(q);
-            }
+            result.push_back(q);
         }
     }
     return result;
@@ -4381,12 +4369,6 @@ Slice::Enum::containedType() const
     return ContainedTypeEnum;
 }
 
-bool
-Slice::Enum::usesClasses() const
-{
-    return false;
-}
-
 size_t
 Slice::Enum::minWireSize() const
 {

diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
@@ -316,7 +316,8 @@ namespace Slice
     public:
         Type(const UnitPtr&);
         virtual std::string typeId() const = 0;
-        virtual bool usesClasses() const = 0;
+        virtual bool isClassType() const;
+        virtual bool usesClasses() const;
         virtual size_t minWireSize() const = 0;
         virtual std::string getOptionalFormat() const = 0;
         virtual bool isVariableLength() const = 0;
@@ -347,7 +348,7 @@ namespace Slice
         Builtin(const UnitPtr&, Kind);
 
         virtual std::string typeId() const;
-        virtual bool usesClasses() const;
+        virtual bool isClassType() const;
         virtual size_t minWireSize() const;
         virtual std::string getOptionalFormat() const;
         virtual bool isVariableLength() const;
@@ -556,7 +557,7 @@ namespace Slice
         virtual void destroy();
         ClassDefPtr definition() const;
         virtual ContainedType containedType() const;
-        virtual bool usesClasses() const;
+        virtual bool isClassType() const;
         virtual size_t minWireSize() const;
         virtual std::string getOptionalFormat() const;
         virtual bool isVariableLength() const;
@@ -633,7 +634,6 @@ namespace Slice
         virtual void destroy();
         InterfaceDefPtr definition() const;
         virtual ContainedType containedType() const;
-        virtual bool usesClasses() const;
         virtual size_t minWireSize() const;
         virtual std::string getOptionalFormat() const;
         virtual bool isVariableLength() const;
@@ -897,7 +897,6 @@ namespace Slice
         int minValue() const;
         int maxValue() const;
         virtual ContainedType containedType() const;
-        virtual bool usesClasses() const;
         virtual size_t minWireSize() const;
         virtual std::string getOptionalFormat() const;
         virtual bool isVariableLength() const;

diff --git a/cpp/src/ice2slice/Gen.cpp b/cpp/src/ice2slice/Gen.cpp
@@ -76,16 +76,6 @@ namespace
         return l;
     }
 
-    bool isClassType(const TypePtr& type)
-    {
-        if (dynamic_pointer_cast<ClassDecl>(type))
-        {
-            return true;
-        }
-        BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(type);
-        return builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue);
-    }
-
     static string getCSharpNamespace(const ContainedPtr& cont, bool& hasCSharpNamespaceAttribute)
     {
         // Traverse to the top-level module.
@@ -592,7 +582,7 @@ Gen::TypesVisitor::visitSequence(const SequencePtr& p)
         if (s.find(csGenericPrefix) == 0)
         {
             string type = s.substr(csGenericPrefix.size());
-            if ((type == "LinkedList" || type == "Queue" || type == "Stack") && isClassType(p->type()))
+            if ((type == "LinkedList" || type == "Queue" || type == "Stack") && p->type()->isClassType())
             {
                 continue; // Ignored for objects
             }