Changeset fc638d2 for src/SynTree

Timestamp:

Dec 13, 2016, 4:13:08 PM (9 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:

7933351

Parents:

f7e749f

Message:

fixed StmtExpr code in PolyMutator, added missing copy constructor, misc documentation

Location:

src/SynTree

Files:

• CompoundStmt.cc (modified) (1 diff)
• Initializer.cc (modified) (1 diff)
• Initializer.h (modified) (1 diff)
• VarExprReplacer.cc (modified) (1 diff)

src/SynTree/CompoundStmt.cc

@@ -49 +49 @@
                 Statement * origStmt = *origit++;
                 if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( s ) ) {
-                        DeclStmt * origDeclStmt = dynamic_cast< DeclStmt * >( origStmt );
-                        assert( origDeclStmt );
+                        DeclStmt * origDeclStmt = safe_dynamic_cast< DeclStmt * >( origStmt );
                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * > ( declStmt->get_decl() ) ) {
-                                DeclarationWithType * origdwt = dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
-                                assert( origdwt );
+                                DeclarationWithType * origdwt = safe_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
                                 assert( dwt->get_name() == origdwt->get_name() );
                                 declMap[ origdwt ] = dwt;
-                        }
-                }
+                        } else assert( ! dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() ) );
+                } else assert( ! dynamic_cast< DeclStmt * > ( s ) );
         }
         if ( ! declMap.empty() ) {

src/SynTree/Initializer.cc

@@ -65 +65 @@
 }
 
+ListInit::ListInit( const ListInit & other ) : Initializer( other ) {
+        cloneAll( other.initializers, initializers );
+        cloneAll( other.designators, designators );
+}
+
+
 ListInit::~ListInit() {
         deleteAll( initializers );

src/SynTree/Initializer.h

@@ -88 +88 @@
         ListInit( const std::list<Initializer*> &initializers,
                           const std::list<Expression *> &designators = std::list< Expression * >(), bool maybeConstructed = false );
+        ListInit( const ListInit & other );
         virtual ~ListInit();
 

src/SynTree/VarExprReplacer.cc

@@ -21 +21 @@
 // replace variable with new node from decl map
 void VarExprReplacer::visit( VariableExpr * varExpr ) {
+  // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
   if ( declMap.count( varExpr->get_var() ) ) {
     varExpr->set_var( declMap.at( varExpr->get_var() ) );