X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=cbfa593ac590671b04f077f4bd2e44136f1312c7;hb=f901fcf41d8ca544085f448227f84bc6f966660d;hp=7b034a4c671f1d854a06cfabcaad83d94859aa88;hpb=911c6c4acc8218bc40d93917207f9dc32e9f2596;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 7b034a4c..cbfa593a 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -4,6 +4,7 @@
 #include <msp/strings/utils.h>
 #include "builtin.h"
 #include "glsl_error.h"
+#include "modulecache.h"
 #include "parser.h"
 
 #undef interface
@@ -14,7 +15,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Parser::Parser():
+Parser::Parser(ModuleCache *s):
+	mod_cache(s),
 	preprocessor(tokenizer),
 	module(0)
 {
@@ -25,20 +27,16 @@ Parser::Parser():
 	preprocessor.signal_line.connect(sigc::mem_fun(this, &Parser::line_change));
 }
 
-Parser::~Parser()
-{
-	delete module;
-}
-
-Module &Parser::parse(const string &s, const string &n, int i)
+void Parser::parse(Module &m, const string &s, const string &n, int i)
 {
+	SetForScope<Module *> set_module(module, &m);
 	source = s;
 	parse_source(n, i);
-	return *module;
 }
 
-Module &Parser::parse(IO::Base &io, const string &n, int i)
+void Parser::parse(Module &m, IO::Base &io, const string &n, int i)
 {
+	SetForScope<Module *> set_module(module, &m);
 	source = string();
 	while(!io.eof())
 	{
@@ -47,14 +45,10 @@ Module &Parser::parse(IO::Base &io, const string &n, int i)
 		source.append(buffer, len);
 	}
 	parse_source(n, i);
-	return *module;
 }
 
 void Parser::parse_source(const string &name, int index)
 {
-	delete module;
-	module = new Module;
-
 	cur_stage = &module->shared;
 	base_index = index;
 	source_index = index;
@@ -72,6 +66,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 +263,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 +392,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 +498,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 +531,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");
@@ -577,7 +581,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 +798,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(";"))