X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=8c10c443002e130fa01f42b32ceb18cbe5f4d772;hp=1f0d712467f3b43c2d9990dfa277bb1c46d0ff42;hb=HEAD;hpb=9ec831710f64a62ad5f2e896a55ae82a3519f29e

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 1f0d7124..615d75d4 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -1,8 +1,11 @@
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
+#include "builtin.h"
 #include "glsl_error.h"
+#include "modulecache.h"
 #include "parser.h"
 
 #undef interface
@@ -13,7 +16,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Parser::Parser():
+Parser::Parser(ModuleCache *s):
+	mod_cache(s),
 	preprocessor(tokenizer),
 	module(0)
 {
@@ -24,20 +28,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())
 	{
@@ -46,23 +46,34 @@ 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;
 	if(index>=0)
 		source_reference(1, name);
-	tokenizer.begin(name, source);
+
+	if(const Stage *builtin = get_builtins(Stage::SHARED))
+	{
+		for(const auto &kvp: builtin->types)
+			global_types.insert(kvp.first);
+	}
+
+	tokenizer.begin(source, name);
 	allow_stage_change = true;
 	while(!tokenizer.peek_token().empty())
 		if(RefPtr<Statement> statement = parse_with_recovery(&Parser::parse_global_declaration))
+		{
 			cur_stage->content.body.push_back(statement);
+			if(next_global_declaration)
+			{
+				cur_stage->content.body.push_back(next_global_declaration);
+				next_global_declaration = 0;
+			}
+		}
 
 	if(!errors.empty())
 		throw invalid_shader_source(join(errors.begin(), errors.end(), "\n"));
@@ -93,6 +104,22 @@ void Parser::stage_change(Stage::Type stage)
 	if(cur_stage->type!=Stage::SHARED)
 		module->stages.back().previous = cur_stage;
 	cur_stage = &module->stages.back();
+
+	stage_types.clear();
+	if(const Stage *builtin = get_builtins(stage))
+	{
+		for(const auto &kvp: builtin->types)
+			stage_types.insert(kvp.first);
+	}
+	for(const Module *m: imported_modules)
+	{
+		auto j = find_member(m->stages, stage, &Stage::type);
+		if(j!=m->stages.end())
+		{
+			for(const auto &kvp: j->types)
+				stage_types.insert(kvp.first);
+		}
+	}
 }
 
 void Parser::line_change(int index, unsigned line)
@@ -149,7 +176,7 @@ bool Parser::is_interface_qualifier(const string &token)
 
 bool Parser::is_sampling_qualifier(const string &token)
 {
-	return (token=="centroid" || token=="sample");
+	return (token=="centroid" || token=="sample" || token=="patch");
 }
 
 bool Parser::is_interpolation_qualifier(const string &token)
@@ -171,21 +198,24 @@ bool Parser::is_qualifier(const string &token)
 		is_precision_qualifier(token));
 }
 
-bool Parser::is_builtin_type(const string &token)
-{
-	static Regex re("^(void|float|int|bool|[ib]?vec[234]|mat[234](x[234])?|sampler((1D|2D|Cube)(Array)?(Shadow)?|3D))$");
-	return re.match(token);
-}
-
 bool Parser::is_type(const string &token)
 {
-	return is_builtin_type(token) || declared_types.count(token);
+	return global_types.count(token) || stage_types.count(token);
 }
 
 bool Parser::is_identifier(const string &token)
 {
 	static Regex re("^[a-zA-Z_][a-zA-Z0-9_]*$");
-	return re.match(token);
+	return static_cast<bool>(re.match(token));
+}
+
+template<typename T>
+RefPtr<T> Parser::create_node()
+{
+	RefPtr<T> node = new T;
+	node->source = source_index;
+	node->line = tokenizer.get_location().line;
+	return node;
 }
 
 template<typename T>
@@ -247,14 +277,22 @@ RefPtr<Statement> Parser::parse_global_declaration()
 		token = tokenizer.peek_token();
 		if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";")
 		{
-			RefPtr<InterfaceLayout> iface_lo = new InterfaceLayout;
-			iface_lo->source = source_index;
-			iface_lo->line = tokenizer.get_location().line;
+			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<StructDeclaration> iface_strct = parse_interface_block();
+			VariableDeclaration *iface_var = iface_strct->block_declaration;
+			iface_var->layout = layout;
+			next_global_declaration = iface_var;
+			return iface_strct;
+		}
 		else
 		{
 			RefPtr<VariableDeclaration> var = parse_variable_declaration();
@@ -262,6 +300,8 @@ RefPtr<Statement> Parser::parse_global_declaration()
 			return var;
 		}
 	}
+	else if(token=="typedef")
+		return parse_type_declaration();
 	else if(token=="struct")
 		return parse_struct_declaration();
 	else if(is_interface_qualifier(token))
@@ -270,10 +310,16 @@ RefPtr<Statement> Parser::parse_global_declaration()
 		if(is_type(next) || is_qualifier(next))
 			return parse_variable_declaration();
 		else
-			return parse_interface_block();
+		{
+			RefPtr<StructDeclaration> iface_strct = parse_interface_block();
+			next_global_declaration = iface_strct->block_declaration;
+			return iface_strct;
+		}
 	}
 	else if(is_qualifier(token))
 		return parse_variable_declaration();
