Changeset 19de7b70

Timestamp:

May 17, 2016, 5:51:40 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bf1ee05

Parents:

13488ca (diff), 68a8ba2a (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 'ctor' of plg.uwaterloo.ca:software/cfa/cfa-cc into ctor

Location:

src/Parser

Files:

• parser.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/parser.cc

@@ -5772 +5772 @@
                         Token fn; fn.str = new std::string( "^?{}" ); // location undefined
                         (yyval.sn) = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
-                                (ExpressionNode *)(new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), (yyvsp[(2) - (6)].en) ))->set_link( (yyvsp[(4) - (6)].en) ) ), 0 );
+                                (ExpressionNode *)( (yyvsp[(2) - (6)].en) )->set_link( (yyvsp[(4) - (6)].en) ) ), 0 );
                 }
     break;

src/Parser/parser.yy

@@ -646 +646 @@
                         Token fn; fn.str = new std::string( "^?{}" ); // location undefined
                         $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
-                                (ExpressionNode *)(new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), $2 ))->set_link( $4 ) ), 0 );
+                                (ExpressionNode *)( $2 )->set_link( $4 ) ), 0 );
                 }
         ;