Changeset c13e8dc8 for src/Parser/DeclarationNode.cc

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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/Parser/DeclarationNode.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -717 +717 @@
 }
 
-DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body ) {
+DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, StatementNode * with ) {
         assert( type );
         assert( type->kind == TypeData::Function );
         assert( ! type->function.body );
+        if ( with ) {
+                // convert
+                //  void f(S s) with (s) { x = 0; }
+                // to
+                //  void f(S s) { with(s) { x = 0; } }
+                WithStmt * withStmt = strict_dynamic_cast< WithStmt * >( with->build() );
+                withStmt->stmt = body->build();
+                delete body;
+                delete with;
+                body = new StatementNode( new CompoundStmt( { withStmt } ) );
+        }
         type->function.body = body;
         return this;