Changeset 73edfe9

Timestamp:

Jun 18, 2019, 6:05:34 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

c829320, f52ce6e

Parents:

898ae07 (diff), a2a85658 (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/Convert.cpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -993 +993 @@
         const ast::Expr * visit( const ast::UniqueExpr * node ) override final {
                 auto rslt = new UniqueExpr(
-                        get<Expression>().accept1(node->expr)
+                        get<Expression>().accept1(node->expr),
+                        node->id
                 );
 
@@ -2367 +2368 @@
                 auto rslt = new ast::UniqueExpr(
                         old->location,
-                        GET_ACCEPT_1(expr, Expr)
+                        GET_ACCEPT_1(expr, Expr),
+                        old->get_id()
                 );
                 rslt->object = GET_ACCEPT_1(object, ObjectDecl);