Changeset 1dcd9554 for src/Parser

Timestamp:

Sep 14, 2017, 3:42:14 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

310e5b7

Parents:

f92c696

Message:

First "working" implementation of waitfor

File:

• src/Parser/StatementNode.cc (modified) (4 diffs)

src/Parser/StatementNode.cc

@@ -234 +234 @@
                 target,
                 maybeMoveBuild<Statement >( stmt ),
-                maybeMoveBuild<Expression>( when )
+                notZeroExpr( maybeMoveBuild<Expression>( when ) )
         });
 
@@ -253 +253 @@
                 std::move( target ),
                 maybeMoveBuild<Statement >( stmt ),
-                maybeMoveBuild<Expression>( when )
+                notZeroExpr( maybeMoveBuild<Expression>( when ) )
         });
 
@@ -265 +265 @@
                 node->timeout.time      = maybeMoveBuild<Expression>( timeout );
                 node->timeout.statement = maybeMoveBuild<Statement >( stmt    );
-                node->timeout.condition = maybeMoveBuild<Expression>( when    );
+                node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
         }
         else {
-                node->orelse.statement  = maybeMoveBuild<Statement >( stmt    );
-                node->orelse.condition  = maybeMoveBuild<Expression>( when    );
+                node->orelse.statement  = maybeMoveBuild<Statement >( stmt );
+                node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( when ) );
         }
 
@@ -280 +280 @@
         node->timeout.time      = maybeMoveBuild<Expression>( timeout );
         node->timeout.statement = maybeMoveBuild<Statement >( stmt    );
-        node->timeout.condition = maybeMoveBuild<Expression>( when    );
+        node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
 
         node->orelse.statement = maybeMoveBuild<Statement >( else_stmt );
-        node->orelse.condition = maybeMoveBuild<Expression>( else_when );
+        node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( else_when ) );
 
         return node;
 }
-
-// WaitForStmt::Target build_waitfor( const std::string * name, ExpressionNode * arguments ) {
-//       return WaitForStmt::Clause{
-
-//       };
-// }
 
 Statement *build_compound( StatementNode *first ) {