Changeset e874605 for src/AST

Timestamp:

Oct 28, 2022, 3:11:57 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

93d2219

Parents:

77de429

Message:

Add class InlineValueDecl?, which is a Declaration class that works as a placeholder for aggregration value inherited from other aggregration. Disable inline value overwrite.

Location:

src/AST

Files:

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

src/AST/Convert.cpp

@@ -234 +234 @@
                 }
                 return declWithTypePostamble( decl, node );
+        }
+
+        // InlineValueDecl vanish after EnumAndPointerDecay pass so no necessary to implement NewToOld
+        const ast::DeclWithType * visit( const ast::InlineValueDecl * node ) override final {   
+                assert( false );
+                (void) node;
+                return nullptr;
         }
 
@@ -1863 +1870 @@
         }
 
+        virtual void visit( const InlineValueDecl * old ) override final {
+                if ( inCache( old ) ) {
+                        return;
+                }
+                auto&& type = GET_ACCEPT_1(type, Type);
+                auto&& attr = GET_ACCEPT_V(attributes, Attribute);
+ 
+                auto decl = new ast::InlineValueDecl(
+                        old->location,
+                        old->name,
+                        type,
+                        { old->get_storageClasses().val },
+                        { old->linkage.val },
+                        std::move(attr),
+                        { old->get_funcSpec().val }
+                );
+                cache.emplace(old, decl);
+                assert(cache.find( old ) != cache.end());
+                decl->scopeLevel = old->scopeLevel;
+                decl->mangleName = old->mangleName;
+                decl->isDeleted  = old->isDeleted;
+                decl->asmName    = GET_ACCEPT_1(asmName, Expr);
+                decl->uniqueId   = old->uniqueId;
+                decl->extension  = old->extension;
+
+                this->node = decl;
+        }
+
         virtual void visit( const CompoundStmt * old ) override final {
                 if ( inCache( old ) ) return;

src/AST/Decl.hpp

@@ -414 +414 @@
 };
 
+class InlineValueDecl final : public DeclWithType {
+public:
+        ptr<Type> type;
+
+        InlineValueDecl( const CodeLocation & loc, const std::string & name, const Type * type,
+                Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
+                std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
+        : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ) {}
+
+        const Type * get_type() const override { return type; }
+        void set_type( const Type * ty ) override { type = ty; }
+
+        const DeclWithType * accept( Visitor& v ) const override { return v.visit( this ); }
+private:
+        InlineValueDecl * clone() const override { return new InlineValueDecl{ *this }; }
+        MUTATE_FRIEND
+};
 }
 

src/AST/Fwd.hpp

@@ -37 +37 @@
 class DirectiveDecl;
 class StaticAssertDecl;
+class InlineValueDecl;
 
 class Stmt;

src/AST/Pass.hpp

@@ -141 +141 @@
         const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) override final;
         const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) override final;
+        const ast::DeclWithType *     visit( const ast::InlineValueDecl      * ) override final;
         const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) override final;
         const ast::Stmt *             visit( const ast::ExprStmt             * ) override final;

src/AST/Pass.impl.hpp

@@ -803 +803 @@
 
 //--------------------------------------------------------------------------
+// DeclWithType
+template< typename core_t >
+const ast::DeclWithType * ast::Pass< core_t >::visit( const ast::InlineValueDecl * node ) {
+        VISIT_START( node );
+
+        if ( __visit_children() ) {
+                {
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &InlineValueDecl::type );
+                }
+        }
+
+        VISIT_END( DeclWithType, node );
+}
+
+//--------------------------------------------------------------------------
 // CompoundStmt
 template< typename core_t >

src/AST/Print.cpp

@@ -398 +398 @@
         virtual const ast::Decl * visit( const ast::StructDecl * node ) override final {
                 print(node);
+                return node;
+        }
+
+        virtual const ast::DeclWithType * visit( const ast::InlineValueDecl * node ) override final {
+                os << "inline ";
+                if ( ! node->name.empty() ) os << node->name;
+
                 return node;
         }

src/AST/Visitor.hpp

@@ -33 +33 @@
     virtual const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) = 0;
     virtual const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) = 0;
+    virtual const ast::DeclWithType *     visit( const ast::InlineValueDecl      * ) = 0;
     virtual const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) = 0;
     virtual const ast::Stmt *             visit( const ast::ExprStmt             * ) = 0;