Changeset 906e24d for src/SymTab

Timestamp:

Sep 15, 2016, 10:17:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

aa8f9df

Parents:

96a10cd

git-author:

Rob Schluntz <rschlunt@…> (09/14/16 22:32:34)

git-committer:

Rob Schluntz <rschlunt@…> (09/15/16 10:17:16)

Message:

replace results list on Expressions with a single Type field

Location:

src/SymTab

Files:

• Autogen.cc (modified) (1 diff)
• Indexer.cc (modified) (11 diffs)

src/SymTab/Autogen.cc

@@ -116 +116 @@
                 // This happens before function pointer type conversion, so need to do it manually here
                 VariableExpr * assignVarExpr = new VariableExpr( assignDecl );
-                Type *& assignVarExprType = assignVarExpr->get_results().front();
+                Type * assignVarExprType = assignVarExpr->get_result();
                 assignVarExprType = new PointerType( Type::Qualifiers(), assignVarExprType );
+                assignVarExpr->set_result( assignVarExprType );
                 ApplicationExpr * assignExpr = new ApplicationExpr( assignVarExpr );
                 assignExpr->get_args().push_back( new VariableExpr( dstParam ) );

src/SymTab/Indexer.cc

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