Changeset b7fd9daf for src/AST

Timestamp:

Nov 10, 2021, 7:47:45 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

3249dd8b

Parents:

1622af5 (diff), f95634e (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 'new-ast-unique-expr'

Location:

src/AST

Files:

• Convert.cpp (modified) (1 diff)
• Copy.hpp (modified) (2 diffs)
• Expr.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -1041 +1041 @@
 
         const ast::Expr * visit( const ast::StmtExpr * node ) override final {
-                auto stmts = node->stmts;
-                // disable sharing between multiple StmtExprs explicitly.
-                // this should no longer be true.
-
                 auto rslt = new StmtExpr(
-                        get<CompoundStmt>().accept1(stmts)
+                        get<CompoundStmt>().accept1(node->stmts)
                 );
 
                 rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
                 rslt->dtors       = get<Expression>().acceptL(node->dtors);
-                if (node->resultExpr) {
-                        // this MUST be found by children visit
-                        rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(node->resultExpr));
-                }
+
+                // is this even used after convert?
+                //if (tmp->resultExpr) {
+                //      // this MUST be found by children visit
+                //      rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(tmp->resultExpr));
+                //}
 
                 auto expr = visitBaseExpr( node, rslt );

src/AST/Copy.hpp

@@ -88 +88 @@
         }
 
+        void postvisit( const StmtExpr * node ) {
+                readonlyInsert( &node->resultExpr );
+        }
+
         void postvisit( const MemberExpr * node ) {
                 readonlyInsert( &node->member );
@@ -122 +126 @@
 node_t * deepCopy( const node_t * localRoot ) {
         Pass< DeepCopyCore > dc;
-        node_t const * newRoot = localRoot->accept( dc );
+        node_t const * newRoot = strict_dynamic_cast<node_t const*>(localRoot->accept( dc ));
         dc.core.readonlyUpdates();
         return const_cast< node_t * >( newRoot );

src/AST/Expr.hpp

@@ -767 +767 @@
 
 /// An expression which must only be evaluated once
-class UniqueExpr final : public Expr {
+class 
+UniqueExpr final : public Expr {
         static unsigned long long nextId;
 public: