Changeset d1b9d78 for src/SymTab

Timestamp:

Jul 13, 2016, 1:44:00 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, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9c791dd

Parents:

8884112 (diff), ed9ecda (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

Location:

src/SymTab

Files:

• AddVisit.h (modified) (2 diffs)
• Autogen.cc (modified) (3 diffs)
• Indexer.cc (modified) (2 diffs)
• Validate.cc (modified) (6 diffs)

src/SymTab/AddVisit.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:52:42 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:46:33 2016
+// Update Count     : 6
 //
 
@@ -38 +38 @@
 
         template< typename Visitor >
-        inline void addVisit(ChooseStmt *switchStmt, Visitor &visitor) {
-                addVisitStatementList( switchStmt->get_branches(), visitor );
-                maybeAccept( switchStmt->get_condition(), visitor );
-        }
-
-        // template< typename Visitor >
-        // inline void addVisit(CaseStmt *caseStmt, Visitor &visitor) {
-        //      addVisitStatementList( caseStmt->get_statements(), visitor );
-        //      maybeAccept( caseStmt->get_condition(), visitor );
-        // }
-
-        template< typename Visitor >
         void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor, bool addBefore ) {
                 std::list< Declaration * >::iterator i = translationUnit.begin();

src/SymTab/Autogen.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 26 14:14:09 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:17 2016
+// Update Count     : 2
 //
 
@@ -42 +42 @@
                 virtual void visit( CompoundStmt *compoundStmt );
                 virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
 
                 AutogenerateRoutines() : functionNesting( 0 ) {}
@@ -559 +557 @@
                 visitStatement( switchStmt );
         }
-
-        void AutogenerateRoutines::visit( ChooseStmt *switchStmt ) {
-                visitStatement( switchStmt );
-        }
-
-        // void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
-        //      visitStatement( caseStmt );
-        // }
 } // SymTab

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 22 15:25:43 2016
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:47 2016
+// Update Count     : 12
 //
 
@@ -520 +520 @@
                         const MangleTable &mangleTable = decls->second;
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
-                                // check for C decls with the same name, skipping
-                                // those with a compatible type (by mangleName)
+                                // check for C decls with the same name, skipping those with a compatible type (by mangleName)
                                 if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
                         }

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 11 13:17:52 2016
-// Update Count     : 297
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:49:21 2016
+// Update Count     : 298
 //
 
@@ -74 +74 @@
                 virtual void visit( CompoundStmt *compoundStmt );
                 virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
           private:
                 HoistStruct();
@@ -268 +266 @@
                 addVisit( switchStmt, *this );
         }
-
-        void HoistStruct::visit( ChooseStmt *switchStmt ) {
-                addVisit( switchStmt, *this );
-        }
-
-        // void HoistStruct::visit( CaseStmt *caseStmt ) {
-        //      addVisit( caseStmt, *this );
-        // }
 
         void Pass1::visit( EnumDecl *enumDecl ) {
@@ -551 +541 @@
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
                         return new StructDecl( aggDecl->get_name() );
+//                      return aggDecl->get_baseStruct();
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
                         return new UnionDecl( aggDecl->get_name() );
@@ -645 +636 @@
                 } // if
         }
+
         Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
                 addImplicitTypedef( structDecl );
@@ -691 +683 @@
 
                 Visitor::visit( funcDecl );
-                // original idea: modify signature of ctor/dtors and insert appropriate return statements
-                // to cause desired behaviour
-                // new idea: add comma exprs to every ctor call to produce first parameter.
-                // this requires some memoization of the first parameter, because it can be a
-                // complicated expression with side effects (see: malloc). idea: add temporary variable
-                // that is assigned address of constructed object in ctor argument position and
-                // return the temporary. It should also be done after all implicit ctors are
-                // added, so not in this pass!
         }