X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=0512c10b235ea6d384d17e319d9a4a5ce3e5c7b2;hb=91e65bc9e24a6889995081035f6f6f0a78a6c20e;hp=31f9fcb65cc7ffe4da48cacd8cc41e0c7787dba5;hpb=6dcf74922f46b086ad394c19fd6ce083a635b290;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 31f9fcb6..0512c10b 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -72,6 +72,7 @@ void Parser::parse_source(const string &name, int index)
 		declared_types.insert("void");
 		declared_types.insert("bool");
 		declared_types.insert("int");
+		declared_types.insert("uint");
 		declared_types.insert("float");
 	}
 
@@ -268,11 +269,19 @@ RefPtr<Statement> Parser::parse_global_declaration()
 		if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";")
 		{
 			RefPtr<InterfaceLayout> iface_lo = create_node<InterfaceLayout>();
+			iface_lo->layout.source = layout->source;
+			iface_lo->layout.line = layout->line;
 			iface_lo->layout.qualifiers = layout->qualifiers;
 			iface_lo->interface = tokenizer.parse_token();
 			tokenizer.expect(";");
 			return iface_lo;
 		}
+		else if(is_interface_qualifier(token) && tokenizer.peek_token(2)=="{")
+		{
+			RefPtr<InterfaceBlock> iface = parse_interface_block();
+			iface->layout = layout;
+			return iface;
+		}
 		else
 		{
 			RefPtr<VariableDeclaration> var = parse_variable_declaration();
@@ -389,9 +398,8 @@ RefPtr<Layout> Parser::parse_layout()
 		if(token==")")
 			throw parse_error(tokenizer.get_location(), token, "a layout qualifier name");
 
-		layout->qualifiers.push_back(Layout::Qualifier());
+		layout->qualifiers.push_back(token);
 		Layout::Qualifier &qual = layout->qualifiers.back();
-		qual.name = token;
 
 		if((qual.has_value = check("=")))
 		{
@@ -496,10 +504,8 @@ RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 			if(token=="(")
 			{
 				tokenizer.parse_token();
-				RefPtr<ParenthesizedExpression> parexpr = create_node<ParenthesizedExpression>();
-				parexpr->expression = parse_expression();
+				left = parse_expression();
 				tokenizer.expect(")");
-				left = parexpr;
 			}
 			else if(isdigit(token[0]) || token=="true" || token=="false")
 				left = parse_literal();
@@ -531,10 +537,14 @@ RefPtr<Literal> Parser::parse_literal()
 	if(isdigit(literal->token[0]))
 	{
 		// TODO have the tokenizer return the type of the token
-		if(isnumrc(literal->token))
-			literal->value = lexical_cast<int>(literal->token);
-		else
+		if(literal->token.back()=='u')
+			literal->value = lexical_cast<unsigned>(literal->token.substr(0, literal->token.size()-1));
+		else if(literal->token.back()=='f')
+			literal->value = lexical_cast<float>(literal->token.substr(0, literal->token.size()-1));
+		else if(literal->token.find('.')!=string::npos)
 			literal->value = lexical_cast<float>(literal->token);
+		else
+			literal->value = lexical_cast<int>(literal->token);
 	}
 	else if(literal->token=="true" || literal->token=="false")
 		literal->value = (literal->token=="true");
@@ -551,10 +561,10 @@ RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, co
 	binary->left = left;
 	binary->oper = &oper;
 	tokenizer.expect(oper.token);
-	if(oper.token[0]=='[')
+	if(oper.token2[0])
 	{
 		binary->right = parse_expression();
-		tokenizer.expect("]");
+		tokenizer.expect(oper.token2);
 	}
 	else
 		binary->right = parse_expression(&oper);
@@ -577,7 +587,6 @@ RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 {
 	RefPtr<FunctionCall> call = create_node<FunctionCall>();
 	call->name = var.name;
-	call->constructor = is_type(call->name);
 	call->oper = &Operator::get_operator("(", Operator::POSTFIX);
 	tokenizer.expect("(");
 	while(tokenizer.peek_token()!=")")
@@ -795,7 +804,7 @@ RefPtr<InterfaceBlock> Parser::parse_interface_block()
 	if(!is_interface_qualifier(iface->interface))
 		throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
 
-	iface->name = expect_identifier();
+	iface->block_name = expect_identifier();
 	iface->members = new Block;
 	parse_block(*iface->members, true, &Parser::parse_variable_declaration_with_layout);
 	if(!check(";"))