Changeset 933f32f for src/ResolvExpr/Resolver.cc

Timestamp:

May 24, 2019, 10:19:41 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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 cleanup-dtors

File:

• src/ResolvExpr/Resolver.cc (modified) (27 diffs)

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Oct 05 09:43:00 2018
-// Update Count     : 214
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Feb 19 18:09:56 2019
+// Update Count     : 240
 //
 
@@ -54 +54 @@
                 }
 
-                void previsit( FunctionDecl *functionDecl );
-                void postvisit( FunctionDecl *functionDecl );
-                void previsit( ObjectDecl *objectDecll );
+                void previsit( FunctionDecl * functionDecl );
+                void postvisit( FunctionDecl * functionDecl );
+                void previsit( ObjectDecl * objectDecll );
                 void previsit( EnumDecl * enumDecl );
                 void previsit( StaticAssertDecl * assertDecl );
@@ -63 +63 @@
                 void previsit( PointerType * at );
 
-                void previsit( ExprStmt *exprStmt );
-                void previsit( AsmExpr *asmExpr );
-                void previsit( AsmStmt *asmStmt );
-                void previsit( IfStmt *ifStmt );
-                void previsit( WhileStmt *whileStmt );
-                void previsit( ForStmt *forStmt );
-                void previsit( SwitchStmt *switchStmt );
-                void previsit( CaseStmt *caseStmt );
-                void previsit( BranchStmt *branchStmt );
-                void previsit( ReturnStmt *returnStmt );
-                void previsit( ThrowStmt *throwStmt );
-                void previsit( CatchStmt *catchStmt );
+                void previsit( ExprStmt * exprStmt );
+                void previsit( AsmExpr * asmExpr );
+                void previsit( AsmStmt * asmStmt );
+                void previsit( IfStmt * ifStmt );
+                void previsit( WhileStmt * whileStmt );
+                void previsit( ForStmt * forStmt );
+                void previsit( SwitchStmt * switchStmt );
+                void previsit( CaseStmt * caseStmt );
+                void previsit( BranchStmt * branchStmt );
+                void previsit( ReturnStmt * returnStmt );
+                void previsit( ThrowStmt * throwStmt );
+                void previsit( CatchStmt * catchStmt );
                 void previsit( WaitForStmt * stmt );
 
-                void previsit( SingleInit *singleInit );
-                void previsit( ListInit *listInit );
-                void previsit( ConstructorInit *ctorInit );
+                void previsit( SingleInit * singleInit );
+                void previsit( ListInit * listInit );
+                void previsit( ConstructorInit * ctorInit );
           private:
                 typedef std::list< Initializer * >::iterator InitIterator;
@@ -105 +105 @@
         }
 
-        void resolveDecl( Declaration * decl, const SymTab::Indexer &indexer ) {
+        void resolveDecl( Declaration * decl, const SymTab::Indexer & indexer ) {
                 PassVisitor<Resolver> resolver( indexer );
                 maybeAccept( decl, resolver );
@@ -149 +149 @@
                 };
 
-                void finishExpr( Expression *&expr, const TypeEnvironment &env, TypeSubstitution * oldenv = nullptr ) {
+                void finishExpr( Expression *& expr, const TypeEnvironment & env, TypeSubstitution * oldenv = nullptr ) {
                         expr->env = oldenv ? oldenv->clone() : new TypeSubstitution;
                         env.makeSubstitution( *expr->env );
@@ -280 +280 @@
 
         // used in resolveTypeof
-        Expression * resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer ) {
+        Expression * resolveInVoidContext( Expression * expr, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return resolveInVoidContext( expr, indexer, env );
         }
 
-        Expression * resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env ) {
+        Expression * resolveInVoidContext( Expression * expr, const SymTab::Indexer & indexer, TypeEnvironment & env ) {
                 // it's a property of the language that a cast expression has either 1 or 0 interpretations; if it has 0
                 // interpretations, an exception has already been thrown.
                 assertf( expr, "expected a non-null expression." );
 
-                static CastExpr untyped( nullptr ); // cast to void
-                untyped.location = expr->location;
+                CastExpr * untyped = new CastExpr( expr ); // cast to void
+                untyped->location = expr->location;
 
                 // set up and resolve expression cast to void
-                untyped.arg = expr;
                 Alternative choice;
-                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, ResolvMode::withAdjustment() );
+                findUnfinishedKindExpression( untyped, choice, indexer, "", standardAlternativeFilter, ResolvMode::withAdjustment() );
                 CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
+                assert( castExpr );
                 env = std::move( choice.env );
 
@@ -305 +305 @@
 
                 // unlink the arg so that it isn't deleted twice at the end of the program
-                untyped.arg = nullptr;
+                untyped->arg = nullptr;
                 return ret;
         }
 
-        void findVoidExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
+        void findVoidExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                 resetTyVarRenaming();
                 TypeEnvironment env;
@@ -318 +318 @@
         }
 
-        void findSingleExpression( Expression *&untyped, const SymTab::Indexer &indexer ) {
+        void findSingleExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                 findKindExpression( untyped, indexer, "", standardAlternativeFilter );
         }
@@ -337 +337 @@
                         if ( dynamic_cast< EnumInstType * >( type ) ) {
                                 return true;
-                        } else if ( BasicType *bt = dynamic_cast< BasicType * >( type ) ) {
+                        } else if ( BasicType * bt = dynamic_cast< BasicType * >( type ) ) {
                                 return bt->isInteger();
                         } else if ( dynamic_cast< ZeroType* >( type ) != nullptr || dynamic_cast< OneType* >( type ) != nullptr ) {
@@ -346 +346 @@
                 }
 
-                void findIntegralExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
+                void findIntegralExpression( Expression *& untyped, const SymTab::Indexer & indexer ) {
                         findKindExpression( untyped, indexer, "condition", isIntegralType );
                 }
@@ -402 +402 @@
         }
 
