Changeset fa2c005 for src/Common/PassVisitor.impl.h

Timestamp:

Jun 8, 2023, 3:19:43 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Parents:

044ae62

Message:

Finish Adt POC

File:

• src/Common/PassVisitor.impl.h (modified) (3 diffs)

src/Common/PassVisitor.impl.h

@@ -688 +688 @@
 
 //--------------------------------------------------------------------------
+// AdtDecl
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( AdtDecl * node ) {
+        VISIT_START( node );
+
+        indexerAddAdtFwd( node );
+
+        maybeAccept_impl( node->data_union, *this );
+        maybeAccept_impl( node->tag, *this );
+
+        maybeAccept_impl( node->parameters, *this );
+        maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
+
+        indexerAddAdt( node );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AdtDecl * node ) {
+        VISIT_START( node );
+
+        indexerAddAdtFwd( node );
+
+        maybeAccept_impl( node->data_union, *this );
+        maybeAccept_impl( node->tag, *this );
+
+        maybeAccept_impl( node->parameters, *this );
+        maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
+
+        indexerAddAdt( node );
+
+        VISIT_END( node );
+}  
+
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( AdtDecl * node ) {
+        MUTATE_START( node );
+        
+        indexerAddAdtFwd( node );
+
+        maybeMutate_impl( node->data_union, *this );
+        maybeMutate_impl( node->tag, *this );
+
+        maybeMutate_impl( node->parameters, *this );
+        maybeMutate_impl( node->members   , *this );
+        maybeMutate_impl( node->attributes, *this );
+
+        indexerAddAdt( node );
+
+        MUTATE_END( Declaration, node );
+}
+
+
+//--------------------------------------------------------------------------
 // UnionDecl
 template< typename pass_type >
@@ -789 +846 @@
 }
 
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( AdtDecl * node ) {
-        VISIT_START( node );
-
-        indexerAddAdtFwd( node );
-
-        // unlike structs, traits, and unions, enums inject their members into the global scope
-        maybeAccept_impl( node->data_constructors, *this );
-        maybeAccept_impl( node->data_union, *this );
-        maybeAccept_impl( node->tag, *this );
-
-        maybeAccept_impl( node->parameters, *this );
-        maybeAccept_impl( node->members   , *this );
-        maybeAccept_impl( node->attributes, *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( const AdtDecl * node ) {
-        VISIT_START( node );
-
-        indexerAddAdtFwd( node );
-
-        maybeAccept_impl( node->data_constructors, *this );
-        maybeAccept_impl( node->data_union, *this );
-        maybeAccept_impl( node->tag, *this );
-
-        maybeAccept_impl( node->parameters, *this );
-        maybeAccept_impl( node->members   , *this );
-        maybeAccept_impl( node->attributes, *this );
-
-
-        VISIT_END( node );
-}  
-
-template< typename pass_type >
-Declaration * PassVisitor< pass_type >::mutate( AdtDecl * node ) {
-        MUTATE_START( node );
-        
-        indexerAddAdtFwd( node );
-
-        maybeMutate_impl( node->data_constructors, *this );
-        maybeMutate_impl( node->data_union, *this );
-        maybeMutate_impl( node->tag, *this );
-
-        maybeMutate_impl( node->parameters, *this );
-        maybeMutate_impl( node->members   , *this );
-        maybeMutate_impl( node->attributes, *this );
-
-        MUTATE_END( Declaration, node );
-}
 
 //--------------------------------------------------------------------------
@@ -3540 +3545 @@
 
         indexerAddStruct( node->name );
+
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->forall    , *this );
+                maybeMutate_impl( node->parameters, *this );
+        }
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// AdtInstType
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( AdtInstType * node ) {
+        VISIT_START( node );
+
+        indexerAddAdt( node->name );
+
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->forall    , *this );
+                maybeAccept_impl( node->parameters, *this );
+        }
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AdtInstType * node ) {
+        VISIT_START( node );
+
+        indexerAddAdt( node->name );
+
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->forall    , *this );
+                maybeAccept_impl( node->parameters, *this );
+        }
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( AdtInstType * node ) {
+        MUTATE_START( node );
+
+        indexerAddAdt( node->name );
 
         {