Changeset 15934a6 for src/AST/Expr.hpp

Timestamp:

May 22, 2019, 1:10:58 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

4073b16, 74ad8c0

Parents:

9a0cd9c (diff), 9d23c2d (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/AST/Expr.hpp (modified) (3 diffs)

src/AST/Expr.hpp

@@ -30 +30 @@
 #define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
+class ConverterOldToNew;
+
 namespace ast {
 
@@ -528 +530 @@
         std::vector<ptr<ObjectDecl>> tempDecls;
         std::vector<ptr<ObjectDecl>> returnDecls;
-        std::vector<ptr<ObjectDecl>> dtors;
+        std::vector<ptr<Expr>> dtors;
 
         ImplicitCopyCtorExpr( const CodeLocation& loc, const ApplicationExpr * call )
@@ -635 +637 @@
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        friend class ::ConverterOldToNew;
+
 private:
         TupleAssignExpr * clone() const override { return new TupleAssignExpr{ *this }; }
+    TupleAssignExpr( const CodeLocation & loc, const Type * result, const StmtExpr * s );
+
         MUTATE_FRIEND
 };