X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.cpp;h=596ed0456b8e789ec2bd5ac636790a7d97bc8c4c;hb=48e37a09b49cd4148db390170cfd07eef92c9d02;hp=f11b5bf2e73bb570981072de07cf69d6c32e1824;hpb=c760a61dd2ffc43c4f72fdfb7aa59949d4e59b06;p=libs%2Fgl.git

diff --git a/source/programparser.cpp b/source/programparser.cpp
index f11b5bf2..596ed045 100644
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -332,8 +332,27 @@ bool ProgramParser::is_identifier(const string &token)
 Node *ProgramParser::parse_global_declaration()
 {
 	string token = peek_token();
-	if(token=="layout")
-		return parse_layout();
+	if(token=="import")
+		return parse_import();
+	else if(token=="layout")
+	{
+		RefPtr<Layout> layout = parse_layout();
+		token = peek_token();
+		if(is_interface_qualifier(token) && peek_token(1)==";")
+		{
+			RefPtr<InterfaceLayout> iface_lo = new InterfaceLayout;
+			iface_lo->layout.qualifiers = layout->qualifiers;
+			iface_lo->interface = parse_token();
+			expect(";");
+			return iface_lo.release();
+		}
+		else
+		{
+			VariableDeclaration *var = parse_variable_declaration();
+			var->layout = layout.release();
+			return var;
+		}
+	}
 	else if(token=="struct")
 		return parse_struct_declaration();
 	else if(is_sampling_qualifier(token) || token=="const")
@@ -383,6 +402,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");
@@ -407,8 +438,6 @@ Layout *ProgramParser::parse_layout()
 		expect(",");
 	}
 	expect(")");
-	layout->interface = parse_token();
-	expect(";");
 
 	return layout.release();
 }
@@ -628,7 +657,7 @@ FunctionDeclaration *ProgramParser::parse_function_declaration()
 	string token = peek_token();
 	if(token=="{")
 	{
-		func->definition = true;
+		func->definition = func.get();
 		parse_block(func->body, true);
 	}
 	else if(token==";")