Changeset ebc0a85 for src/AST

Timestamp:

May 29, 2019, 10:22:31 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f57dd25

Parents:

1259c35 (diff), eba615c (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 cleanup-dtors

File:

• src/AST/Convert.cpp (modified) (4 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 16:59:00 2019
-// Update Count     : 6
+// Last Modified On : Tue May 28 12:00:00 2019
+// Update Count     : 7
 //
 
@@ -1337 +1337 @@
                 if ( ! old ) return nullptr;
                 old->accept(*this);
-                return strict_dynamic_cast< NewT * >( node );
+                ast::Node * ret = node;
+                node = nullptr;
+                return strict_dynamic_cast< NewT * >( ret );
         }
 
@@ -1350 +1352 @@
                         a->accept( *this );
                         ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
+                        node = nullptr;
                 }
                 return ret;
@@ -1873 +1876 @@
                         GET_LABELS_V(old->labels)
                 );
+                cache.emplace( old, stmt );
+                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
                 this->node = stmt;
-                cache.emplace( old, this->node );
-                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
         }