Redesign loading of GLSL sources

[libs/gl.git] / source / glsl / parser.cpp

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 0512c10b235ea6d384d17e319d9a4a5ce3e5c7b2..cbfa593ac590671b04f077f4bd2e44136f1312c7 100644 (file)
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -4,6 +4,7 @@
 #include <msp/strings/utils.h>
 #include "builtin.h"
 #include "glsl_error.h"
+#include "modulecache.h"
 #include "parser.h"
 
 #undef interface
@@ -14,7 +15,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Parser::Parser():
+Parser::Parser(ModuleCache *s):
+       mod_cache(s),
        preprocessor(tokenizer),
        module(0)
 {
@@ -25,20 +27,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())
        {
@@ -47,14 +45,10 @@ 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;