Changeset 90be0cf for src/AST

Timestamp:

Oct 24, 2024, 12:50:14 PM (3 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

d031f7f

Parents:

12c4a5f

Message:

Moved some methods out of EnumDecl?. These were calculations and the ast types are supposed to be data focused so they should either go with utility functions or to their use site. I tried the use site.

Location:

src/AST

Files:

• Decl.cpp (modified) (1 diff)
• Decl.hpp (modified) (2 diffs)

src/AST/Decl.cpp

@@ -169 +169 @@
 }
 
-const std::string EnumDecl::getUnmangeldArrayName( const ast::EnumAttribute attr ) const {
-        switch( attr ) {
-                case ast::EnumAttribute::Value: return "values_" + name ;
-                case ast::EnumAttribute::Label: return "labels_" + name;
-                default: /* Posn does not generate array */ 
-                        return "";
-        }
-}
-
-unsigned EnumDecl::calChildOffset(const std::string & target) const{
-        unsigned offset = 0;
-        for (auto childEnum: inlinedDecl) {
-                auto childDecl = childEnum->base;
-                if (childDecl->name == target) {
-                        return offset;
-                }
-                offset += childDecl->members.size();
-        }
-    std::cerr << "Cannot find the target enum" << std::endl;
-        return 0;
-}
-
-unsigned EnumDecl::calChildOffset(const ast::EnumInstType * target) const{
-        return calChildOffset(target->base->name);
-}
-
-bool EnumDecl::isSubTypeOf(const ast::EnumDecl * other) const {
-        if (name == other->name) return true;
-        for (auto inlined: other->inlinedDecl) {
-                if (isSubTypeOf(inlined->base)) return true;
-        }
-        return false;
-}
-
 bool EnumDecl::isTyped() const { return base; }
 

src/AST/Decl.hpp

@@ -302 +302 @@
 };
 
+/// Enumeration attribute kind.
 enum class EnumAttribute{ Value, Posn, Label };
+
 /// enum declaration `enum Foo { ... };`
 class EnumDecl final : public AggregateDecl {
@@ -328 +330 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
-        const std::string getUnmangeldArrayName( const EnumAttribute attr ) const;
-
-        unsigned calChildOffset(const std::string & childEnum) const;
-        unsigned calChildOffset(const ast::EnumInstType * childEnum) const;
-
-        bool isSubTypeOf(const ast::EnumDecl *) const;
         bool isTyped() const;
         bool isOpaque() const;