Make all components of a for loop optional

[libs/gl.git] / source / programparser.cpp

diff --git a/source/programparser.cpp b/source/programparser.cpp
index 3b87ea7b58b1a2a16c1a09d3cd6432c53009d73f..b607e1cfb8f063abfec2127b7c57247809677a81 100644 (file)
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -853,14 +853,19 @@ RefPtr<Iteration> ProgramParser::parse_iteration()
                loop->init_statement = parse_statement();
        else
        {
                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(";");
                expect(";");

-               loop->init_statement = expr;

        }
        }

-       loop->condition = parse_expression();
+       if(peek_token()!=";")
+               loop->condition = parse_expression();

        expect(";");
        expect(";");

-       loop->loop_expression = parse_expression();
+       if(peek_token()!=")")
+               loop->loop_expression = parse_expression();

        expect(")");
 
        parse_block(loop->body, false);
        expect(")");
 
        parse_block(loop->body, false);