Changeset c453ac4

Timestamp:

Jan 31, 2018, 4:55:49 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

7aaec67

Parents:

c28a038d

Message:

Change parser to build FunctionDecl? withExpr rather than convert to a WithStmt?

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• ParseNode.h (modified) (1 diff)
• TypeData.cc (modified) (1 diff)
• parser.yy (modified) (2 diffs)

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;
 }

src/Parser/ParseNode.h

@@ -262 +262 @@
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
-        DeclarationNode * addFunctionBody( StatementNode * body, StatementNode * with = nullptr );
+        DeclarationNode * addFunctionBody( StatementNode * body, ExpressionNode * with = nullptr );
         DeclarationNode * addOldDeclList( DeclarationNode * list );
         DeclarationNode * setBase( TypeData * newType );

src/Parser/TypeData.cc

@@ -864 +864 @@
                 CompoundStmt * body = dynamic_cast< CompoundStmt * >( stmt );
                 decl = new FunctionDecl( name, scs, linkage, buildFunction( td ), body, attributes, funcSpec );
+                buildList( td->function.withExprs, decl->withExprs );
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {

src/Parser/parser.yy

@@ -259 +259 @@
 %type<sn> iteration_statement                   jump_statement
 %type<sn> expression_statement                  asm_statement
-%type<sn> with_statement                                with_clause_opt
+%type<sn> with_statement
+%type<en> with_clause_opt
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
@@ -2417 +2418 @@
                 { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { $$ = new StatementNode( build_with( $3, nullptr ) ); }
+                { $$ = $3; }
         ;