Changes in src/Parser/DeclarationNode.cc [71d0eab:c453ac4]

File:

• src/Parser/DeclarationNode.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -723 +723 @@
 }
 
-DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, StatementNode * with ) {
+DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, ExpressionNode * withExprs ) {
         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;
+        type->function.withExprs = withExprs;
         return this;
 }