Changeset b726084 for src/ResolvExpr

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

Location:

src/ResolvExpr

Files:

• AlternativeFinder.h (modified) (1 diff)
• AlternativePrinter.h (modified) (2 diffs)
• Resolver.cc (modified) (3 diffs)
• TypeMap.h (modified) (10 diffs)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.h ¶

@@ -95 +95 @@
         Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env );
 
-        void resolveObject( const SymTab::Indexer & indexer, ObjectDecl * objectDecl );
-
         template< typename InputIterator, typename OutputIterator >
         void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) {

src/ResolvExpr/AlternativePrinter.h ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AlternativePrinter.h -- 
+// AlternativePrinter.h --
 //
 // Author           : Richard C. Bilson
@@ -23 +23 @@
 
 namespace ResolvExpr {
-        class AlternativePrinter : public SymTab::Indexer {
+        class AlternativePrinter final : public SymTab::Indexer {
           public:
                 AlternativePrinter( std::ostream &os );
-                virtual void visit( ExprStmt *exprStmt );
+
+                using SymTab::Indexer::visit;
+                virtual void visit( ExprStmt *exprStmt ) override;
           private:
                 std::ostream &os;

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

src/ResolvExpr/TypeMap.h ¶

@@ -38 +38 @@
                 typedef typename std::map< std::string, Value* > ValueMap;
                 typedef typename ValueMap::iterator ValueMapIterator;
-                
+
                 Value *voidValue;                                     ///< Value for void type
                 Value *basicValue[BasicType::NUMBER_OF_BASIC_TYPES];  ///< Values for basic types
@@ -54 +54 @@
                         /// One scope of map rollbacks
                         typedef std::vector< std::pair< ValueMapIterator, Value* > > MapScope;
-                        
+
                         PointerScope pointers;  ///< Value pointers to roll back to their previous state
                         MapScope mapNodes;      ///< Value map iterators to roll back to their previous state
@@ -68 +68 @@
 
                 std::vector< Rollback > scopes;  ///< Scope rollback information
-                
+
                 struct Lookup : public Visitor {
                         Lookup( TypeMap<Value> &typeMap ) : typeMap( typeMap ), found( 0 ), toInsert( 0 ) {}
@@ -87 +87 @@
                                 return found;
                         }
-                        
+
                         void findAndReplace( Value *&loc ) {
                                 found = loc;
@@ -109 +109 @@
                                 }
                         }
-                        
+
                         virtual void visit( VoidType *voidType ) {
                                 findAndReplace( typeMap.voidValue );
                         }
-                        
+
                         virtual void visit( BasicType *basicType ) {
                                 findAndReplace( typeMap.basicValue[basicType->get_kind()] );
                         }
-                        
+
                         virtual void visit( PointerType *pointerType ) {
                                 // NOTE This is one of the places where the apporoximation of the resolver is (deliberately) poor;
@@ -129 +129 @@
                                 }
                         }
-                        
+
                         virtual void visit( ArrayType *arrayType ) {
                                 if ( dynamic_cast< FunctionType* >( arrayType->get_base() ) ) {
@@ -137 +137 @@
                                 }
                         }
-                        
+
                         virtual void visit( FunctionType *functionType ) {
                                 findAndReplace( typeMap.functionPointerValue );
                         }
-                        
+
                         virtual void visit( StructInstType *structType ) {
                                 findAndReplace( typeMap.structValue, structType->get_name() );
                         }
-                        
+
                         virtual void visit( UnionInstType *unionType ) {
                                 findAndReplace( typeMap.unionValue, unionType->get_name() );
                         }
-                        
+
                         virtual void visit( EnumInstType *enumType ) {
                                 findAndReplace( typeMap.enumValue, enumType->get_name() );
@@ -157 +157 @@
                         Value *found;             ///< Value found (NULL if none yet)
                         Value *toInsert;          ///< Value to insert (NULL if a lookup)
-                };  // class Lookup
-                friend class Lookup;
-                
+                };  // struct Lookup
+                friend struct Lookup;
+
         public:
                 /// Starts a new scope
@@ -180 +180 @@
                         scopes.pop_back();
                 }
-                
+
                 TypeMap() : voidValue( 0 ), pointerValue( 0 ), voidPointerValue( 0 ), functionPointerValue( 0 ), structValue(), unionValue(), enumValue(), scopes() {
                         beginScope();
@@ -199 +199 @@
                         return searcher.find( key );
                 }
-                
+
         }; // class TypeMap
 

src/ResolvExpr/Unify.cc ¶

@@ -73 +73 @@
                 const OpenVarSet &openVars;
                 WidenMode widenMode;
-                Type *commonType;
                 const SymTab::Indexer &indexer;
         };