Changeset 7e23d0a for src/SymTab/Validate.cc

Timestamp:

Nov 25, 2015, 2:53:26 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

32d281d, 704c9dd

Parents:

02ec390 (diff), 5189888 (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/SymTab/Validate.cc (modified) (14 diffs)

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 11 16:59:35 2015
-// Update Count     : 196
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Nov 20 16:33:52 2015
+// Update Count     : 201
 //
 
@@ -54 +54 @@
 #include "MakeLibCfa.h"
 #include "TypeEquality.h"
+#include "ResolvExpr/typeops.h"
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
@@ -125 +126 @@
         };
 
-        class AddStructAssignment : public Visitor {
+        class AutogenerateRoutines : public Visitor {
           public:
                 /// Generates assignment operators for aggregate types as required
-                static void addStructAssignment( std::list< Declaration * > &translationUnit );
+                static void autogenerateRoutines( std::list< Declaration * > &translationUnit );
 
                 std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
@@ -151 +152 @@
                 virtual void visit( CatchStmt *catchStmt );
 
-                AddStructAssignment() : functionNesting( 0 ) {}
+                AutogenerateRoutines() : functionNesting( 0 ) {}
           private:
                 template< typename StmtClass > void visitStatement( StmtClass *stmt );
@@ -195 +196 @@
                 acceptAll( translationUnit, pass1 );
                 acceptAll( translationUnit, pass2 );
-                // need to collect all of the assignment operators prior to
-                // this point and only generate assignment operators if one doesn't exist
-                AddStructAssignment::addStructAssignment( translationUnit );
+                AutogenerateRoutines::autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
         }
@@ -501 +500 @@
         static const std::list< std::string > noLabels;
 
-        void AddStructAssignment::addStructAssignment( std::list< Declaration * > &translationUnit ) {
-                AddStructAssignment visitor;
+        void AutogenerateRoutines::autogenerateRoutines( std::list< Declaration * > &translationUnit ) {
+                AutogenerateRoutines visitor;
                 acceptAndAdd( translationUnit, visitor, false );
         }
@@ -704 +703 @@
         }
 
-        void AddStructAssignment::visit( EnumDecl *enumDecl ) {
+        void AutogenerateRoutines::visit( EnumDecl *enumDecl ) {
                 if ( ! enumDecl->get_members().empty() ) {
                         EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
@@ -713 +712 @@
         }
 
-        void AddStructAssignment::visit( StructDecl *structDecl ) {
+        void AutogenerateRoutines::visit( StructDecl *structDecl ) {
                 if ( ! structDecl->get_members().empty() && structsDone.find( structDecl->get_name() ) == structsDone.end() ) {
                         StructInstType *structInst = new StructInstType( Type::Qualifiers(), structDecl->get_name() );
@@ -722 +721 @@
         }
 
-        void AddStructAssignment::visit( UnionDecl *unionDecl ) {
+        void AutogenerateRoutines::visit( UnionDecl *unionDecl ) {
                 if ( ! unionDecl->get_members().empty() ) {
                         UnionInstType *unionInst = new UnionInstType( Type::Qualifiers(), unionDecl->get_name() );
@@ -730 +729 @@
         }
 
-        void AddStructAssignment::visit( TypeDecl *typeDecl ) {
+        void AutogenerateRoutines::visit( TypeDecl *typeDecl ) {
                 CompoundStmt *stmts = 0;
                 TypeInstType *typeInst = new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), false );
@@ -758 +757 @@
         }
 
-        void AddStructAssignment::visit( FunctionType *) {
+        void AutogenerateRoutines::visit( FunctionType *) {
                 // ensure that we don't add assignment ops for types defined as part of the function
         }
 
-        void AddStructAssignment::visit( PointerType *) {
+        void AutogenerateRoutines::visit( PointerType *) {
                 // ensure that we don't add assignment ops for types defined as part of the pointer
         }
 
-        void AddStructAssignment::visit( ContextDecl *) {
+        void AutogenerateRoutines::visit( ContextDecl *) {
                 // ensure that we don't add assignment ops for types defined as part of the context
         }
 
         template< typename StmtClass >
-        inline void AddStructAssignment::visitStatement( StmtClass *stmt ) {
+        inline void AutogenerateRoutines::visitStatement( StmtClass *stmt ) {
                 std::set< std::string > oldStructs = structsDone;
                 addVisit( stmt, *this );
@@ -777 +776 @@
         }
 
-        void AddStructAssignment::visit( FunctionDecl *functionDecl ) {
+        void AutogenerateRoutines::visit( FunctionDecl *functionDecl ) {
                 maybeAccept( functionDecl->get_functionType(), *this );
                 acceptAll( functionDecl->get_oldDecls(), *this );
@@ -785 +784 @@
         }
 
-        void AddStructAssignment::visit( CompoundStmt *compoundStmt ) {
+        void AutogenerateRoutines::visit( CompoundStmt *compoundStmt ) {
                 visitStatement( compoundStmt );
         }
 
-        void AddStructAssignment::visit( IfStmt *ifStmt ) {
+        void AutogenerateRoutines::visit( IfStmt *ifStmt ) {
                 visitStatement( ifStmt );
         }
 
-        void AddStructAssignment::visit( WhileStmt *whileStmt ) {
+        void AutogenerateRoutines::visit( WhileStmt *whileStmt ) {
                 visitStatement( whileStmt );
         }
 
-        void AddStructAssignment::visit( ForStmt *forStmt ) {
+        void AutogenerateRoutines::visit( ForStmt *forStmt ) {
                 visitStatement( forStmt );
         }
 
-        void AddStructAssignment::visit( SwitchStmt *switchStmt ) {
+        void AutogenerateRoutines::visit( SwitchStmt *switchStmt ) {
                 visitStatement( switchStmt );
         }
 
-        void AddStructAssignment::visit( ChooseStmt *switchStmt ) {
+        void AutogenerateRoutines::visit( ChooseStmt *switchStmt ) {
                 visitStatement( switchStmt );
         }
 
-        void AddStructAssignment::visit( CaseStmt *caseStmt ) {
+        void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
                 visitStatement( caseStmt );
         }
 
-        void AddStructAssignment::visit( CatchStmt *cathStmt ) {
+        void AutogenerateRoutines::visit( CatchStmt *cathStmt ) {
                 visitStatement( cathStmt );
         }
@@ -857 +856 @@
                         Type * t1 = tyDecl->get_base();
                         Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
-                        if ( ! typeEquals( t1, t2, true ) ) {
+                        if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
                         }