+#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
namespace GL {
namespace SL {
-Parser::Parser():
+Parser::Parser(ModuleCache *s):
+ mod_cache(s),
preprocessor(tokenizer),
module(0)
{
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())
{
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);
- // TODO Need to somehow get type names from imports
if(const Stage *builtin = get_builtins(Stage::SHARED))
{
- for(map<string, TypeDeclaration *>::const_iterator i=builtin->types.begin(); i!=builtin->types.end(); ++i)
- declared_types.insert(i->first);
- }
- else
- {
- declared_types.insert("void");
- declared_types.insert("bool");
- declared_types.insert("int");
- declared_types.insert("float");
+ for(const auto &kvp: builtin->types)
+ global_types.insert(kvp.first);
}
tokenizer.begin(source, name);
if(cur_stage->type!=Stage::SHARED)
module->stages.back().previous = cur_stage;
cur_stage = &module->stages.back();
+
+ stage_types.clear();
+ 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)
bool Parser::is_type(const string &token)
{
- return declared_types.count(token);
+ return global_types.count(token) || stage_types.count(token);
}
bool Parser::is_identifier(const string &token)
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();
}
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)=="(")
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;
}
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("=")))
{
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)
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;
}
else if(oper && oper->type==Operator::BINARY)
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;
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")
- {
- RefPtr<Literal> literal = new Literal;
- literal->token = tokenizer.parse_token();
- left = literal;
- }
+ left = parse_literal();
else if(is_identifier(token))
{
RefPtr<VariableReference> var = create_node<VariableReference>();
RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
unary->oper = oper;
tokenizer.parse_token();
- unary->expression = parse_expression(oper->precedence);
+ unary->expression = parse_expression(oper);
left = unary;
}
else
}
}
+RefPtr<Literal> Parser::parse_literal()
+{
+ 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 ?
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.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 = 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()!=")")
type = parse_basic_type_declaration();
tokenizer.expect(";");
- declared_types.insert(type->name);
+ cur_stage->types[type->name] = type.get();
+ if(cur_stage->type==Stage::SHARED)
+ global_types.insert(type->name);
+ else
+ stage_types.insert(type->name);
return type;
}
parse_block(strct->members, true, &Parser::parse_variable_declaration);
tokenizer.expect(";");
- declared_types.insert(strct->name);
+ cur_stage->types[strct->name] = strct.get();
+ if(cur_stage->type==Stage::SHARED)
+ global_types.insert(strct->name);
+ else
+ stage_types.insert(strct->name);
return strct;
}
{
RefPtr<FunctionDeclaration> func = create_node<FunctionDeclaration>();
+ func->virtua = check("virtual");
func->return_type = expect_type();
func->name = expect_identifier();
tokenizer.expect("(");
}
tokenizer.expect(")");
+ func->overrd = check("override");
+
string token = tokenizer.peek_token();
if(token=="{")
{
if(!is_interface_qualifier(iface->interface))
throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
- iface->name = expect_identifier();
- parse_block(iface->members, true, &Parser::parse_variable_declaration_with_layout);
+ iface->block_name = expect_identifier();
+ iface->members = new Block;
+ parse_block(*iface->members, true, &Parser::parse_variable_declaration_with_layout);
if(!check(";"))
{
iface->instance_name = expect_identifier();
projects / libs / gl.git / blobdiff