Changeset 67130fe for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 4, 2019, 6:39:23 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c6a1e8a

Parents:

7564e10 (diff), 1346914 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/Resolver.cc

@@ -7 +7 @@
 // Resolver.cc --
 //
-// Author           : Richard C. Bilson
+// Author           : Aaron B. Moss
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 19 18:09:56 2019
-// Update Count     : 240
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Wed May 29 11:00:00 2019
+// Update Count     : 241
 //
 
@@ -21 +21 @@
 #include "Alternative.h"                 // for Alternative, AltList
 #include "AlternativeFinder.h"           // for AlternativeFinder, resolveIn...
+#include "CurrentObject.h"               // for CurrentObject
+#include "RenameVars.h"                  // for RenameVars, global_renamer
+#include "Resolver.h"
+#include "ResolvMode.h"                  // for ResolvMode
+#include "typeops.h"                     // for extractResultType
+#include "Unify.h"                       // for unify
+#include "AST/Pass.hpp"
+#include "AST/SymbolTable.hpp"
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/utility.h"              // for ValueGuard, group_iterate
-#include "CurrentObject.h"               // for CurrentObject
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
-#include "RenameVars.h"                  // for RenameVars, global_renamer
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
-#include "Resolver.h"
-#include "ResolvMode.h"                  // for ResolvMode
 #include "SymTab/Autogen.h"              // for SizeType
 #include "SymTab/Indexer.h"              // for Indexer
@@ -41 +45 @@
 #include "SynTree/Visitor.h"             // for acceptAll, maybeAccept
 #include "Tuples/Tuples.h"
-#include "typeops.h"                     // for extractResultType
-#include "Unify.h"                       // for unify
 #include "Validate/FindSpecialDecls.h"   // for SizeType
 
