#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;
declared_types.insert("void");
declared_types.insert("bool");
declared_types.insert("int");
+ declared_types.insert("uint");
declared_types.insert("float");
}
if(isdigit(literal->token[0]))
{
// TODO have the tokenizer return the type of the token
- if(literal->token.back()=='f')
+ 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);