From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 3 Jul 2018 23:22:56 +0000 (+0300)
Subject: Rearrange GLSL qualifier parsing
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=191610b71271a765c8056ef947b2b04b8bfa84b5

Rearrange GLSL qualifier parsing

GLSL 4.20 allows qualifiers to be in any order so there's no sense to
enforce a particular order here.  Always output them in a compatible
order though.
---

diff --git a/source/programparser.cpp b/source/programparser.cpp
index f38f3909..80917ba3 100644
--- a/source/programparser.cpp
+++ b/source/programparser.cpp
@@ -449,7 +449,7 @@ RefPtr<Node> ProgramParser::parse_global_declaration()
 	else if(is_interface_qualifier(token))
 	{
 		string next = peek_token(1);
-		if(is_type(next) || is_precision_qualifier(next))
+		if(is_type(next) || is_qualifier(next))
 			return parse_variable_declaration();
 		else
 			return parse_interface_block();
@@ -718,25 +718,20 @@ RefPtr<VariableDeclaration> ProgramParser::parse_variable_declaration()
 	RefPtr<VariableDeclaration> var = new VariableDeclaration;
 
 	string token = peek_token();
-	if(is_sampling_qualifier(token))
+	while(is_qualifier(token))
 	{
-		var->sampling = parse_token();
-		token = peek_token();
-		if(!is_interface_qualifier(token))
-			throw runtime_error(format_syntax_error("an interface qualifier"));
-	}
-
-	if(is_interface_qualifier(token))
-		var->interface = parse_token();
-	else if(token=="const")
-	{
-		var->constant = true;
 		parse_token();
+		if(is_interface_qualifier(token))
+			var->interface = token;
+		else if(is_sampling_qualifier(token))
+			var->sampling = token;
+		else if(is_precision_qualifier(token))
+			var->precision = token;
+		else if(token=="const")
+			var->constant = true;
+		token = peek_token();
 	}
 
-	if(is_precision_qualifier(token))
-		var->precision = parse_token();
-
 	var->type = expect_type();
 	var->name = expect_identifier();