Changeset b726084 for src/ResolvExpr/Resolver.cc

Timestamp:

Nov 9, 2016, 2:51:42 PM (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:

30b65d8, d073e3c

Parents:

141b786 (diff), 84118d8 (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 tuples

Conflicts:

src/ControlStruct/LabelTypeChecker.cc
src/InitTweak/FixInit.cc
src/ResolvExpr/Resolver.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

File:

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

src/ResolvExpr/Resolver.cc

@@ -33 +33 @@
 
 namespace ResolvExpr {
-        class Resolver : public SymTab::Indexer {
+        class Resolver final : public SymTab::Indexer {
           public:
                 Resolver() : SymTab::Indexer( false ) {}
-                Resolver( const SymTab::Indexer & indexer ) : SymTab::Indexer( indexer ) {}
-
-                virtual void visit( FunctionDecl *functionDecl );
-                virtual void visit( ObjectDecl *objectDecl );
-                virtual void visit( TypeDecl *typeDecl );
-                virtual void visit( EnumDecl * enumDecl );
-
-                virtual void visit( ArrayType * at );
-                virtual void visit( PointerType * at );
-
-                virtual void visit( ExprStmt *exprStmt );
-                virtual void visit( AsmExpr *asmExpr );
-                virtual void visit( AsmStmt *asmStmt );
-                virtual void visit( IfStmt *ifStmt );
-                virtual void visit( WhileStmt *whileStmt );
-                virtual void visit( ForStmt *forStmt );
-                virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( CaseStmt *caseStmt );
-                virtual void visit( BranchStmt *branchStmt );
-                virtual void visit( ReturnStmt *returnStmt );
-
-                virtual void visit( SingleInit *singleInit );
-                virtual void visit( ListInit *listInit );
-                virtual void visit( ConstructorInit *ctorInit );
+
+                using SymTab::Indexer::visit;
+                virtual void visit( FunctionDecl *functionDecl ) override;
+                virtual void visit( ObjectDecl *functionDecl ) override;
+                virtual void visit( TypeDecl *typeDecl ) override;
+                virtual void visit( EnumDecl * enumDecl ) override;
+
+                virtual void visit( ArrayType * at ) override;
+                virtual void visit( PointerType * at ) override;
+
+                virtual void visit( ExprStmt *exprStmt ) override;
+                virtual void visit( AsmExpr *asmExpr ) override;
+                virtual void visit( AsmStmt *asmStmt ) override;
+                virtual void visit( IfStmt *ifStmt ) override;
+                virtual void visit( WhileStmt *whileStmt ) override;
+                virtual void visit( ForStmt *forStmt ) override;
+                virtual void visit( SwitchStmt *switchStmt ) override;
+                virtual void visit( CaseStmt *caseStmt ) override;
+                virtual void visit( BranchStmt *branchStmt ) override;
+                virtual void visit( ReturnStmt *returnStmt ) override;
+
+                virtual void visit( SingleInit *singleInit ) override;
+                virtual void visit( ListInit *listInit ) override;
+                virtual void visit( ConstructorInit *ctorInit ) override;
           private:
         typedef std::list< Initializer * >::iterator InitIterator;
@@ -69 +69 @@
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
           void fallbackInit( ConstructorInit * ctorInit );
+
                 Type * functionReturn = nullptr;
                 Type *initContext = nullptr;
@@ -533 +534 @@
         }
 
-        void resolveObject( const SymTab::Indexer & indexer, ObjectDecl * objectDecl ) {
-                Resolver resolver( indexer );
-                objectDecl->accept( resolver );
-        }
-
         void Resolver::visit( ConstructorInit *ctorInit ) {
                 // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit