Changeset 798a8b3

Timestamp:

Jun 16, 2021, 2:44:09 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7e1cb79

Parents:

1d61b67

Message:

Attributes are now correctly visited when replacing typedefs

Location:

src

Files:

• AST/Pass.impl.hpp (modified) (5 diffs)
• Common/PassVisitor.impl.h (modified) (13 diffs)
• SymTab/Validate.cc (modified) (1 diff)

src/AST/Pass.impl.hpp

@@ -479 +479 @@
                         guard_symtab guard { *this };
                         // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                        static ast::ptr< ast::ObjectDecl > func{ new ast::ObjectDecl{ 
+                        static ast::ptr< ast::ObjectDecl > func{ new ast::ObjectDecl{
                                 CodeLocation{}, "__func__",
                                 new ast::ArrayType{
@@ -522 +522 @@
         VISIT({
                 guard_symtab guard { * this };
-                maybe_accept( node, &StructDecl::params  );
-                maybe_accept( node, &StructDecl::members );
+                maybe_accept( node, &StructDecl::params     );
+                maybe_accept( node, &StructDecl::members    );
+                maybe_accept( node, &StructDecl::attributes );
         })
 
@@ -543 +544 @@
         VISIT({
                 guard_symtab guard { * this };
-                maybe_accept( node, &UnionDecl::params  );
-                maybe_accept( node, &UnionDecl::members );
+                maybe_accept( node, &UnionDecl::params     );
+                maybe_accept( node, &UnionDecl::members    );
+                maybe_accept( node, &UnionDecl::attributes );
         })
 
@@ -562 +564 @@
         VISIT(
                 // unlike structs, traits, and unions, enums inject their members into the global scope
-                maybe_accept( node, &EnumDecl::params  );
-                maybe_accept( node, &EnumDecl::members );
+                maybe_accept( node, &EnumDecl::params     );
+                maybe_accept( node, &EnumDecl::members    );
+                maybe_accept( node, &EnumDecl::attributes );
         )
 
@@ -577 +580 @@
         VISIT({
                 guard_symtab guard { *this };
-                maybe_accept( node, &TraitDecl::params  );
-                maybe_accept( node, &TraitDecl::members );
+                maybe_accept( node, &TraitDecl::params     );
+                maybe_accept( node, &TraitDecl::members    );
+                maybe_accept( node, &TraitDecl::attributes );
         })
 

src/Common/PassVisitor.impl.h

@@ -636 +636 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -656 +657 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -676 +678 @@
                 maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->members   , *this );
+                maybeMutate_impl( node->attributes, *this );
         }
 
@@ -697 +700 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -714 +718 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -732 +737 @@
                 maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->members   , *this );
+                maybeMutate_impl( node->attributes, *this );
         }
 
@@ -750 +756 @@
         maybeAccept_impl( node->parameters, *this );
         maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
 
         VISIT_END( node );
@@ -763 +770 @@
         maybeAccept_impl( node->parameters, *this );
         maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
 
         VISIT_END( node );
@@ -776 +784 @@
         maybeMutate_impl( node->parameters, *this );
         maybeMutate_impl( node->members   , *this );
+        maybeMutate_impl( node->attributes, *this );
 
         MUTATE_END( Declaration, node );
@@ -790 +799 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -805 +815 @@
                 maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->members   , *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -820 +831 @@
                 maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->members   , *this );
+                maybeMutate_impl( node->attributes, *this );
         }
 
@@ -3856 +3868 @@
 
 //--------------------------------------------------------------------------
-// Attribute
+// Constant
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Constant * node ) {

src/SymTab/Validate.cc

@@ -1152 +1152 @@
                 GuardScope( typedeclNames );
                 mutateAll( aggr->parameters, * visitor );
+                mutateAll( aggr->attributes, * visitor );
 
                 // unroll mutateAll for aggr->members so that implicit typedefs for nested types are added to the aggregate body.