X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=b09d2b5550b47c321fba2a69feedc4d7c36f0293;hb=e195322eb1251f2eb0d6dfb8c2dc0fff02e5fcfc;hp=d9fdbc4ea998e56d98d2209e6a5d79558511bf34;hpb=7b73b63df12b3ace4231842aa291d6e1d7b3f948;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index d9fdbc4e..b09d2b55 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -29,14 +29,14 @@ Parser::~Parser()
 	delete module;
 }
 
-Module &Parser::parse(const string &s, const string &n, unsigned i)
+Module &Parser::parse(const string &s, const string &n, int i)
 {
 	source = s;
 	parse_source(n, i);
 	return *module;
 }
 
-Module &Parser::parse(IO::Base &io, const string &n, unsigned i)
+Module &Parser::parse(IO::Base &io, const string &n, int i)
 {
 	source = string();
 	while(!io.eof())
@@ -49,15 +49,16 @@ Module &Parser::parse(IO::Base &io, const string &n, unsigned i)
 	return *module;
 }
 
-void Parser::parse_source(const string &name, unsigned index)
+void Parser::parse_source(const string &name, int index)
 {
 	delete module;
 	module = new Module;
 	cur_stage = &module->shared;
 	base_index = index;
 	source_index = index;
-	source_reference(1, name);
-	tokenizer.begin(name, source);
+	if(index>=0)
+		source_reference(1, name);
+	tokenizer.begin(source, name);
 	allow_stage_change = true;
 	while(!tokenizer.peek_token().empty())
 		if(RefPtr<Statement> statement = parse_with_recovery(&Parser::parse_global_declaration))
@@ -74,7 +75,7 @@ void Parser::set_required_version(const Version &ver)
 
 void Parser::source_reference(unsigned index, const string &name)
 {
-	if(index<1)
+	if(index<1 || base_index<0)
 		throw invalid_shader_source(tokenizer.get_location(), "Invalid source reference");
 
 	module->source_map.set_name(base_index+index-1, name);
@@ -455,6 +456,7 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			{
 				RefPtr<MemberAccess> memacc = new MemberAccess;
 				memacc->left = left;
+				memacc->oper = oper;
 				tokenizer.parse_token();
 				memacc->member = expect_identifier();
 				left = memacc;
@@ -462,13 +464,13 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			else if(oper && oper->type==Operator::POSTFIX)
 			{
 				RefPtr<UnaryExpression> unary = new UnaryExpression;
-				unary->oper = tokenizer.parse_token();
-				unary->prefix = false;
+				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
 				throw parse_error(tokenizer.get_location(), token, "an operator");
 			left_var = 0;
@@ -499,8 +501,8 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			else if(oper && oper->type==Operator::PREFIX)
 			{
 				RefPtr<UnaryExpression> unary = new UnaryExpression;
-				unary->oper = tokenizer.parse_token();
-				unary->prefix = true;
+				unary->oper = oper;
+				tokenizer.parse_token();
 				unary->expression = parse_expression(oper->precedence);
 				left = unary;
 			}
@@ -510,19 +512,19 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 	}
 }
 
-RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator *oper)
+RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator &oper)
 {
-	RefPtr<BinaryExpression> binary = (oper->precedence==16 ? new Assignment : new BinaryExpression);
+	RefPtr<BinaryExpression> binary = (oper.precedence==16 ? new Assignment : new BinaryExpression);
 	binary->left = left;
-	binary->oper = tokenizer.parse_token();
-	if(binary->oper=="[")
+	binary->oper = &oper;
+	tokenizer.expect(oper.token);
+	if(oper.token[0]=='[')
 	{
 		binary->right = parse_expression();
 		tokenizer.expect("]");
-		binary->after = "]";
 	}
 	else
-		binary->right = parse_expression(oper->precedence+(oper->assoc==Operator::RIGHT_TO_LEFT));
+		binary->right = parse_expression(oper.precedence+(oper.assoc==Operator::RIGHT_TO_LEFT));
 	return binary;
 }
 
@@ -531,6 +533,7 @@ RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 	RefPtr<FunctionCall> call = new FunctionCall;
 	call->name = var.name;
 	call->constructor = is_type(call->name);
+	call->oper = &Operator::get_operator("(", Operator::POSTFIX);
 	tokenizer.expect("(");
 	while(tokenizer.peek_token()!=")")
 	{