Changeset af746cc for src/AST

Timestamp:

Apr 15, 2024, 12:03:53 PM (3 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

dc58e5d

Parents:

d9bad51

Message:

Reimplement the resolution of Enum instance type

Location:

src/AST

Files:

• Decl.cpp (modified) (1 diff)
• Decl.hpp (modified) (2 diffs)
• Fwd.hpp (modified) (1 diff)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Type.hpp (modified) (1 diff)
• Visitor.hpp (modified) (1 diff)

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 "";
+                }
+        }
+
 }
 

src/AST/Decl.hpp

@@ -303 +303 @@
 };
 
+enum class EnumAttribute{ Value, Posn, Label };
 /// enum declaration `enum Foo { ... };`
 class EnumDecl final : public AggregateDecl {
@@ -326 +327 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
-
+        const std::string getUnmangeldArrayName( const EnumAttribute attr ) const;
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }

src/AST/Fwd.hpp

@@ -133 +133 @@
 class OneType;
 class GlobalScopeType;
-class EnumPosType;
+class EnumAttrType;
 
 class Designation;

src/AST/Pass.hpp

@@ -222 +222 @@
         const ast::Type *             visit( const ast::UnionInstType        * ) override final;
         const ast::Type *             visit( const ast::EnumInstType         * ) override final;
-        const ast::Type *             visit( const ast::EnumPosType          * ) override final;
+        const ast::Type *             visit( const ast::EnumAttrType         * ) override final;
         const ast::Type *             visit( const ast::TraitInstType        * ) override final;
         const ast::Type *             visit( const ast::TypeInstType         * ) override final;

src/AST/Pass.impl.hpp

@@ -1986 +1986 @@
 
 //--------------------------------------------------------------------------
-// EnumPosType
-template< typename core_t >
-const ast::Type * ast::Pass< core_t >::visit( const ast::EnumPosType * node ) {
-        VISIT_START( node );
-
+// EnumAttrType
+template< typename core_t >
+const ast::Type * ast::Pass< core_t >::visit( const ast::EnumAttrType * node ) {
+        VISIT_START( node );
         VISIT_END( Type, node );
 }

src/AST/Print.cpp

@@ -1576 +1576 @@
         }
 
-        virtual const ast::Type * visit( const ast::EnumPosType * node ) override final {
-                preprint( node );
-                os << "enum pos with ";
+        virtual const ast::Type * visit( const ast::EnumAttrType * node ) override final {
+                preprint( node );
+                os << "enum attr ";
+        if ( node->attr == ast::EnumAttribute::Label ) {
+            os << "Label ";
+        } else if ( node->attr == ast::EnumAttribute::Value ) {
+            os << "Value ";
+        } else {
+            os << "Posn ";
+        }
                 (*(node->instance)).accept( *this );
                 return node;

src/AST/Type.hpp

@@ -362 +362 @@
 using EnumInstType = SueInstType<EnumDecl>;
 
-class EnumPosType final : public Type {
+class EnumAttrType final : public Type {
 public:
         readonly<EnumInstType> instance;
-        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
-        EnumPosType( const EnumInstType * instance ): instance(instance) {}
+    EnumAttribute attr;
+        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
+        EnumAttrType( const EnumInstType * instance, EnumAttribute attr = EnumAttribute::Posn )
+                : instance(instance), attr(attr) {}
         
-private:
-        EnumPosType * clone() const override { return new EnumPosType{ *this }; }
+    bool match( const ast::EnumAttrType * other) const {
+        return instance->base->name == other->instance->base->name && attr == other->attr;
+    }
+private:
+        EnumAttrType * clone() const override { return new EnumAttrType{ *this }; }
         MUTATE_FRIEND
 };

src/AST/Visitor.hpp

@@ -119 +119 @@
     virtual const ast::Type *             visit( const ast::OneType              * ) = 0;
     virtual const ast::Type *             visit( const ast::GlobalScopeType      * ) = 0;
-    virtual const ast::Type *             visit( const ast::EnumPosType          * ) = 0;
+    virtual const ast::Type *             visit( const ast::EnumAttrType         * ) = 0;
     virtual const ast::Designation *      visit( const ast::Designation          * ) = 0;
     virtual const ast::Init *             visit( const ast::SingleInit           * ) = 0;