-        void Resolver::previsit( ObjectDecl *objectDecl ) {
+        void Resolver::previsit( ObjectDecl * objectDecl ) {
                 // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that
                 // class-variable initContext is changed multiple time because the LHS is analysed twice.
@@ -432 +432 @@
         }
 
-        void Resolver::previsit( FunctionDecl *functionDecl ) {
+        void Resolver::previsit( FunctionDecl * functionDecl ) {
 #if 0
                 std::cerr << "resolver visiting functiondecl ";
@@ -442 +442 @@
         }
 
-        void Resolver::postvisit( FunctionDecl *functionDecl ) {
+        void Resolver::postvisit( FunctionDecl * functionDecl ) {
                 // default value expressions have an environment which shouldn't be there and trips up
                 // later passes.
@@ -467 +467 @@
         }
 
-        void Resolver::previsit( ExprStmt *exprStmt ) {
+        void Resolver::previsit( ExprStmt * exprStmt ) {
                 visit_children = false;
                 assertf( exprStmt->expr, "ExprStmt has null Expression in resolver" );
@@ -473 +473 @@
         }
 
-        void Resolver::previsit( AsmExpr *asmExpr ) {
+        void Resolver::previsit( AsmExpr * asmExpr ) {
                 visit_children = false;
                 findVoidExpression( asmExpr->operand, indexer );
@@ -481 +481 @@
         }
 
-        void Resolver::previsit( AsmStmt *asmStmt ) {
+        void Resolver::previsit( AsmStmt * asmStmt ) {
                 visit_children = false;
                 acceptAll( asmStmt->get_input(), *visitor );
@@ -487 +487 @@
         }
 
-        void Resolver::previsit( IfStmt *ifStmt ) {
+        void Resolver::previsit( IfStmt * ifStmt ) {
                 findIntegralExpression( ifStmt->condition, indexer );
         }
 
-        void Resolver::previsit( WhileStmt *whileStmt ) {
+        void Resolver::previsit( WhileStmt * whileStmt ) {
                 findIntegralExpression( whileStmt->condition, indexer );
         }
 
-        void Resolver::previsit( ForStmt *forStmt ) {
+        void Resolver::previsit( ForStmt * forStmt ) {
                 if ( forStmt->condition ) {
                         findIntegralExpression( forStmt->condition, indexer );
@@ -505 +505 @@
         }
 
-        void Resolver::previsit( SwitchStmt *switchStmt ) {
+        void Resolver::previsit( SwitchStmt * switchStmt ) {
                 GuardValue( currentObject );
                 findIntegralExpression( switchStmt->condition, indexer );
@@ -512 +512 @@
         }
 
-        void Resolver::previsit( CaseStmt *caseStmt ) {
+        void Resolver::previsit( CaseStmt * caseStmt ) {
                 if ( caseStmt->condition ) {
                         std::list< InitAlternative > initAlts = currentObject.getOptions();
@@ -531 +531 @@
         }
 
-        void Resolver::previsit( BranchStmt *branchStmt ) {
+        void Resolver::previsit( BranchStmt * branchStmt ) {
                 visit_children = false;
                 // must resolve the argument for a computed goto
@@ -542 +542 @@
         }
 
-        void Resolver::previsit( ReturnStmt *returnStmt ) {
+        void Resolver::previsit( ReturnStmt * returnStmt ) {
                 visit_children = false;
                 if ( returnStmt->expr ) {
@@ -549 +549 @@
         }
 
-        void Resolver::previsit( ThrowStmt *throwStmt ) {
+        void Resolver::previsit( ThrowStmt * throwStmt ) {
                 visit_children = false;
                 // TODO: Replace *exception type with &exception type.
@@ -561 +561 @@
         }
 
-        void Resolver::previsit( CatchStmt *catchStmt ) {
+        void Resolver::previsit( CatchStmt * catchStmt ) {
                 if ( catchStmt->cond ) {
                         findSingleExpression( catchStmt->cond, new BasicType( noQualifiers, BasicType::Bool ), indexer );
@@ -725 +725 @@
 
                                                 }
-                                                catch( SemanticErrorException &e ) {
+                                                catch( SemanticErrorException & e ) {
                                                         errors.append( e );
                                                 }
                                         }
                                 }
-                                catch( SemanticErrorException &e ) {
+                                catch( SemanticErrorException & e ) {
                                         errors.append( e );
                                 }
@@ -782 +782 @@
         }
 
-        void Resolver::previsit( SingleInit *singleInit ) {
+        void Resolver::previsit( SingleInit * singleInit ) {
                 visit_children = false;
                 // resolve initialization using the possibilities as determined by the currentObject cursor
@@ -814 +814 @@
                                 if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
                                         if ( isCharType( pt->get_base() ) ) {
-                                                if ( CastExpr *ce = dynamic_cast< CastExpr * >( newExpr ) ) {
+                                                if ( CastExpr * ce = dynamic_cast< CastExpr * >( newExpr ) ) {
                                                         // strip cast if we're initializing a char[] with a char *,
                                                         // e.g.  char x[] = "hello";
@@ -894 +894 @@
         }
 
-        void Resolver::previsit( ConstructorInit *ctorInit ) {
+        void Resolver::previsit( ConstructorInit * ctorInit ) {
                 visit_children = false;
                 // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit