X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fprogramparser.cpp;h=b607e1cfb8f063abfec2127b7c57247809677a81;hb=9339ae44a89f295523b6c25681d87642767864c4;hp=159c314777ecf092f3ad634204f4c2c169b0187d;hpb=91d3eac06389c0bb0363f643790581403b5fca1b;p=libs%2Fgl.git

diff --git a/source/programparser.cpp b/source/programparser.cpp
index 159c3147..b607e1cf 100644
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -263,7 +263,7 @@ void ProgramParser::skip_comment_and_whitespace()
 		{
 			if(*iter=='/')
 				comment = 0;
-			else
+			else if(*iter!='*')
 				comment = 3;
 		}
 
@@ -853,14 +853,19 @@ RefPtr<Iteration> ProgramParser::parse_iteration()
 		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);