Changes in src/SymTab/Indexer.cc [906e24d:6eb8948]

File:

• src/SymTab/Indexer.cc (modified) (11 diffs)

src/SymTab/Indexer.cc

@@ -40 +40 @@
 
 namespace SymTab {
-        template< typename TreeType, typename VisitorType >
-        inline void acceptNewScope( TreeType *tree, VisitorType &visitor ) {
+        template< typename Container, typename VisitorType >
+        inline void acceptAllNewScope( Container &container, VisitorType &visitor ) {
                 visitor.enterScope();
-                maybeAccept( tree, visitor );
+                acceptAll( container, visitor );
                 visitor.leaveScope();
         }
@@ -337 +337 @@
 
         void Indexer::visit( ApplicationExpr *applicationExpr ) {
-                acceptNewScope( applicationExpr->get_result(), *this );
+                acceptAllNewScope( applicationExpr->get_results(), *this );
                 maybeAccept( applicationExpr->get_function(), *this );
                 acceptAll( applicationExpr->get_args(), *this );
@@ -343 +343 @@
 
         void Indexer::visit( UntypedExpr *untypedExpr ) {
-                acceptNewScope( untypedExpr->get_result(), *this );
+                acceptAllNewScope( untypedExpr->get_results(), *this );
                 acceptAll( untypedExpr->get_args(), *this );
         }
 
         void Indexer::visit( NameExpr *nameExpr ) {
-                acceptNewScope( nameExpr->get_result(), *this );
+                acceptAllNewScope( nameExpr->get_results(), *this );
         }
 
         void Indexer::visit( AddressExpr *addressExpr ) {
-                acceptNewScope( addressExpr->get_result(), *this );
+                acceptAllNewScope( addressExpr->get_results(), *this );
                 maybeAccept( addressExpr->get_arg(), *this );
         }
 
         void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
-                acceptNewScope( labAddressExpr->get_result(), *this );
+                acceptAllNewScope( labAddressExpr->get_results(), *this );
                 maybeAccept( labAddressExpr->get_arg(), *this );
         }
 
         void Indexer::visit( CastExpr *castExpr ) {
-                acceptNewScope( castExpr->get_result(), *this );
+                acceptAllNewScope( castExpr->get_results(), *this );
                 maybeAccept( castExpr->get_arg(), *this );
         }
 
         void Indexer::visit( UntypedMemberExpr *memberExpr ) {
-                acceptNewScope( memberExpr->get_result(), *this );
+                acceptAllNewScope( memberExpr->get_results(), *this );
                 maybeAccept( memberExpr->get_aggregate(), *this );
         }
 
         void Indexer::visit( MemberExpr *memberExpr ) {
-                acceptNewScope( memberExpr->get_result(), *this );
+                acceptAllNewScope( memberExpr->get_results(), *this );
                 maybeAccept( memberExpr->get_aggregate(), *this );
         }
 
         void Indexer::visit( VariableExpr *variableExpr ) {
-                acceptNewScope( variableExpr->get_result(), *this );
+                acceptAllNewScope( variableExpr->get_results(), *this );
         }
 
         void Indexer::visit( ConstantExpr *constantExpr ) {
-                acceptNewScope( constantExpr->get_result(), *this );
+                acceptAllNewScope( constantExpr->get_results(), *this );
                 maybeAccept( constantExpr->get_constant(), *this );
         }
 
         void Indexer::visit( SizeofExpr *sizeofExpr ) {
-                acceptNewScope( sizeofExpr->get_result(), *this );
+                acceptAllNewScope( sizeofExpr->get_results(), *this );
                 if ( sizeofExpr->get_isType() ) {
                         maybeAccept( sizeofExpr->get_type(), *this );
@@ -395 +395 @@
 
         void Indexer::visit( AlignofExpr *alignofExpr ) {
-                acceptNewScope( alignofExpr->get_result(), *this );
+                acceptAllNewScope( alignofExpr->get_results(), *this );
                 if ( alignofExpr->get_isType() ) {
                         maybeAccept( alignofExpr->get_type(), *this );
@@ -404 +404 @@
 
         void Indexer::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                acceptNewScope( offsetofExpr->get_result(), *this );
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
                 maybeAccept( offsetofExpr->get_type(), *this );
         }
 
         void Indexer::visit( OffsetofExpr *offsetofExpr ) {
-                acceptNewScope( offsetofExpr->get_result(), *this );
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
                 maybeAccept( offsetofExpr->get_type(), *this );
                 maybeAccept( offsetofExpr->get_member(), *this );
@@ -415 +415 @@
 
         void Indexer::visit( OffsetPackExpr *offsetPackExpr ) {
-                acceptNewScope( offsetPackExpr->get_result(), *this );
+                acceptAllNewScope( offsetPackExpr->get_results(), *this );
                 maybeAccept( offsetPackExpr->get_type(), *this );
         }
 
         void Indexer::visit( AttrExpr *attrExpr ) {
-                acceptNewScope( attrExpr->get_result(), *this );
+                acceptAllNewScope( attrExpr->get_results(), *this );
                 if ( attrExpr->get_isType() ) {
                         maybeAccept( attrExpr->get_type(), *this );
@@ -429 +429 @@
 
         void Indexer::visit( LogicalExpr *logicalExpr ) {
-                acceptNewScope( logicalExpr->get_result(), *this );
+                acceptAllNewScope( logicalExpr->get_results(), *this );
                 maybeAccept( logicalExpr->get_arg1(), *this );
                 maybeAccept( logicalExpr->get_arg2(), *this );
@@ -435 +435 @@
 
         void Indexer::visit( ConditionalExpr *conditionalExpr ) {
-                acceptNewScope( conditionalExpr->get_result(), *this );
+                acceptAllNewScope( conditionalExpr->get_results(), *this );
                 maybeAccept( conditionalExpr->get_arg1(), *this );
                 maybeAccept( conditionalExpr->get_arg2(), *this );
@@ -442 +442 @@
 
         void Indexer::visit( CommaExpr *commaExpr ) {
-                acceptNewScope( commaExpr->get_result(), *this );
+                acceptAllNewScope( commaExpr->get_results(), *this );
                 maybeAccept( commaExpr->get_arg1(), *this );
                 maybeAccept( commaExpr->get_arg2(), *this );
@@ -448 +448 @@
 
         void Indexer::visit( TupleExpr *tupleExpr ) {
-                acceptNewScope( tupleExpr->get_result(), *this );
+                acceptAllNewScope( tupleExpr->get_results(), *this );
                 acceptAll( tupleExpr->get_exprs(), *this );
         }
 
-        void Indexer::visit( SolvedTupleExpr *tupleExpr ) {
-                acceptNewScope( tupleExpr->get_result(), *this );
-                acceptAll( tupleExpr->get_exprs(), *this );
+        void Indexer::visit( TupleAssignExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                enterScope();
+                acceptAll( tupleExpr->get_tempDecls(), *this );
+                acceptAll( tupleExpr->get_assigns(), *this );
+                leaveScope();
         }
 
         void Indexer::visit( TypeExpr *typeExpr ) {
-                acceptNewScope( typeExpr->get_result(), *this );
+                acceptAllNewScope( typeExpr->get_results(), *this );
                 maybeAccept( typeExpr->get_type(), *this );
         }
@@ -469 +472 @@
 
         void Indexer::visit( UntypedValofExpr *valofExpr ) {
-                acceptNewScope( valofExpr->get_result(), *this );
+                acceptAllNewScope( valofExpr->get_results(), *this );
                 maybeAccept( valofExpr->get_body(), *this );
         }