X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.cpp;h=ddea96409dea4475e911e94fac01fda171451b57;hb=a0caabaed3aeb8947133d78986bfb4ae5ae3c893;hp=16299d20cf157f8281fc2face34d55a21712eee1;hpb=a29cc14162e911b36d18d1d1896216697c7dc0c1;p=libs%2Fgl.git

diff --git a/source/programparser.cpp b/source/programparser.cpp
index 16299d20..ddea9640 100644
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -218,7 +218,6 @@ bool ProgramParser::skip_comment_and_whitespace()
 	unsigned slashes = 0;
 	while(iter!=source.end())
 	{
-		//IO::print("%d '%c'\n", comment, *iter);
 		if(comment==0)
 		{
 			if(*iter=='/')
@@ -333,7 +332,9 @@ bool ProgramParser::is_identifier(const string &token)
 Node *ProgramParser::parse_global_declaration()
 {
 	string token = peek_token();
-	if(token=="layout")
+	if(token=="import")
+		return parse_import();
+	else if(token=="layout")
 		return parse_layout();
 	else if(token=="struct")
 		return parse_struct_declaration();
@@ -384,6 +385,18 @@ Node *ProgramParser::parse_statement()
 		throw runtime_error(format("Syntax error at '%s': expected a statement", token));
 }
 
+Import *ProgramParser::parse_import()
+{
+	if(cur_stage->type!=SHARED)
+		throw runtime_error("Imports are only allowed in the shared section");
+
+	expect("import");
+	RefPtr<Import> import = new Import;
+	import->module = parse_token();
+	expect(";");
+	return import.release();
+}
+
 Layout *ProgramParser::parse_layout()
 {
 	expect("layout");
@@ -494,6 +507,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;
@@ -509,12 +528,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));
 		}
@@ -523,7 +536,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=="[")
@@ -534,7 +547,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();
 }
 
@@ -614,12 +626,23 @@ FunctionDeclaration *ProgramParser::parse_function_declaration()
 
 	func->return_type = expect_type();
 	func->name = expect_identifier();
-	parse_function_parameter_list(*func);
+	expect("(");
+	while(peek_token()!=")")
+	{
+		if(!func->parameters.empty())
+			expect(",");
+
+		RefPtr<VariableDeclaration> var = new VariableDeclaration;
+		var->type = expect_type();
+		var->name = expect_identifier();
+		func->parameters.push_back(var.release());
+	}
+	expect(")");
 
 	string token = peek_token();
 	if(token=="{")
 	{
-		func->definition = true;
+		func->definition = func.get();
 		parse_block(func->body, true);
 	}
 	else if(token==";")
@@ -630,22 +653,6 @@ FunctionDeclaration *ProgramParser::parse_function_declaration()
 	return func.release();
 }
 
-void ProgramParser::parse_function_parameter_list(FunctionDeclaration &func)
-{
-	expect("(");
-	while(peek_token()!=")")
-	{
-		if(!func.parameters.empty())
-			expect(",");
-
-		RefPtr<VariableDeclaration> var = new VariableDeclaration;
-		var->type = expect_type();
-		var->name = expect_identifier();
-		func.parameters.push_back(var.release());
-	}
-	expect(")");
-}
-
 InterfaceBlock *ProgramParser::parse_interface_block()
 {
 	RefPtr<InterfaceBlock> iface = new InterfaceBlock;
@@ -656,7 +663,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();
 }
@@ -724,7 +740,8 @@ Return *ProgramParser::parse_return()
 {
 	expect("return");
 	RefPtr<Return> ret = new Return;
-	ret->expression = parse_expression();
+	if(peek_token()!=";")
+		ret->expression = parse_expression();
 	expect(";");
 	return ret.release();
 }