if(token=="if")
return parse_conditional();
else if(token=="for")
- return parse_iteration();
+ return parse_for();
+ else if(token=="while")
+ return parse_while();
else if(token=="passthrough")
return parse_passthrough();
else if(token=="return")
return cond;
}
-RefPtr<Iteration> ProgramParser::parse_iteration()
+RefPtr<Iteration> ProgramParser::parse_for()
{
expect("for");
expect("(");
loop->init_statement = parse_statement();
else
{
- RefPtr<ExpressionStatement> expr = new ExpressionStatement;
- expr->expression = parse_expression();
+ if(token!=";")
+ {
+ RefPtr<ExpressionStatement> expr = new ExpressionStatement;
+ expr->expression = parse_expression();
+ loop->init_statement = expr;
+ }
expect(";");
- loop->init_statement = expr;
}
- loop->condition = parse_expression();
+ if(peek_token()!=";")
+ loop->condition = parse_expression();
expect(";");
- loop->loop_expression = parse_expression();
+ if(peek_token()!=")")
+ loop->loop_expression = parse_expression();
+ expect(")");
+
+ parse_block(loop->body, false);
+
+ return loop;
+}
+
+RefPtr<Iteration> ProgramParser::parse_while()
+{
+ expect("while");
+ expect("(");
+ RefPtr<Iteration> loop = new Iteration;
+ loop->condition = parse_expression();
expect(")");
parse_block(loop->body, false);