X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.cpp;h=f11b5bf2e73bb570981072de07cf69d6c32e1824;hb=c760a61dd2ffc43c4f72fdfb7aa59949d4e59b06;hp=36cc6e081b1da26d5ef745b9bd7a66e8ff7099b5;hpb=7cd066816f7faab6f8f0eba1fca4dee67ee5dc3b;p=libs%2Fgl.git

diff --git a/source/programparser.cpp b/source/programparser.cpp
index 36cc6e08..f11b5bf2 100644
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -493,6 +493,12 @@ Expression *ProgramParser::parse_expression(unsigned precedence)
 				expect(")");
 				left = parexpr;
 			}
+			else if(isdigit(token[0]) || token=="true" || token=="false")
+			{
+				RefPtr<Literal> literal = new Literal;
+				literal->token = parse_token();
+				left = literal;
+			}
 			else if(is_identifier(token))
 			{
 				RefPtr<VariableReference> var = new VariableReference;
@@ -508,12 +514,6 @@ Expression *ProgramParser::parse_expression(unsigned precedence)
 				unary->expression = parse_expression(oper->precedence);
 				left = unary;
 			}
-			else if(isdigit(token[0]))
-			{
-				RefPtr<Literal> literal = new Literal;
-				literal->token = parse_token();
-				left = literal;
-			}
 			else
 				throw runtime_error(format("Parse error at '%s': expected an expression", token));
 		}
@@ -522,7 +522,7 @@ Expression *ProgramParser::parse_expression(unsigned precedence)
 
 BinaryExpression *ProgramParser::parse_binary(Expression *left, const Operator *oper)
 {
-	RefPtr<BinaryExpression> binary = new BinaryExpression;
+	RefPtr<BinaryExpression> binary = (oper->precedence==16 ? new Assignment : new BinaryExpression);
 	binary->left = left;
 	binary->oper = parse_token();
 	if(binary->oper=="[")
@@ -533,7 +533,6 @@ BinaryExpression *ProgramParser::parse_binary(Expression *left, const Operator *
 	}
 	else
 		binary->right = parse_expression(oper->precedence+(oper->assoc==RIGHT_TO_LEFT));
-	binary->assignment = (oper->precedence==16);
 	return binary.release();
 }
 
@@ -650,7 +649,16 @@ InterfaceBlock *ProgramParser::parse_interface_block()
 
 	iface->name = expect_identifier();
 	parse_block(iface->members, true);
-	expect(";");
+	if(!check(";"))
+	{
+		iface->instance_name = expect_identifier();
+		if(check("["))
+		{
+			iface->array = true;
+			expect("]");
+		}
+		expect(";");
+	}
 
 	return iface.release();
 }