Changeset d60ccbf for src/SymTab/Indexer.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

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

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  5 08:05:17 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 05 13:52:42 2015
+// Update Count     : 10
 //
 
@@ -26 +26 @@
 
 namespace SymTab {
+        template< typename Container, typename VisitorType >
+        inline void acceptAllNewScope( Container &container, VisitorType &visitor ) {
+                visitor.enterScope();
+                acceptAll( container, visitor );
+                visitor.leaveScope();
+        }
+
         Indexer::Indexer( bool useDebug ) : doDebug( useDebug ) {}
 
@@ -31 +38 @@
 
         void Indexer::visit( ObjectDecl *objectDecl ) {
+                enterScope();
                 maybeAccept( objectDecl->get_type(), *this );
+                leaveScope();
                 maybeAccept( objectDecl->get_init(), *this );
                 maybeAccept( objectDecl->get_bitfieldWidth(), *this );
@@ -149 +158 @@
                 leaveScope();
         }
+
+
+        void Indexer::visit( ApplicationExpr *applicationExpr ) {
+                acceptAllNewScope( applicationExpr->get_results(), *this );
+                maybeAccept( applicationExpr->get_function(), *this );
+                acceptAll( applicationExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( UntypedExpr *untypedExpr ) {
+                acceptAllNewScope( untypedExpr->get_results(), *this );
+                acceptAll( untypedExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( NameExpr *nameExpr ) {
+                acceptAllNewScope( nameExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( AddressExpr *addressExpr ) {
+                acceptAllNewScope( addressExpr->get_results(), *this );
+                maybeAccept( addressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
+                acceptAllNewScope( labAddressExpr->get_results(), *this );
+                maybeAccept( labAddressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( CastExpr *castExpr ) {
+                acceptAllNewScope( castExpr->get_results(), *this );
+                maybeAccept( castExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( UntypedMemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( MemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( VariableExpr *variableExpr ) {
+                acceptAllNewScope( variableExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( ConstantExpr *constantExpr ) {
+                acceptAllNewScope( constantExpr->get_results(), *this );
+                maybeAccept( constantExpr->get_constant(), *this );
+        }
+
+        void Indexer::visit( SizeofExpr *sizeofExpr ) {
+                acceptAllNewScope( sizeofExpr->get_results(), *this );
+                if ( sizeofExpr->get_isType() ) {
+                        maybeAccept( sizeofExpr->get_type(), *this );
+                } else {
+                        maybeAccept( sizeofExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( AttrExpr *attrExpr ) {
+                acceptAllNewScope( attrExpr->get_results(), *this );
+                if ( attrExpr->get_isType() ) {
+                        maybeAccept( attrExpr->get_type(), *this );
+                } else {
+                        maybeAccept( attrExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( LogicalExpr *logicalExpr ) {
+                acceptAllNewScope( logicalExpr->get_results(), *this );
+                maybeAccept( logicalExpr->get_arg1(), *this );
+                maybeAccept( logicalExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( ConditionalExpr *conditionalExpr ) {
+                acceptAllNewScope( conditionalExpr->get_results(), *this );
+                maybeAccept( conditionalExpr->get_arg1(), *this );
+                maybeAccept( conditionalExpr->get_arg2(), *this );
+                maybeAccept( conditionalExpr->get_arg3(), *this );
+        }
+
+        void Indexer::visit( CommaExpr *commaExpr ) {
+                acceptAllNewScope( commaExpr->get_results(), *this );
+                maybeAccept( commaExpr->get_arg1(), *this );
+                maybeAccept( commaExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( TupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( SolvedTupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( TypeExpr *typeExpr ) {
+                acceptAllNewScope( typeExpr->get_results(), *this );
+                maybeAccept( typeExpr->get_type(), *this );
+        }
+
+        void Indexer::visit( AsmExpr *asmExpr ) {
+                maybeAccept( asmExpr->get_inout(), *this );
+                maybeAccept( asmExpr->get_constraint(), *this );
+                maybeAccept( asmExpr->get_operand(), *this );
+        }
+
+        void Indexer::visit( UntypedValofExpr *valofExpr ) {
+                acceptAllNewScope( valofExpr->get_results(), *this );
+                maybeAccept( valofExpr->get_body(), *this );
+        }
+
 
         void Indexer::visit( ContextInstType *contextInst ) {