Changeset a378ca7

Timestamp:

Nov 30, 2017, 3:58:57 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:

373d0b5

Parents:

61255ad

Message:

Build WithStmt? node in parser

Location:

src/Parser

Files:

• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/ParseNode.h

@@ -408 +408 @@
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when, StatementNode * else_stmt, ExpressionNode * else_when );
+WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt );
 
 //##############################################################################

src/Parser/StatementNode.cc

@@ -282 +282 @@
         node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
 
-        node->orelse.statement = maybeMoveBuild<Statement >( else_stmt );
+        node->orelse.statement  = maybeMoveBuild<Statement >( else_stmt );
         node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( else_when ) );
 
         return node;
+}
+
+WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
+        std::list< Expression * > e;
+        buildMoveList( exprs, e );
+        Statement * s = maybeMoveBuild<Statement>( stmt );
+        return new WithStmt( e, s );
 }
 

src/Parser/parser.yy

@@ -1058 +1058 @@
 with_statement:
         WITH '(' tuple_expression_list ')' statement
-                { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME
+                {
+                        $$ = new StatementNode( build_with( $3, $5 ) );
+                }
         ;