{ { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
};
+ProgramParser::ProgramParser():
+ module(0)
+{ }
+
+ProgramParser::~ProgramParser()
+{
+ delete module;
+}
+
Module &ProgramParser::parse(const string &s)
{
source = s;
- parse_source(main_module);
- return main_module;
+ parse_source();
+ return *module;
}
Module &ProgramParser::parse(IO::Base &io)
unsigned len = io.read(buffer, sizeof(buffer));
source.append(buffer, len);
}
- parse_source(main_module);
- return main_module;
+ parse_source();
+ return *module;
}
-void ProgramParser::parse_source(Module &module)
+void ProgramParser::parse_source()
{
- cur_module = &module;
- cur_context = &module.global_context;
+ delete module;
+ module = new Module;
+ cur_stage = &module->shared;
iter = source.begin();
while(1)
{
while(Node *statement = parse_global_declaration())
- cur_context->content.body.push_back(statement);
- cur_context->present = !cur_context->content.body.empty();
+ cur_stage->content.body.push_back(statement);
- Context *prev_context = cur_context;
parse_token();
string token = parse_token();
if(token.empty())
break;
- else if(token=="global")
- cur_context = &module.global_context;
else if(token=="vertex")
- cur_context = &module.vertex_context;
+ module->stages.push_back(VERTEX);
else if(token=="geometry")
- cur_context = &module.geometry_context;
+ module->stages.push_back(GEOMETRY);
else if(token=="fragment")
- cur_context = &module.fragment_context;
+ module->stages.push_back(FRAGMENT);
else
- throw runtime_error(format("Parse error at '%s': expected context identifier", token));
- cur_context->previous = prev_context;
+ throw runtime_error(format("Parse error at '%s': expected stage identifier", token));
+
+ if(cur_stage->type!=SHARED)
+ module->stages.back().previous = cur_stage;
+ cur_stage = &module->stages.back();
for(; (iter!=source.end() && *iter!='\n'); ++iter) ;
}
unsigned slashes = 0;
while(iter!=source.end())
{
- //IO::print("%d '%c'\n", comment, *iter);
if(comment==0)
{
if(*iter=='/')
Node *ProgramParser::parse_global_declaration()
{
string token = peek_token();
- if(token=="layout")
+ if(token=="import")
+ return parse_import();
+ else if(token=="layout")
return parse_layout();
else if(token=="struct")
return parse_struct_declaration();
throw runtime_error(format("Syntax error at '%s': expected a statement", token));
}
+Import *ProgramParser::parse_import()
+{
+ if(cur_stage->type!=SHARED)
+ throw runtime_error("Imports are only allowed in the shared section");
+
+ expect("import");
+ RefPtr<Import> import = new Import;
+ import->module = parse_token();
+ expect(";");
+ return import.release();
+}
+
Layout *ProgramParser::parse_layout()
{
expect("layout");
expect(")");
left = parexpr;
}
+ else if(isdigit(token[0]) || token=="true" || token=="false")
+ {
+ RefPtr<Literal> literal = new Literal;
+ literal->token = parse_token();
+ left = literal;
+ }
else if(is_identifier(token))
{
RefPtr<VariableReference> var = new VariableReference;
unary->expression = parse_expression(oper->precedence);
left = unary;
}
- else if(isdigit(token[0]))
- {
- RefPtr<Literal> literal = new Literal;
- literal->token = parse_token();
- left = literal;
- }
else
throw runtime_error(format("Parse error at '%s': expected an expression", token));
}
BinaryExpression *ProgramParser::parse_binary(Expression *left, const Operator *oper)
{
- RefPtr<BinaryExpression> binary = new BinaryExpression;
+ RefPtr<BinaryExpression> binary = (oper->precedence==16 ? new Assignment : new BinaryExpression);
binary->left = left;
binary->oper = parse_token();
if(binary->oper=="[")
}
else
binary->right = parse_expression(oper->precedence+(oper->assoc==RIGHT_TO_LEFT));
- binary->assignment = (oper->precedence==16);
return binary.release();
}
func->return_type = expect_type();
func->name = expect_identifier();
- parse_function_parameter_list(*func);
+ expect("(");
+ while(peek_token()!=")")
+ {
+ if(!func->parameters.empty())
+ expect(",");
+
+ RefPtr<VariableDeclaration> var = new VariableDeclaration;
+ var->type = expect_type();
+ var->name = expect_identifier();
+ func->parameters.push_back(var.release());
+ }
+ expect(")");
string token = peek_token();
if(token=="{")
{
- func->definition = true;
+ func->definition = func.get();
parse_block(func->body, true);
}
else if(token==";")
return func.release();
}
-void ProgramParser::parse_function_parameter_list(FunctionDeclaration &func)
-{
- expect("(");
- while(peek_token()!=")")
- {
- if(!func.parameters.empty())
- expect(",");
-
- RefPtr<VariableDeclaration> var = new VariableDeclaration;
- var->type = expect_type();
- var->name = expect_identifier();
- func.parameters.push_back(var.release());
- }
- expect(")");
-}
-
InterfaceBlock *ProgramParser::parse_interface_block()
{
RefPtr<InterfaceBlock> iface = new InterfaceBlock;
iface->name = expect_identifier();
parse_block(iface->members, true);
- expect(";");
+ if(!check(";"))
+ {
+ iface->instance_name = expect_identifier();
+ if(check("["))
+ {
+ iface->array = true;
+ expect("]");
+ }
+ expect(";");
+ }
return iface.release();
}
{
expect("passthrough");
RefPtr<Passthrough> pass = new Passthrough;
- if(cur_context->type==GEOMETRY)
+ if(cur_stage->type==GEOMETRY)
{
expect("[");
pass->subscript = parse_expression();
{
expect("return");
RefPtr<Return> ret = new Return;
- ret->expression = parse_expression();
+ if(peek_token()!=";")
+ ret->expression = parse_expression();
expect(";");
return ret.release();
}
projects / libs / gl.git / blobdiff