+	else if(token=="virtual")
+		return parse_function_declaration();
 	else if(is_type(token))
 	{
 		if(tokenizer.peek_token(2)=="(")
@@ -302,9 +348,7 @@ RefPtr<Statement> Parser::parse_statement()
 		return parse_return();
 	else if(token=="break" || token=="continue" || token=="discard")
 	{
-		RefPtr<Jump> jump = new Jump;
-		jump->source = source_index;
-		jump->line = tokenizer.get_location().line;
+		RefPtr<Jump> jump = create_node<Jump>();
 		jump->keyword = tokenizer.parse_token();
 		tokenizer.expect(";");
 
@@ -319,9 +363,7 @@ RefPtr<Statement> Parser::parse_statement()
 	}
 	else if(!token.empty())
 	{
-		RefPtr<ExpressionStatement> expr = new ExpressionStatement;
-		expr->source = source_index;
-		expr->line = tokenizer.get_location().line;
+		RefPtr<ExpressionStatement> expr = create_node<ExpressionStatement>();
 		expr->expression = parse_expression();
 		tokenizer.expect(";");
 
@@ -337,29 +379,32 @@ RefPtr<Import> Parser::parse_import()
 		throw invalid_shader_source(tokenizer.get_location(), "Imports are only allowed in the shared section");
 
 	tokenizer.expect("import");
-	RefPtr<Import> import = new Import;
-	import->source = source_index;
-	import->line = tokenizer.get_location().line;
+	RefPtr<Import> import = create_node<Import>();
 	import->module = expect_identifier();
 	tokenizer.expect(";");
+
+	if(mod_cache)
+	{
+		const Module &imported_mod = mod_cache->get_module(import->module);
+		imported_modules.push_back(&imported_mod);
+		for(const auto &kvp: imported_mod.shared.types)
+			global_types.insert(kvp.first);
+	}
+
 	return import;
 }
 
 RefPtr<Precision> Parser::parse_precision()
 {
 	tokenizer.expect("precision");
-	RefPtr<Precision> precision = new Precision;
-	precision->source = source_index;
-	precision->line = tokenizer.get_location().line;
+	RefPtr<Precision> precision = create_node<Precision>();
 
 	precision->precision = tokenizer.parse_token();
 	if(!is_precision_qualifier(precision->precision))
 		throw parse_error(tokenizer.get_location(), precision->precision, "a precision qualifier");
 
-	precision->type = tokenizer.parse_token();
-	// Not entirely accurate; only float, int and sampler types are allowed
-	if(!is_builtin_type(precision->type))
-		throw parse_error(tokenizer.get_location(), precision->type, "a builtin type");
+	// TODO Add validation for this
+	precision->type = expect_type();
 
 	tokenizer.expect(";");
 
@@ -370,16 +415,15 @@ RefPtr<Layout> Parser::parse_layout()
 {
 	tokenizer.expect("layout");
 	tokenizer.expect("(");
-	RefPtr<Layout> layout = new Layout;
+	RefPtr<Layout> layout = create_node<Layout>();
 	while(1)
 	{
 		string token = tokenizer.parse_token();
 		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("=")))
 		{
@@ -424,8 +468,9 @@ void Parser::parse_block(Block &block, bool require_braces, RefPtr<T> (Parser::*
 		tokenizer.expect("}");
 }
 
-RefPtr<Expression> Parser::parse_expression(unsigned precedence)
+RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 {
+	unsigned outer_precedence = (outer_oper ? outer_oper->precedence+(outer_oper->assoc==Operator::RIGHT_TO_LEFT) : 20);
 	RefPtr<Expression> left;
 	VariableReference *left_var = 0;
 	while(1)
@@ -437,7 +482,8 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			if(token==i->token && (!left || i->type!=Operator::PREFIX) && (left || i->type!=Operator::POSTFIX))
 				oper = i;
 
-		if(token==";" || token==")" || token=="]" || token=="," || (oper && precedence && oper->precedence>=precedence))
+		bool lower_precedence = (oper && oper->type!=Operator::PREFIX && oper->precedence>=outer_precedence);
+		if(token==";" || token==")" || token=="]" || token=="," || token==":" || lower_precedence)
 		{
 			if(left)
 				return left;
@@ -454,22 +500,25 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			}
 			else if(token==".")
 			{
-				RefPtr<MemberAccess> memacc = new MemberAccess;
+				RefPtr<MemberAccess> memacc = create_node<MemberAccess>();
 				memacc->left = left;
+				memacc->oper = oper;
 				tokenizer.parse_token();
 				memacc->member = expect_identifier();
 				left = memacc;
 			}
 			else if(oper && oper->type==Operator::POSTFIX)
 			{
-				RefPtr<UnaryExpression> unary = new UnaryExpression;
-				unary->oper = tokenizer.parse_token();
-				unary->prefix = false;
+				RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
+				unary->oper = oper;
+				tokenizer.parse_token();
 				unary->expression = left;
 				left = unary;
 			}
 			else if(oper && oper->type==Operator::BINARY)
-				left = parse_binary(left, oper);
+				left = parse_binary(left, *oper);
+			else if(oper && oper->type==Operator::TERNARY)
+				left = parse_ternary(left, *oper);
 			else
 				throw parse_error(tokenizer.get_location(), token, "an operator");
 			left_var = 0;
@@ -479,30 +528,24 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			if(token=="(")
 			{
 				tokenizer.parse_token();
-				RefPtr<ParenthesizedExpression> parexpr = new ParenthesizedExpression;
-				parexpr->expression = parse_expression();
+				left = parse_expression();
 				tokenizer.expect(")");
-				left = parexpr;
 			}
 			else if(isdigit(token[0]) || token=="true" || token=="false")
-			{
-				RefPtr<Literal> literal = new Literal;
-				literal->token = tokenizer.parse_token();
-				left = literal;
-			}
+				left = parse_literal();
 			else if(is_identifier(token))
 			{
-				RefPtr<VariableReference> var = new VariableReference;
+				RefPtr<VariableReference> var = create_node<VariableReference>();
 				var->name = expect_identifier();
 				left = var;
 				left_var = var.get();
 			}
 			else if(oper && oper->type==Operator::PREFIX)
 			{
-				RefPtr<UnaryExpression> unary = new UnaryExpression;
-				unary->oper = tokenizer.parse_token();
-				unary->prefix = true;
-				unary->expression = parse_expression(oper->precedence);
+				RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
+				unary->oper = oper;
+				tokenizer.parse_token();
+				unary->expression = parse_expression(oper);
 				left = unary;
 			}
 			else
@@ -511,27 +554,64 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 	}
 }
 
-RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator *oper)
+RefPtr<Literal> Parser::parse_literal()
 {
-	RefPtr<BinaryExpression> binary = (oper->precedence==16 ? new Assignment : new BinaryExpression);
+	RefPtr<Literal> literal = create_node<Literal>();
+	literal->token = tokenizer.parse_token();
+	if(isdigit(literal->token[0]))
+	{
+		// TODO have the tokenizer return the type of the token
+		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");
+	else
+		throw parse_error(tokenizer.get_location(), literal->token, "a literal");
+
+	return literal;
+}
+
+RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator &oper)
+{
+	RefPtr<BinaryExpression> binary = (oper.precedence==16 ?
+		static_cast<RefPtr<BinaryExpression> >(create_node<Assignment>()) : create_node<BinaryExpression>());
 	binary->left = left;
-	binary->oper = tokenizer.parse_token();
-	if(binary->oper=="[")
+	binary->oper = &oper;
+	tokenizer.expect(oper.token);
+	if(oper.token2[0])
 	{
 		binary->right = parse_expression();
-		tokenizer.expect("]");
-		binary->after = "]";
+		tokenizer.expect(oper.token2);
 	}
 	else
-		binary->right = parse_expression(oper->precedence+(oper->assoc==Operator::RIGHT_TO_LEFT));
+		binary->right = parse_expression(&oper);
 	return binary;
 }
 
+RefPtr<TernaryExpression> Parser::parse_ternary(const RefPtr<Expression> &cond, const Operator &oper)
+{
+	RefPtr<TernaryExpression> ternary = create_node<TernaryExpression>();
+	ternary->condition = cond;
+	ternary->oper = &oper;
+	tokenizer.expect("?");
+	ternary->true_expr = parse_expression(&oper);
+	tokenizer.expect(":");
+	ternary->false_expr = parse_expression(&oper);
+	return ternary;
+}
+
 RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 {
-	RefPtr<FunctionCall> call = new FunctionCall;
+	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()!=")")
 	{
@@ -543,26 +623,125 @@ RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 	return call;
 }
 
+void Parser::add_type(TypeDeclaration &type)
+{
+	cur_stage->types[type.name] = &type;
+	if(cur_stage->type==Stage::SHARED)
+		global_types.insert(type.name);
+	else
+		stage_types.insert(type.name);
+}
+
+RefPtr<TypeDeclaration> Parser::parse_type_declaration()
+{
+	tokenizer.expect("typedef");
+
+	RefPtr<TypeDeclaration> type;
+	if(tokenizer.peek_token()=="image")
+		type = parse_image_type_declaration();
+	else
+		type = parse_basic_type_declaration();
+
+	tokenizer.expect(";");
+	add_type(*type);
+	return type;
+}
+
+RefPtr<BasicTypeDeclaration> Parser::parse_basic_type_declaration()
+{
+	RefPtr<BasicTypeDeclaration> type = create_node<BasicTypeDeclaration>();
+
+	if(tokenizer.peek_token()=="vector")
+	{
+		type->kind = BasicTypeDeclaration::VECTOR;
+
+		tokenizer.parse_token();
+		tokenizer.expect("(");
+		type->size = expect_integer();
+		tokenizer.expect(")");
+	}
+
+	type->base = expect_type();
+	type->name = expect_identifier();
+
+	if(type->kind==BasicTypeDeclaration::ALIAS && check("["))
+	{
+		type->kind = BasicTypeDeclaration::ARRAY;
+		tokenizer.expect("]");
+	}
+
+	return type;
+}
+
+RefPtr<ImageTypeDeclaration> Parser::parse_image_type_declaration()
+{
+	tokenizer.expect("image");
+	tokenizer.expect("(");
+
+	RefPtr<ImageTypeDeclaration> type = create_node<ImageTypeDeclaration>();
+	while(1)
+	{
+		string token = tokenizer.parse_token();
+		if(token=="dimensions")
+		{
+			tokenizer.expect("=");
+			token = tokenizer.parse_token();
+			if(token=="1")
+				type->dimensions = ImageTypeDeclaration::ONE;
+			else if(token=="2")
+				type->dimensions = ImageTypeDeclaration::TWO;
+			else if(token=="3")
+				type->dimensions = ImageTypeDeclaration::THREE;
+			else if(token=="cube")
+				type->dimensions = ImageTypeDeclaration::CUBE;
+			else
+				throw parse_error(tokenizer.get_location(), token, "dimensions");
+
+			if(check("["))
+			{
+				type->array = true;
+				tokenizer.expect("]");
+			}
+		}
+		else if(token=="sampled")
+			type->sampled = true;
+		else if(token=="shadow")
+			type->shadow = true;
+		else if(token=="multisample")
+			type->multisample = true;
+		else
+			throw parse_error(tokenizer.get_location(), token, "image type attribute");
+
+		token = tokenizer.peek_token();
+		if(token==")")
+			break;
+
+		tokenizer.expect(",");
+	}
+	tokenizer.expect(")");
+
+	type->base = expect_type();
+	type->name = expect_identifier();
+
+	return type;
+}
+
 RefPtr<StructDeclaration> Parser::parse_struct_declaration()
 {
 	tokenizer.expect("struct");
-	RefPtr<StructDeclaration> strct = new StructDeclaration;
-	strct->source = source_index;
-	strct->line = tokenizer.get_location().line;
+	RefPtr<StructDeclaration> strct = create_node<StructDeclaration>();
 
 	strct->name = expect_identifier();
 	parse_block(strct->members, true, &Parser::parse_variable_declaration);
 	tokenizer.expect(";");
 
-	declared_types.insert(strct->name);
+	add_type(*strct);
 	return strct;
 }
 
 RefPtr<VariableDeclaration> Parser::parse_variable_declaration()
 {
-	RefPtr<VariableDeclaration> var = new VariableDeclaration;
-	var->source = source_index;
-	var->line = tokenizer.get_location().line;
+	RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
 
 	string token = tokenizer.peek_token();
 	while(is_qualifier(token))
@@ -615,10 +794,9 @@ RefPtr<VariableDeclaration> Parser::parse_variable_declaration_with_layout()
 
 RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 {
-	RefPtr<FunctionDeclaration> func = new FunctionDeclaration;
-	func->source = source_index;
-	func->line = tokenizer.get_location().line;
+	RefPtr<FunctionDeclaration> func = create_node<FunctionDeclaration>();
 
+	func->virtua = check("virtual");
 	func->return_type = expect_type();
 	func->name = expect_identifier();
 	tokenizer.expect("(");
@@ -627,7 +805,7 @@ RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 		if(!func->parameters.empty())
 			tokenizer.expect(",");
 
-		RefPtr<VariableDeclaration> var = new VariableDeclaration;
+		RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
 		string token = tokenizer.peek_token();
 		if(token=="in" || token=="out" || token=="inout")
 			var->interface = tokenizer.parse_token();
@@ -637,6 +815,8 @@ RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 	}
 	tokenizer.expect(")");
 
+	func->overrd = check("override");
+
 	string token = tokenizer.peek_token();
 	if(token=="{")
 	{
@@ -651,38 +831,49 @@ RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 	return func;
 }
 
-RefPtr<InterfaceBlock> Parser::parse_interface_block()
+RefPtr<StructDeclaration> Parser::parse_interface_block()
 {
-	RefPtr<InterfaceBlock> iface = new InterfaceBlock;
-	iface->source = source_index;
-	iface->line = tokenizer.get_location().line;
+	RefPtr<StructDeclaration> strct = create_node<StructDeclaration>();
+	RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
 
-	iface->interface = tokenizer.parse_token();
-	if(!is_interface_qualifier(iface->interface))
-		throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
+	var->interface = tokenizer.parse_token();
+	if(!is_interface_qualifier(var->interface))
+		throw parse_error(tokenizer.get_location(), var->interface, "an interface qualifier");
 
-	iface->name = expect_identifier();
-	parse_block(iface->members, true, &Parser::parse_variable_declaration_with_layout);
+	strct->block_name = expect_identifier();
+	string name_base = format("_%s_%s", var->interface, strct->block_name);
+	strct->name = name_base;
+	for(unsigned i=1; (stage_types.count(strct->name) || global_types.count(strct->name)); ++i)
+		strct->name = format("%s_%d", name_base, i);
+	var->type = strct->name;
+	parse_block(strct->members, true, &Parser::parse_variable_declaration_with_layout);
 	if(!check(";"))
 	{
-		iface->instance_name = expect_identifier();
+		var->name = expect_identifier();
 		if(check("["))
 		{
-			iface->array = true;
-			tokenizer.expect("]");
+			var->array = true;
+			if(!check("]"))
+			{
+				var->array_size = parse_expression();
+				tokenizer.expect("]");
+			}
 		}
 		tokenizer.expect(";");
 	}
+	else
+		var->name = format("%s %s", var->interface, strct->block_name);
+
+	strct->block_declaration = var.release();
+	add_type(*strct);
 
-	return iface;
+	return strct;
 }
 
 RefPtr<Conditional> Parser::parse_conditional()
 {
 	tokenizer.expect("if");
-	RefPtr<Conditional> cond = new Conditional;
-	cond->source = source_index;
-	cond->line = tokenizer.get_location().line;
+	RefPtr<Conditional> cond = create_node<Conditional>();
 	tokenizer.expect("(");
 	cond->condition = parse_expression();
 	tokenizer.expect(")");
@@ -702,9 +893,7 @@ RefPtr<Conditional> Parser::parse_conditional()
 RefPtr<Iteration> Parser::parse_for()
 {
 	tokenizer.expect("for");
-	RefPtr<Iteration> loop = new Iteration;
-	loop->source = source_index;
-	loop->line = tokenizer.get_location().line;
+	RefPtr<Iteration> loop = create_node<Iteration>();
 	tokenizer.expect("(");
 	string token = tokenizer.peek_token();
 	if(is_type(token))
@@ -713,7 +902,7 @@ RefPtr<Iteration> Parser::parse_for()
 	{
 		if(token!=";")
 		{
-			RefPtr<ExpressionStatement> expr = new ExpressionStatement;
+			RefPtr<ExpressionStatement> expr = create_node<ExpressionStatement>();
 			expr->expression = parse_expression();
 			loop->init_statement = expr;
 		}
@@ -734,9 +923,7 @@ RefPtr<Iteration> Parser::parse_for()
 RefPtr<Iteration> Parser::parse_while()
 {
 	tokenizer.expect("while");
-	RefPtr<Iteration> loop = new Iteration;
-	loop->source = source_index;
-	loop->line = tokenizer.get_location().line;
+	RefPtr<Iteration> loop = create_node<Iteration>();
 	tokenizer.expect("(");
 	loop->condition = parse_expression();
 	tokenizer.expect(")");
@@ -749,9 +936,7 @@ RefPtr<Iteration> Parser::parse_while()
 RefPtr<Passthrough> Parser::parse_passthrough()
 {
 	tokenizer.expect("passthrough");
-	RefPtr<Passthrough> pass = new Passthrough;
-	pass->source = source_index;
-	pass->line = tokenizer.get_location().line;
+	RefPtr<Passthrough> pass = create_node<Passthrough>();
 	if(cur_stage->type==Stage::GEOMETRY)
 	{
 		tokenizer.expect("[");
@@ -765,9 +950,7 @@ RefPtr<Passthrough> Parser::parse_passthrough()
 RefPtr<Return> Parser::parse_return()
 {
 	tokenizer.expect("return");
-	RefPtr<Return> ret = new Return;
-	ret->source = source_index;
-	ret->line = tokenizer.get_location().line;
+	RefPtr<Return> ret = create_node<Return>();
 	if(tokenizer.peek_token()!=";")
 		ret->expression = parse_expression();
 	tokenizer.expect(";");