@@ -48 +50 @@
 
 namespace ResolvExpr {
-        struct Resolver final : public WithIndexer, public WithGuards, public WithVisitorRef<Resolver>, public WithShortCircuiting, public WithStmtsToAdd {
-                Resolver() {}
-                Resolver( const SymTab::Indexer & other ) {
+        struct Resolver_old final : public WithIndexer, public WithGuards, public WithVisitorRef<Resolver_old>, public WithShortCircuiting, public WithStmtsToAdd {
+                Resolver_old() {}
+                Resolver_old( const SymTab::Indexer & other ) {
                         indexer = other;
                 }
@@ -101 +103 @@
 
         void resolve( std::list< Declaration * > translationUnit ) {
-                PassVisitor<Resolver> resolver;
+                PassVisitor<Resolver_old> resolver;
                 acceptAll( translationUnit, resolver );
         }
 
         void resolveDecl( Declaration * decl, const SymTab::Indexer & indexer ) {
-                PassVisitor<Resolver> resolver( indexer );
+                PassVisitor<Resolver_old> resolver( indexer );
                 maybeAccept( decl, resolver );
         }
@@ -402 +404 @@
         }
 
-        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.
-                // The second analysis changes initContext because of a function type can contain object
-                // declarations in the return and parameter types. So each value of initContext is
+        void Resolver_old::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. 
+                // The second analysis changes initContext because of a function type can contain object 
+                // declarations in the return and parameter types. So each value of initContext is 
                 // retained, so the type on the first analysis is preserved and used for selecting the RHS.
                 GuardValue( currentObject );
@@ -418 +420 @@
 
         template< typename PtrType >
-        void Resolver::handlePtrType( PtrType * type ) {
+        void Resolver_old::handlePtrType( PtrType * type ) {
                 if ( type->get_dimension() ) {
                         findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
@@ -424 +426 @@
         }
 
-        void Resolver::previsit( ArrayType * at ) {
+        void Resolver_old::previsit( ArrayType * at ) {
                 handlePtrType( at );
         }
 
-        void Resolver::previsit( PointerType * pt ) {
+        void Resolver_old::previsit( PointerType * pt ) {
                 handlePtrType( pt );
         }
 
-        void Resolver::previsit( FunctionDecl * functionDecl ) {
+        void Resolver_old::previsit( FunctionDecl * functionDecl ) {
 #if 0
                 std::cerr << "resolver visiting functiondecl ";
@@ -442 +444 @@
         }
 
-        void Resolver::postvisit( FunctionDecl * functionDecl ) {
-                // default value expressions have an environment which shouldn't be there and trips up
+        void Resolver_old::postvisit( FunctionDecl * functionDecl ) {
+                // default value expressions have an environment which shouldn't be there and trips up 
                 // later passes.
                 // xxx - it might be necessary to somehow keep the information from this environment, but I
@@ -457 +459 @@
         }
 
-        void Resolver::previsit( EnumDecl * ) {
+        void Resolver_old::previsit( EnumDecl * ) {
                 // in case we decide to allow nested enums
                 GuardValue( inEnumDecl );
@@ -463 +465 @@
         }
 
-        void Resolver::previsit( StaticAssertDecl * assertDecl ) {
+        void Resolver_old::previsit( StaticAssertDecl * assertDecl ) {
                 findIntegralExpression( assertDecl->condition, indexer );
         }
 
-        void Resolver::previsit( ExprStmt * exprStmt ) {
+        void Resolver_old::previsit( ExprStmt * exprStmt ) {
                 visit_children = false;
                 assertf( exprStmt->expr, "ExprStmt has null Expression in resolver" );
@@ -473 +475 @@
         }
 
-        void Resolver::previsit( AsmExpr * asmExpr ) {
+        void Resolver_old::previsit( AsmExpr * asmExpr ) {
                 visit_children = false;
                 findVoidExpression( asmExpr->operand, indexer );
@@ -481 +483 @@
         }
 
-        void Resolver::previsit( AsmStmt * asmStmt ) {
+        void Resolver_old::previsit( AsmStmt * asmStmt ) {
                 visit_children = false;
                 acceptAll( asmStmt->get_input(), *visitor );
@@ -487 +489 @@
         }
 
-        void Resolver::previsit( IfStmt * ifStmt ) {
+        void Resolver_old::previsit( IfStmt * ifStmt ) {
                 findIntegralExpression( ifStmt->condition, indexer );
         }
 
-        void Resolver::previsit( WhileStmt * whileStmt ) {
+        void Resolver_old::previsit( WhileStmt * whileStmt ) {
                 findIntegralExpression( whileStmt->condition, indexer );
         }
 
-        void Resolver::previsit( ForStmt * forStmt ) {
+        void Resolver_old::previsit( ForStmt * forStmt ) {
                 if ( forStmt->condition ) {
                         findIntegralExpression( forStmt->condition, indexer );
@@ -505 +507 @@
         }
 
-        void Resolver::previsit( SwitchStmt * switchStmt ) {
+        void Resolver_old::previsit( SwitchStmt * switchStmt ) {
                 GuardValue( currentObject );
                 findIntegralExpression( switchStmt->condition, indexer );
@@ -512 +514 @@
         }
 
-        void Resolver::previsit( CaseStmt * caseStmt ) {
+        void Resolver_old::previsit( CaseStmt * caseStmt ) {
                 if ( caseStmt->condition ) {
                         std::list< InitAlternative > initAlts = currentObject.getOptions();
@@ -531 +533 @@
         }
 
-        void Resolver::previsit( BranchStmt * branchStmt ) {
+        void Resolver_old::previsit( BranchStmt * branchStmt ) {
                 visit_children = false;
                 // must resolve the argument for a computed goto
@@ -542 +544 @@
         }
 
-        void Resolver::previsit( ReturnStmt * returnStmt ) {
+        void Resolver_old::previsit( ReturnStmt * returnStmt ) {
                 visit_children = false;
                 if ( returnStmt->expr ) {
@@ -549 +551 @@
         }
 
-        void Resolver::previsit( ThrowStmt * throwStmt ) {
+        void Resolver_old::previsit( ThrowStmt * throwStmt ) {
                 visit_children = false;
                 // TODO: Replace *exception type with &exception type.
@@ -561 +563 @@
         }
 
-        void Resolver::previsit( CatchStmt * catchStmt ) {
+        void Resolver_old::previsit( CatchStmt * catchStmt ) {
                 if ( catchStmt->cond ) {
                         findSingleExpression( catchStmt->cond, new BasicType( noQualifiers, BasicType::Bool ), indexer );
@@ -576 +578 @@
         }
 
-        void Resolver::previsit( WaitForStmt * stmt ) {
+        void Resolver_old::previsit( WaitForStmt * stmt ) {
                 visit_children = false;
 
@@ -782 +784 @@
         }
 
-        void Resolver::previsit( SingleInit * singleInit ) {
+        void Resolver_old::previsit( SingleInit * singleInit ) {
                 visit_children = false;
                 // resolve initialization using the possibilities as determined by the currentObject cursor
@@ -834 +836 @@
         }
 
-        void Resolver::previsit( ListInit * listInit ) {
+        void Resolver_old::previsit( ListInit * listInit ) {
                 visit_children = false;
                 // move cursor into brace-enclosed initializer-list
@@ -869 +871 @@
 
         // ConstructorInit - fall back on C-style initializer
-        void Resolver::fallbackInit( ConstructorInit * ctorInit ) {
+        void Resolver_old::fallbackInit( ConstructorInit * ctorInit ) {
                 // could not find valid constructor, or found an intrinsic constructor
                 // fall back on C-style initializer
@@ -882 +884 @@
         void resolveCtorInit( ConstructorInit * ctorInit, const SymTab::Indexer & indexer ) {
                 assert( ctorInit );
-                PassVisitor<Resolver> resolver( indexer );
+                PassVisitor<Resolver_old> resolver( indexer );
                 ctorInit->accept( resolver );
         }
@@ -888 +890 @@
         void resolveStmtExpr( StmtExpr * stmtExpr, const SymTab::Indexer & indexer ) {
                 assert( stmtExpr );
-                PassVisitor<Resolver> resolver( indexer );
+                PassVisitor<Resolver_old> resolver( indexer );
                 stmtExpr->accept( resolver );
                 stmtExpr->computeResult();
@@ -894 +896 @@
         }
 
-        void Resolver::previsit( ConstructorInit * ctorInit ) {
+        void Resolver_old::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
@@ -928 +930 @@
                 // }
         }
+
+        ///////////////////////////////////////////////////////////////////////////
+        //
+        // *** NEW RESOLVER ***
+        //
+        ///////////////////////////////////////////////////////////////////////////
+
+        class Resolver_new final 
+        : public ast::WithIndexer, public ast::WithGuards, public ast::WithVisitorRef<Resolver_new>, 
+          public ast::WithShortCircuiting, public ast::WithStmtsToAdd<> {
+                  
+        public: 
+                Resolver_new() = default;
+                Resolver_new( const ast::SymbolTable & syms ) { /*symtab = syms;*/ }
+
+                void previsit( ast::FunctionDecl * functionDecl );
+                ast::DeclWithType * postvisit( ast::FunctionDecl * functionDecl );
+                void previsit( ast::ObjectDecl * objectDecl );
+                void previsit( ast::EnumDecl * enumDecl );
+                void previsit( ast::StaticAssertDecl * assertDecl );
+
+                void previsit( ast::ArrayType * at );
+                void previsit( ast::PointerType * pt );
+
+                void previsit( ast::ExprStmt * exprStmt );
+                void previsit( ast::AsmExpr * asmExpr );
+                void previsit( ast::AsmStmt * asmStmt );
+                void previsit( ast::IfStmt * ifStmt );
+                void previsit( ast::WhileStmt * whileStmt );
+                void previsit( ast::ForStmt * forStmt );
+                void previsit( ast::SwitchStmt * switchStmt );
+                void previsit( ast::CaseStmt * caseStmt );
+                void previsit( ast::BranchStmt * branchStmt );
+                void previsit( ast::ReturnStmt * returnStmt );
+                void previsit( ast::ThrowStmt * throwStmt );
+                void previsit( ast::CatchStmt * catchStmt );
+                void previsit( ast::WaitForStmt * stmt );
+
+                void previsit( ast::SingleInit * singleInit );
+                void previsit( ast::ListInit * listInit );
+                void previsit( ast::ConstructorInit * ctorInit );
+        };
+
+        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit ) {
+                ast::Pass<Resolver_new> resolver;
+                accept_all( translationUnit, resolver );
+        }
+
+        void previsit( ast::FunctionDecl * functionDecl ) {
+                #warning unimplemented; Resolver port in progress
+                (void)functionDecl;
+                assert(false);
+        }
+
+        ast::DeclWithType * postvisit( ast::FunctionDecl * functionDecl ) {
+                #warning unimplemented; Resolver port in progress
+                (void)functionDecl;
+                assert(false);
+                return nullptr;
+        }
+
+        void previsit( ast::ObjectDecl * objectDecl ) {
+                #warning unimplemented; Resolver port in progress
+                (void)objectDecl;
+                assert(false);
+        }
+
+        void previsit( ast::EnumDecl * enumDecl ) {
+                #warning unimplemented; Resolver port in progress
+                (void)enumDecl;
+                assert(false);
+        }
+
+        void previsit( ast::StaticAssertDecl * assertDecl ) {
+                #warning unimplemented; Resolver port in progress
+                (void)assertDecl;
+                assert(false);
+        }
+
+        void previsit( ast::ArrayType * at ) {
+                #warning unimplemented; Resolver port in progress
+                (void)at;
+                assert(false);
+        }
+
+        void previsit( ast::PointerType * pt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)pt;
+                assert(false);
+        }
+
+        void previsit( ast::ExprStmt * exprStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)exprStmt;
+                assert(false);
+        }
+
+        void previsit( ast::AsmExpr * asmExpr ) {
+                #warning unimplemented; Resolver port in progress
+                (void)asmExpr;
+                assert(false);
+        }
+
+        void previsit( ast::AsmStmt * asmStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)asmStmt;
+                assert(false);
+        }
+
+        void previsit( ast::IfStmt * ifStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)ifStmt;
+                assert(false);
+        }
+
+        void previsit( ast::WhileStmt * whileStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)whileStmt;
+                assert(false);
+        }
+
+        void previsit( ast::ForStmt * forStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)forStmt;
+                assert(false);
+        }
+
+        void previsit( ast::SwitchStmt * switchStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)switchStmt;
+                assert(false);
+        }
+
+        void previsit( ast::CaseStmt * caseStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)caseStmt;
+                assert(false);
+        }
+
+        void previsit( ast::BranchStmt * branchStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)branchStmt;
+                assert(false);
+        }
+
+        void previsit( ast::ReturnStmt * returnStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)returnStmt;
+                assert(false);
+        }
+
+        void previsit( ast::ThrowStmt * throwStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)throwStmt;
+                assert(false);
+        }
+
+        void previsit( ast::CatchStmt * catchStmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)catchStmt;
+                assert(false);
+        }
+
+        void previsit( ast::WaitForStmt * stmt ) {
+                #warning unimplemented; Resolver port in progress
+                (void)stmt;
+                assert(false);
+        }
+
+        void previsit( ast::SingleInit * singleInit ) {
+                #warning unimplemented; Resolver port in progress
+                (void)singleInit;
+                assert(false);
+        }
+
+        void previsit( ast::ListInit * listInit ) {
+                #warning unimplemented; Resolver port in progress
+                (void)listInit;
+                assert(false);
+        }
+
+        void previsit( ast::ConstructorInit * ctorInit ) {
+                #warning unimplemented; Resolver port in progress
+                (void)ctorInit;
+                assert(false);
+        }
+
 } // namespace ResolvExpr