]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/parser.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / glsl / parser.cpp
index d55cdab3abc5ff426fbf89b3edeab1d56109ddff..615d75d426a38e1e2e83dabf09fee6edd23b78e7 100644 (file)
@@ -1,6 +1,11 @@
+#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
@@ -11,303 +16,156 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Parser::Operator Parser::operators[] =
-{
-       { "[", 2, BINARY, LEFT_TO_RIGHT },
-       { "(", 2, BINARY, LEFT_TO_RIGHT },
-       { ".", 2, BINARY, LEFT_TO_RIGHT },
-       { "++", 2, POSTFIX, LEFT_TO_RIGHT },
-       { "--", 2, POSTFIX, LEFT_TO_RIGHT },
-       { "++", 3, PREFIX, RIGHT_TO_LEFT },
-       { "--", 3, PREFIX, RIGHT_TO_LEFT },
-       { "+", 3, PREFIX, RIGHT_TO_LEFT },
-       { "-", 3, PREFIX, RIGHT_TO_LEFT },
-       { "~", 3, PREFIX, RIGHT_TO_LEFT },
-       { "!", 3, PREFIX, RIGHT_TO_LEFT },
-       { "*", 4, BINARY, LEFT_TO_RIGHT },
-       { "/", 4, BINARY, LEFT_TO_RIGHT },
-       { "%", 4, BINARY, LEFT_TO_RIGHT },
-       { "+", 5, BINARY, LEFT_TO_RIGHT },
-       { "-", 5, BINARY, LEFT_TO_RIGHT },
-       { "<<", 6, BINARY, LEFT_TO_RIGHT },
-       { ">>", 6, BINARY, LEFT_TO_RIGHT },
-       { "<", 7, BINARY, LEFT_TO_RIGHT },
-       { ">", 7, BINARY, LEFT_TO_RIGHT },
-       { "<=", 7, BINARY, LEFT_TO_RIGHT },
-       { ">=", 7, BINARY, LEFT_TO_RIGHT },
-       { "==", 8, BINARY, LEFT_TO_RIGHT },
-       { "!=", 8, BINARY, LEFT_TO_RIGHT },
-       { "&", 9, BINARY, LEFT_TO_RIGHT },
-       { "^", 10, BINARY, LEFT_TO_RIGHT },
-       { "|", 11, BINARY, LEFT_TO_RIGHT },
-       { "&&", 12, BINARY, LEFT_TO_RIGHT },
-       { "^^", 13, BINARY, LEFT_TO_RIGHT },
-       { "||", 14, BINARY, LEFT_TO_RIGHT },
-       { "?", 15, BINARY, RIGHT_TO_LEFT },
-       { ":", 15, BINARY, RIGHT_TO_LEFT },
-       { "=", 16, BINARY, RIGHT_TO_LEFT },
-       { "+=", 16, BINARY, RIGHT_TO_LEFT },
-       { "-=", 16, BINARY, RIGHT_TO_LEFT },
-       { "*=", 16, BINARY, RIGHT_TO_LEFT },
-       { "/=", 16, BINARY, RIGHT_TO_LEFT },
-       { "%=", 16, BINARY, RIGHT_TO_LEFT },
-       { "<<=", 16, BINARY, RIGHT_TO_LEFT },
-       { ">>=", 16, BINARY, RIGHT_TO_LEFT },
-       { "&=", 16, BINARY, RIGHT_TO_LEFT },
-       { "^=", 16, BINARY, RIGHT_TO_LEFT },
-       { "|=", 16, BINARY, RIGHT_TO_LEFT },
-       { ",", 17, BINARY, LEFT_TO_RIGHT },
-       { { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
-};
-
-Parser::Parser():
+Parser::Parser(ModuleCache *s):
+       mod_cache(s),
+       preprocessor(tokenizer),
        module(0)
-{ }
-
-Parser::~Parser()
 {
-       delete module;
+       tokenizer.signal_preprocess.connect(sigc::mem_fun(&preprocessor, &Preprocessor::preprocess));
+       preprocessor.signal_version.connect(sigc::mem_fun(this, &Parser::set_required_version));
+       preprocessor.signal_source.connect(sigc::mem_fun(this, &Parser::source_reference));
+       preprocessor.signal_stage_change.connect(sigc::mem_fun(this, &Parser::stage_change));
+       preprocessor.signal_line.connect(sigc::mem_fun(this, &Parser::line_change));
 }
 
-Module &Parser::parse(const string &s, const string &n, unsigned i)
+void Parser::parse(Module &m, const string &s, const string &n, int i)
 {
+       SetForScope<Module *> set_module(module, &m);
        source = s;
-       source_name = n;
-       source_index = i;
-       parse_source();
-       return *module;
+       parse_source(n, i);
 }
 
-Module &Parser::parse(IO::Base &io, const string &n, unsigned i)
+void Parser::parse(Module &m, IO::Base &io, const string &n, int i)
 {
+       SetForScope<Module *> set_module(module, &m);
        source = string();
-       source_name = n;
-       source_index = i;
        while(!io.eof())
        {
                char buffer[4096];
                unsigned len = io.read(buffer, sizeof(buffer));
                source.append(buffer, len);
        }
-       parse_source();
-       return *module;
+       parse_source(n, i);
 }
 
-void Parser::parse_source()
+void Parser::parse_source(const string &name, int index)
 {
-       while(1)
-       {
-               string::size_type slashes = source.find("//////");
-               if(slashes==string::npos)
-                       break;
-
-               string::size_type newline = source.find('\n', slashes);
-               string pragma = format("#pragma MSP stage(%s)", source.substr(slashes+6, newline-slashes-6));
-               source.replace(slashes, newline-slashes, pragma);
-       }
-
-       delete module;
-       module = new Module;
        cur_stage = &module->shared;
-       iter = source.begin();
-       source_end = source.end();
-       current_line = 1;
-       allow_preprocess = true;
-       while(RefPtr<Statement> statement = parse_global_declaration())
-               cur_stage->content.body.push_back(statement);
-}
-
-string Parser::format_error(const std::string &message)
-{
-       string location = format("%s:%d: ", source_name, current_line);
-       return location+message;
-}
+       base_index = index;
+       source_index = index;
+       if(index>=0)
+               source_reference(1, name);
 
-string Parser::format_syntax_error(const std::string &expected)
-{
-       return format_error(format("Syntax error at '%s': expected %s", last_token, expected));
-}
-
-const string &Parser::peek_token(unsigned index)
-{
-       while(next_tokens.size()<=index)
-               next_tokens.push_back(parse_token_());
-       return (last_token = next_tokens[index]);
-}
-
-const string &Parser::parse_token()
-{
-       if(!next_tokens.empty())
+       if(const Stage *builtin = get_builtins(Stage::SHARED))
        {
-               last_token = next_tokens.front();
-               next_tokens.pop_front();
-               return last_token;
+               for(const auto &kvp: builtin->types)
+                       global_types.insert(kvp.first);
        }
 
-       return (last_token = parse_token_());
-}
-
-string Parser::parse_token_()
-{
-       while(1)
-       {
-               skip_comment_and_whitespace();
-               if(iter==source_end)
-                       return string();
-               else if(allow_preprocess && *iter=='#')
+       tokenizer.begin(source, name);
+       allow_stage_change = true;
+       while(!tokenizer.peek_token().empty())
+               if(RefPtr<Statement> statement = parse_with_recovery(&Parser::parse_global_declaration))
                {
-                       allow_preprocess = false;
-                       SetForScope<deque<string> > clear_tokens(next_tokens, deque<string>());
-                       preprocess();
+                       cur_stage->content.body.push_back(statement);
+                       if(next_global_declaration)
+                       {
+                               cur_stage->content.body.push_back(next_global_declaration);
+                               next_global_declaration = 0;
+                       }
                }
-               else if(isalpha(*iter) || *iter=='_')
-                       return parse_identifier();
-               else if(isdigit(*iter))
-                       return parse_number();
-               else
-                       return parse_other();
-       }
+
+       if(!errors.empty())
+               throw invalid_shader_source(join(errors.begin(), errors.end(), "\n"));
 }
 
-string Parser::parse_identifier()
+void Parser::set_required_version(const Version &ver)
 {
-       string ident;
-       while(iter!=source_end)
-       {
-               if(isalnum(*iter) || *iter=='_')
-                       ident += *iter++;
-               else
-                       break;
-       }
-
-       return ident;
+       cur_stage->required_features.glsl_version = ver;
 }
 
-string Parser::parse_number()
+void Parser::source_reference(unsigned index, const string &name)
 {
-       bool accept_sign = false;
-       string number;
-       while(iter!=source_end)
-       {
-               if(isdigit(*iter) || *iter=='.')
-                       number += *iter++;
-               else if(*iter=='e' || *iter=='E')
-               {
-                       number += *iter++;
-                       accept_sign = true;
-               }
-               else if(accept_sign && (*iter=='+' || *iter=='-'))
-                       number += *iter++;
-               else
-                       break;
-       }
+       if(index<1 || base_index<0)
+               throw invalid_shader_source(tokenizer.get_location(), "Invalid source reference");
 
-       return number;
+       module->source_map.set_name(base_index+index-1, name);
 }
 
-string Parser::parse_other()
+void Parser::stage_change(Stage::Type stage)
 {
-       if(iter==source_end)
-               return string();
+       if(!allow_stage_change)
+               throw invalid_shader_source(tokenizer.get_location(), "Changing stage not allowed here");
+       else if(stage<=cur_stage->type)
+               throw invalid_shader_source(tokenizer.get_location(), "Stage '%s' not allowed here", Stage::get_stage_name(stage));
 
-       string token(1, *iter++);
-       for(unsigned i=1; (i<3 && iter!=source_end); ++i)
-       {
-               bool matched = false;
-               for(const Operator *j=operators; (!matched && j->type); ++j)
-               {
-                       matched = (j->token[i]==*iter);
-                       for(unsigned k=0; (matched && k<i && j->token[k]); ++k)
-                               matched = (j->token[k]==token[k]);
-               }
+       module->stages.push_back(stage);
 
-               if(!matched)
-                       break;
+       if(cur_stage->type!=Stage::SHARED)
+               module->stages.back().previous = cur_stage;
+       cur_stage = &module->stages.back();
 
-               token += *iter++;
+       stage_types.clear();
+       if(const Stage *builtin = get_builtins(stage))
+       {
+               for(const auto &kvp: builtin->types)
+                       stage_types.insert(kvp.first);
        }
-
-       return token;
-}
-
-void Parser::skip_comment_and_whitespace()
-{
-       unsigned comment = 0;
-       while(iter!=source_end)
+       for(const Module *m: imported_modules)
        {
-               if(comment==0)
-               {
-                       if(*iter=='/')
-                               comment = 1;
-                       else if(!isspace(*iter))
-                               break;
-               }
-               else if(comment==1)
-               {
-                       if(*iter=='/')
-                               comment = 2;
-                       else if(*iter=='*')
-                               comment = 3;
-                       else
-                       {
-                               comment = 0;
-                               --iter;
-                               break;
-                       }
-               }
-               else if(comment==2)
+               auto j = find_member(m->stages, stage, &Stage::type);
+               if(j!=m->stages.end())
                {
-                       if(*iter=='\n')
-                               comment = 0;
+                       for(const auto &kvp: j->types)
+                               stage_types.insert(kvp.first);
                }
-               else if(comment==3 && *iter=='*')
-                       comment = 4;
-               else if(comment==4)
-               {
-                       if(*iter=='/')
-                               comment = 0;
-                       else if(*iter!='*')
-                               comment = 3;
-               }
-
-               if(*iter=='\n')
-               {
-                       ++current_line;
-                       allow_preprocess = (comment<3);
-               }
-
-               ++iter;
        }
 }
 
-void Parser::expect(const string &token)
+void Parser::line_change(int index, unsigned line)
 {
-       string parsed = parse_token();
-       if(parsed!=token)
-               throw runtime_error(format_syntax_error(format("'%s'", token)));
+       if(index>0)
+               source_index = base_index+index-1;
+       else if(index==0)
+               source_index = 0;
+       else
+               index = source_index;
+
+       string name = module->source_map.get_name(index);
+       if(name.empty())
+               name = format("<%d>", index);
+       tokenizer.set_location(Location(name, line));
 }
 
 string Parser::expect_type()
 {
-       string token = parse_token();
+       string token = tokenizer.parse_token();
        if(!is_type(token))
-               throw runtime_error(format_syntax_error("a type"));
+               throw parse_error(tokenizer.get_location(), token, "a type");
        return token;
 }
 
 string Parser::expect_identifier()
 {
-       string token = parse_token();
+       string token = tokenizer.parse_token();
        if(!is_identifier(token))
-               throw runtime_error(format_syntax_error("an identifier"));
+               throw parse_error(tokenizer.get_location(), token, "an identifier");
        return token;
 }
 
+int Parser::expect_integer()
+{
+       string token = tokenizer.parse_token();
+       if(!isnumrc(token))
+               throw parse_error(tokenizer.get_location(), token, "an integer literal");
+       return lexical_cast<int>(token);
+}
+
 bool Parser::check(const string &token)
 {
-       bool result = (peek_token()==token);
+       bool result = (tokenizer.peek_token()==token);
        if(result)
-               parse_token();
+               tokenizer.parse_token();
        return result;
 }
 
@@ -318,7 +176,7 @@ bool Parser::is_interface_qualifier(const string &token)
 
 bool Parser::is_sampling_qualifier(const string &token)
 {
-       return (token=="centroid" || token=="sample");
+       return (token=="centroid" || token=="sample" || token=="patch");
 }
 
 bool Parser::is_interpolation_qualifier(const string &token)
@@ -340,112 +198,74 @@ bool Parser::is_qualifier(const string &token)
                is_precision_qualifier(token));
 }
 
-bool Parser::is_builtin_type(const string &token)
-{
-       static Regex re("^(void|float|int|bool|[ib]?vec[234]|mat[234](x[234])?|sampler((1D|2D|Cube)(Array)?(Shadow)?|3D))$");
-       return re.match(token);
-}
-
 bool Parser::is_type(const string &token)
 {
-       return is_builtin_type(token) || declared_types.count(token);
+       return global_types.count(token) || stage_types.count(token);
 }
 
 bool Parser::is_identifier(const string &token)
 {
        static Regex re("^[a-zA-Z_][a-zA-Z0-9_]*$");
-       return re.match(token);
-}
-
-void Parser::preprocess()
-{
-       expect("#");
-
-       string::const_iterator line_end = iter;
-       for(; (line_end!=source_end && *line_end!='\n'); ++line_end) ;
-       SetForScope<string::const_iterator> stop_at_line_end(source_end, line_end);
-
-       string token = peek_token();
-       if(token=="pragma")
-               preprocess_pragma();
-       else if(token=="version")
-               preprocess_version();
-       else if(token=="define" || token=="undef" || token=="if" || token=="ifdef" || token=="ifndef" || token=="else" ||
-               token=="elif" || token=="endif" || token=="error" || token=="extension" || token=="line")
-               throw runtime_error(format_error(format("Unsupported preprocessor directive '%s'", token)));
-       else if(!token.empty())
-               throw runtime_error(format_syntax_error("a preprocessor directive"));
-
-       iter = line_end;
-}
-
-void Parser::preprocess_version()
-{
-       expect("version");
-       string token = parse_token();
-       unsigned version = lexical_cast<unsigned>(token);
-       cur_stage->required_version = Version(version/100, version%100);
-
-       token = parse_token();
-       if(!token.empty())
-               throw runtime_error(format_syntax_error("end of line"));
-}
-
-void Parser::preprocess_pragma()
-{
-       expect("pragma");
-       string token = parse_token();
-       if(token=="MSP")
-               preprocess_pragma_msp();
+       return static_cast<bool>(re.match(token));
 }
 
-void Parser::preprocess_pragma_msp()
+template<typename T>
+RefPtr<T> Parser::create_node()
 {
-       string token = peek_token();
-       if(token=="stage")
-               preprocess_stage();
-       else
-               throw runtime_error(format_error(format("Unrecognized MSP pragma '%s'", token)));
-
-       token = parse_token();
-       if(!token.empty())
-               throw runtime_error(format_syntax_error("end of line"));
+       RefPtr<T> node = new T;
+       node->source = source_index;
+       node->line = tokenizer.get_location().line;
+       return node;
 }
 
-void Parser::preprocess_stage()
+template<typename T>
+RefPtr<T> Parser::parse_with_recovery(RefPtr<T> (Parser::*parse_func)())
 {
-       if(!allow_stage_change)
-               throw runtime_error(format_error("Changing stage not allowed here"));
-
-       expect("stage");
-       expect("(");
-       string token = expect_identifier();
-       StageType stage = SHARED;
-       if(token=="vertex")
-               stage = VERTEX;
-       else if(token=="geometry")
-               stage = GEOMETRY;
-       else if(token=="fragment")
-               stage = FRAGMENT;
-       else
-               throw runtime_error(format_syntax_error("stage identifier"));
-       expect(")");
+       tokenizer.clear_progress_mark();
+       try
+       {
+               return (this->*parse_func)();
+       }
+       catch(const invalid_shader_source &exc)
+       {
+               errors.push_back(exc.what());
+       }
 
-       if(stage<=cur_stage->type)
-               throw runtime_error(format_error(format("Stage '%s' not allowed here", token)));
+       if(tokenizer.get_last_token()!=";" || !tokenizer.get_progress_mark())
+       {
+               unsigned scope_level = 0;
+               while(1)
+               {
+                       if(tokenizer.peek_token()=="}" && scope_level==0)
+                       {
+                               if(!tokenizer.get_progress_mark())
+                                       tokenizer.parse_token();
+                               break;
+                       }
 
-       module->stages.push_back(stage);
+                       string token = tokenizer.parse_token();
+                       if(token=="}")
+                       {
+                               --scope_level;
+                               if(scope_level==0)
+                                       break;
+                       }
+                       else if(token=="{")
+                               ++scope_level;
+                       else if(token==";" && scope_level==0)
+                               break;
+                       else if(token.empty())
+                               break;
+               }
+       }
 
-       if(cur_stage->type!=SHARED)
-               module->stages.back().previous = cur_stage;
-       cur_stage = &module->stages.back();
+       return RefPtr<T>();
 }
 
 RefPtr<Statement> Parser::parse_global_declaration()
 {
-       allow_stage_change = true;
-       string token = peek_token();
-       allow_stage_change = false;
+       string token = tokenizer.peek_token();
+       SetFlag disallow(allow_stage_change, false);
 
        if(token=="import")
                return parse_import();
@@ -454,17 +274,25 @@ RefPtr<Statement> Parser::parse_global_declaration()
        else if(token=="layout")
        {
                RefPtr<Layout> layout = parse_layout();
-               token = peek_token();
-               if(is_interface_qualifier(token) && peek_token(1)==";")
+               token = tokenizer.peek_token();
+               if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";")
                {
-                       RefPtr<InterfaceLayout> iface_lo = new InterfaceLayout;
-                       iface_lo->source = source_index;
-                       iface_lo->line = current_line;
+                       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 = parse_token();
-                       expect(";");
+                       iface_lo->interface = tokenizer.parse_token();
+                       tokenizer.expect(";");
                        return iface_lo;
                }
+               else if(is_interface_qualifier(token) && tokenizer.peek_token(2)=="{")
+               {
+                       RefPtr<StructDeclaration> iface_strct = parse_interface_block();
+                       VariableDeclaration *iface_var = iface_strct->block_declaration;
+                       iface_var->layout = layout;
+                       next_global_declaration = iface_var;
+                       return iface_strct;
+               }
                else
                {
                        RefPtr<VariableDeclaration> var = parse_variable_declaration();
@@ -472,21 +300,29 @@ RefPtr<Statement> Parser::parse_global_declaration()
                        return var;
                }
        }
+       else if(token=="typedef")
+               return parse_type_declaration();
        else if(token=="struct")
                return parse_struct_declaration();
        else if(is_interface_qualifier(token))
        {
-               string next = peek_token(1);
+               string next = tokenizer.peek_token(1);
                if(is_type(next) || is_qualifier(next))
                        return parse_variable_declaration();
                else
-                       return parse_interface_block();
+               {
+                       RefPtr<StructDeclaration> iface_strct = parse_interface_block();
+                       next_global_declaration = iface_strct->block_declaration;
+                       return iface_strct;
+               }
        }
        else if(is_qualifier(token))
                return parse_variable_declaration();
+       else if(token=="virtual")
+               return parse_function_declaration();
        else if(is_type(token))
        {
-               if(peek_token(2)=="(")
+               if(tokenizer.peek_token(2)=="(")
                        return parse_function_declaration();
                else
                        return parse_variable_declaration();
@@ -494,12 +330,12 @@ RefPtr<Statement> Parser::parse_global_declaration()
        else if(token.empty())
                return 0;
        else
-               throw runtime_error(format_syntax_error("a global declaration"));
+               throw parse_error(tokenizer.get_location(), token, "a global declaration");
 }
 
 RefPtr<Statement> Parser::parse_statement()
 {
-       string token = peek_token();
+       string token = tokenizer.peek_token();
        if(token=="if")
                return parse_conditional();
        else if(token=="for")
@@ -512,257 +348,405 @@ RefPtr<Statement> Parser::parse_statement()
                return parse_return();
        else if(token=="break" || token=="continue" || token=="discard")
        {
-               RefPtr<Jump> jump = new Jump;
-               jump->source = source_index;
-               jump->line = current_line;
-               jump->keyword = parse_token();
-               expect(";");
+               RefPtr<Jump> jump = create_node<Jump>();
+               jump->keyword = tokenizer.parse_token();
+               tokenizer.expect(";");
 
                return jump;
        }
        else if(is_qualifier(token) || is_type(token))
                return parse_variable_declaration();
+       else if(token==";")
+       {
+               tokenizer.parse_token();
+               throw invalid_shader_source(tokenizer.get_location(), "Empty statement not allowed");
+       }
        else if(!token.empty())
        {
-               RefPtr<ExpressionStatement> expr = new ExpressionStatement;
-               expr->source = source_index;
-               expr->line = current_line;
+               RefPtr<ExpressionStatement> expr = create_node<ExpressionStatement>();
                expr->expression = parse_expression();
-               expect(";");
+               tokenizer.expect(";");
 
                return expr;
        }
        else
-               throw runtime_error(format_syntax_error("a statement"));
+               throw parse_error(tokenizer.get_location(), token, "a statement");
 }
 
 RefPtr<Import> Parser::parse_import()
 {
-       if(cur_stage->type!=SHARED)
-               throw runtime_error(format_error("Imports are only allowed in the shared section"));
+       if(cur_stage->type!=Stage::SHARED)
+               throw invalid_shader_source(tokenizer.get_location(), "Imports are only allowed in the shared section");
 
-       expect("import");
-       RefPtr<Import> import = new Import;
-       import->source = source_index;
-       import->line = current_line;
+       tokenizer.expect("import");
+       RefPtr<Import> import = create_node<Import>();
        import->module = expect_identifier();
-       expect(";");
+       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;
 }
 
 RefPtr<Precision> Parser::parse_precision()
 {
-       expect("precision");
-       RefPtr<Precision> precision = new Precision;
-       precision->source = source_index;
-       precision->line = current_line;
+       tokenizer.expect("precision");
+       RefPtr<Precision> precision = create_node<Precision>();
 
-       precision->precision = parse_token();
+       precision->precision = tokenizer.parse_token();
        if(!is_precision_qualifier(precision->precision))
-               throw runtime_error(format_syntax_error("a precision qualifier"));
+               throw parse_error(tokenizer.get_location(), precision->precision, "a precision qualifier");
 
-       precision->type = parse_token();
-       // Not entirely accurate; only float, int and sampler types are allowed
-       if(!is_builtin_type(precision->type))
-               throw runtime_error(format_syntax_error("a builtin type"));
+       // TODO Add validation for this
+       precision->type = expect_type();
 
-       expect(";");
+       tokenizer.expect(";");
 
        return precision;
 }
 
 RefPtr<Layout> Parser::parse_layout()
 {
-       expect("layout");
-       expect("(");
-       RefPtr<Layout> layout = new Layout;
+       tokenizer.expect("layout");
+       tokenizer.expect("(");
+       RefPtr<Layout> layout = create_node<Layout>();
        while(1)
        {
-               string token = parse_token();
+               string token = tokenizer.parse_token();
                if(token==")")
-                       throw runtime_error(format_syntax_error("a layout qualifier name"));
+                       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.identifier = token;
 
-               if(check("="))
-                       qual.value = parse_token();
+               if((qual.has_value = check("=")))
+               {
+                       if(qual.name=="constant_id" && tokenizer.peek_token()=="auto")
+                       {
+                               qual.value = -1;
+                               tokenizer.parse_token();
+                       }
+                       else
+                               qual.value = expect_integer();
+               }
 
-               if(peek_token()==")")
+               if(tokenizer.peek_token()==")")
                        break;
 
-               expect(",");
+               tokenizer.expect(",");
        }
-       expect(")");
+       tokenizer.expect(")");
 
        return layout;
 }
 
-void Parser::parse_block(Block &block, bool require_braces)
+template<typename T>
+void Parser::parse_block(Block &block, bool require_braces, RefPtr<T> (Parser::*parse_content)())
 {
-       bool have_braces = (require_braces || peek_token()=="{");
+       bool have_braces = (require_braces || tokenizer.peek_token()=="{");
        if(have_braces)
-               expect("{");
+               tokenizer.expect("{");
 
        if(have_braces)
        {
-               while(peek_token()!="}")
-                       block.body.push_back(parse_statement());
+               while(tokenizer.peek_token()!="}")
+                       if(RefPtr<Statement> node = parse_with_recovery(parse_content))
+                               block.body.push_back(node);
        }
        else
-               block.body.push_back(parse_statement());
+               block.body.push_back((this->*parse_content)());
 
        block.use_braces = (require_braces || block.body.size()!=1);
 
        if(have_braces)
-               expect("}");
+               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)
        {
-               string token = peek_token();
+               string token = tokenizer.peek_token();
 
                const Operator *oper = 0;
-               for(Operator *i=operators; (!oper && i->type); ++i)
-                       if(token==i->token && (!left || i->type!=PREFIX) && (left || i->type!=POSTFIX))
+               for(const Operator *i=Operator::operators; (!oper && i->type); ++i)
+                       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
-                               throw runtime_error(format_syntax_error("an expression"));
+                               throw parse_error(tokenizer.get_location(), token, "an expression");
                }
                else if(left)
                {
                        if(token=="(")
                        {
                                if(!left_var)
-                                       throw runtime_error(format_error("Syntax error before '(': function name must be an identifier"));
+                                       throw invalid_shader_source(tokenizer.get_location(), "Syntax error before '(': function name must be an identifier");
                                left = parse_function_call(*left_var);
                        }
                        else if(token==".")
                        {
-                               RefPtr<MemberAccess> memacc = new MemberAccess;
+                               RefPtr<MemberAccess> memacc = create_node<MemberAccess>();
                                memacc->left = left;
-                               parse_token();
+                               memacc->oper = oper;
+                               tokenizer.parse_token();
                                memacc->member = expect_identifier();
                                left = memacc;
                        }
-                       else if(oper && oper->type==POSTFIX)
+                       else if(oper && oper->type==Operator::POSTFIX)
                        {
-                               RefPtr<UnaryExpression> unary = new UnaryExpression;
-                               unary->oper = parse_token();
-                               unary->prefix = false;
+                               RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
+                               unary->oper = oper;
+                               tokenizer.parse_token();
                                unary->expression = left;
                                left = unary;
                        }
-                       else if(oper && oper->type==BINARY)
-                               left = parse_binary(left, oper);
+                       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 runtime_error(format_syntax_error("an operator"));
+                               throw parse_error(tokenizer.get_location(), token, "an operator");
                        left_var = 0;
                }
                else
                {
                        if(token=="(")
                        {
-                               parse_token();
-                               RefPtr<ParenthesizedExpression> parexpr = new ParenthesizedExpression;
-                               parexpr->expression = parse_expression();
-                               expect(")");
-                               left = parexpr;
+                               tokenizer.parse_token();
+                               left = parse_expression();
+                               tokenizer.expect(")");
                        }
                        else if(isdigit(token[0]) || token=="true" || token=="false")
-                       {
-                               RefPtr<Literal> literal = new Literal;
-                               literal->token = parse_token();
-                               left = literal;
-                       }
+                               left = parse_literal();
                        else if(is_identifier(token))
                        {
-                               RefPtr<VariableReference> var = new VariableReference;
+                               RefPtr<VariableReference> var = create_node<VariableReference>();
                                var->name = expect_identifier();
                                left = var;
                                left_var = var.get();
                        }
-                       else if(oper && oper->type==PREFIX)
+                       else if(oper && oper->type==Operator::PREFIX)
                        {
-                               RefPtr<UnaryExpression> unary = new UnaryExpression;
-                               unary->oper = parse_token();
-                               unary->prefix = true;
-                               unary->expression = parse_expression(oper->precedence);
+                               RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
+                               unary->oper = oper;
+                               tokenizer.parse_token();
+                               unary->expression = parse_expression(oper);
                                left = unary;
                        }
                        else
-                               throw runtime_error(format_syntax_error("an expression"));
+                               throw parse_error(tokenizer.get_location(), token, "an expression");
                }
        }
 }
 
-RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator *oper)
+RefPtr<Literal> Parser::parse_literal()
 {
-       RefPtr<BinaryExpression> binary = (oper->precedence==16 ? new Assignment : new BinaryExpression);
+       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 ?
+               static_cast<RefPtr<BinaryExpression> >(create_node<Assignment>()) : create_node<BinaryExpression>());
        binary->left = left;
-       binary->oper = parse_token();
-       if(binary->oper=="[")
+       binary->oper = &oper;
+       tokenizer.expect(oper.token);
+       if(oper.token2[0])
        {
                binary->right = parse_expression();
-               expect("]");
-               binary->after = "]";
+               tokenizer.expect(oper.token2);
        }
        else
-               binary->right = parse_expression(oper->precedence+(oper->assoc==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 = new FunctionCall;
+       RefPtr<FunctionCall> call = create_node<FunctionCall>();
        call->name = var.name;
-       call->constructor = is_type(call->name);
-       expect("(");
-       while(peek_token()!=")")
+       call->oper = &Operator::get_operator("(", Operator::POSTFIX);
+       tokenizer.expect("(");
+       while(tokenizer.peek_token()!=")")
        {
                if(!call->arguments.empty())
-                       expect(",");
+                       tokenizer.expect(",");
                call->arguments.push_back(parse_expression());
        }
-       expect(")");
+       tokenizer.expect(")");
        return call;
 }
 
+void Parser::add_type(TypeDeclaration &type)
+{
+       cur_stage->types[type.name] = &type;
+       if(cur_stage->type==Stage::SHARED)
+               global_types.insert(type.name);
+       else
+               stage_types.insert(type.name);
+}
+
+RefPtr<TypeDeclaration> Parser::parse_type_declaration()
+{
+       tokenizer.expect("typedef");
+
+       RefPtr<TypeDeclaration> type;
+       if(tokenizer.peek_token()=="image")
+               type = parse_image_type_declaration();
+       else
+               type = parse_basic_type_declaration();
+
+       tokenizer.expect(";");
+       add_type(*type);
+       return type;
+}
+
+RefPtr<BasicTypeDeclaration> Parser::parse_basic_type_declaration()
+{
+       RefPtr<BasicTypeDeclaration> type = create_node<BasicTypeDeclaration>();
+
+       if(tokenizer.peek_token()=="vector")
+       {
+               type->kind = BasicTypeDeclaration::VECTOR;
+
+               tokenizer.parse_token();
+               tokenizer.expect("(");
+               type->size = expect_integer();
+               tokenizer.expect(")");
+       }
+
+       type->base = expect_type();
+       type->name = expect_identifier();
+
+       if(type->kind==BasicTypeDeclaration::ALIAS && check("["))
+       {
+               type->kind = BasicTypeDeclaration::ARRAY;
+               tokenizer.expect("]");
+       }
+
+       return type;
+}
+
+RefPtr<ImageTypeDeclaration> Parser::parse_image_type_declaration()
+{
+       tokenizer.expect("image");
+       tokenizer.expect("(");
+
+       RefPtr<ImageTypeDeclaration> type = create_node<ImageTypeDeclaration>();
+       while(1)
+       {
+               string token = tokenizer.parse_token();
+               if(token=="dimensions")
+               {
+                       tokenizer.expect("=");
+                       token = tokenizer.parse_token();
+                       if(token=="1")
+                               type->dimensions = ImageTypeDeclaration::ONE;
+                       else if(token=="2")
+                               type->dimensions = ImageTypeDeclaration::TWO;
+                       else if(token=="3")
+                               type->dimensions = ImageTypeDeclaration::THREE;
+                       else if(token=="cube")
+                               type->dimensions = ImageTypeDeclaration::CUBE;
+                       else
+                               throw parse_error(tokenizer.get_location(), token, "dimensions");
+
+                       if(check("["))
+                       {
+                               type->array = true;
+                               tokenizer.expect("]");
+                       }
+               }
+               else if(token=="sampled")
+                       type->sampled = true;
+               else if(token=="shadow")
+                       type->shadow = true;
+               else if(token=="multisample")
+                       type->multisample = true;
+               else
+                       throw parse_error(tokenizer.get_location(), token, "image type attribute");
+
+               token = tokenizer.peek_token();
+               if(token==")")
+                       break;
+
+               tokenizer.expect(",");
+       }
+       tokenizer.expect(")");
+
+       type->base = expect_type();
+       type->name = expect_identifier();
+
+       return type;
+}
+
 RefPtr<StructDeclaration> Parser::parse_struct_declaration()
 {
-       expect("struct");
-       RefPtr<StructDeclaration> strct = new StructDeclaration;
-       strct->source = source_index;
-       strct->line = current_line;
+       tokenizer.expect("struct");
+       RefPtr<StructDeclaration> strct = create_node<StructDeclaration>();
 
        strct->name = expect_identifier();
-       parse_block(strct->members, true);
-       expect(";");
+       parse_block(strct->members, true, &Parser::parse_variable_declaration);
+       tokenizer.expect(";");
 
-       declared_types.insert(strct->name);
+       add_type(*strct);
        return strct;
 }
 
 RefPtr<VariableDeclaration> Parser::parse_variable_declaration()
 {
-       RefPtr<VariableDeclaration> var = new VariableDeclaration;
-       var->source = source_index;
-       var->line = current_line;
+       RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
 
-       string token = peek_token();
+       string token = tokenizer.peek_token();
        while(is_qualifier(token))
        {
-               parse_token();
+               tokenizer.parse_token();
                if(is_interface_qualifier(token))
                        var->interface = token;
                else if(is_sampling_qualifier(token))
@@ -773,7 +757,7 @@ RefPtr<VariableDeclaration> Parser::parse_variable_declaration()
                        var->precision = token;
                else if(token=="const")
                        var->constant = true;
-               token = peek_token();
+               token = tokenizer.peek_token();
        }
 
        var->type = expect_type();
@@ -785,98 +769,122 @@ RefPtr<VariableDeclaration> Parser::parse_variable_declaration()
                if(!check("]"))
                {
                        var->array_size = parse_expression();
-                       expect("]");
+                       tokenizer.expect("]");
                }
        }
 
        if(check("="))
                var->init_expression = parse_expression();
 
-       expect(";");
+       tokenizer.expect(";");
+       return var;
+}
+
+RefPtr<VariableDeclaration> Parser::parse_variable_declaration_with_layout()
+{
+       RefPtr<Layout> layout;
+       if(tokenizer.peek_token()=="layout")
+               layout = parse_layout();
+
+       RefPtr<VariableDeclaration> var = parse_variable_declaration();
+       var->layout = layout;
+
        return var;
 }
 
 RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 {
-       RefPtr<FunctionDeclaration> func = new FunctionDeclaration;
-       func->source = source_index;
-       func->line = current_line;
+       RefPtr<FunctionDeclaration> func = create_node<FunctionDeclaration>();
 
+       func->virtua = check("virtual");
        func->return_type = expect_type();
        func->name = expect_identifier();
-       expect("(");
-       while(peek_token()!=")")
+       tokenizer.expect("(");
+       while(tokenizer.peek_token()!=")")
        {
                if(!func->parameters.empty())
-                       expect(",");
+                       tokenizer.expect(",");
 
-               RefPtr<VariableDeclaration> var = new VariableDeclaration;
-               string token = peek_token();
+               RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
+               string token = tokenizer.peek_token();
                if(token=="in" || token=="out" || token=="inout")
-                       var->interface = parse_token();
+                       var->interface = tokenizer.parse_token();
                var->type = expect_type();
                var->name = expect_identifier();
                func->parameters.push_back(var);
        }
-       expect(")");
+       tokenizer.expect(")");
+
+       func->overrd = check("override");
 
-       string token = peek_token();
+       string token = tokenizer.peek_token();
        if(token=="{")
        {
                func->definition = func.get();
-               parse_block(func->body, true);
+               parse_block(func->body, true, &Parser::parse_statement);
        }
        else if(token==";")
-               parse_token();
+               tokenizer.parse_token();
        else
-               throw runtime_error(format_syntax_error("'{' or ';'"));
+               throw parse_error(tokenizer.get_location(), token, "'{' or ';'");
 
        return func;
 }
 
-RefPtr<InterfaceBlock> Parser::parse_interface_block()
+RefPtr<StructDeclaration> Parser::parse_interface_block()
 {
-       RefPtr<InterfaceBlock> iface = new InterfaceBlock;
-       iface->source = source_index;
-       iface->line = current_line;
+       RefPtr<StructDeclaration> strct = create_node<StructDeclaration>();
+       RefPtr<VariableDeclaration> var = create_node<VariableDeclaration>();
 
-       iface->interface = parse_token();
-       if(!is_interface_qualifier(iface->interface))
-               throw runtime_error(format_syntax_error("an interface qualifier"));
+       var->interface = tokenizer.parse_token();
+       if(!is_interface_qualifier(var->interface))
+               throw parse_error(tokenizer.get_location(), var->interface, "an interface qualifier");
 
-       iface->name = expect_identifier();
-       parse_block(iface->members, true);
+       strct->block_name = expect_identifier();
+       string name_base = format("_%s_%s", var->interface, strct->block_name);
+       strct->name = name_base;
+       for(unsigned i=1; (stage_types.count(strct->name) || global_types.count(strct->name)); ++i)
+               strct->name = format("%s_%d", name_base, i);
+       var->type = strct->name;
+       parse_block(strct->members, true, &Parser::parse_variable_declaration_with_layout);
        if(!check(";"))
        {
-               iface->instance_name = expect_identifier();
+               var->name = expect_identifier();
                if(check("["))
                {
-                       iface->array = true;
-                       expect("]");
+                       var->array = true;
+                       if(!check("]"))
+                       {
+                               var->array_size = parse_expression();
+                               tokenizer.expect("]");
+                       }
                }
-               expect(";");
+               tokenizer.expect(";");
        }
+       else
+               var->name = format("%s %s", var->interface, strct->block_name);
+
+       strct->block_declaration = var.release();
+       add_type(*strct);
 
-       return iface;
+       return strct;
 }
 
 RefPtr<Conditional> Parser::parse_conditional()
 {
-       expect("if");
-       RefPtr<Conditional> cond = new Conditional;
-       cond->source = source_index;
-       cond->line = current_line;
-       expect("(");
+       tokenizer.expect("if");
+       RefPtr<Conditional> cond = create_node<Conditional>();
+       tokenizer.expect("(");
        cond->condition = parse_expression();
-       expect(")");
+       tokenizer.expect(")");
 
-       parse_block(cond->body, false);
+       parse_block(cond->body, false, &Parser::parse_statement);
 
-       string token = peek_token();
+       string token = tokenizer.peek_token();
        if(token=="else")
        {
-               parse_token();
-               parse_block(cond->else_body, false);
+               tokenizer.parse_token();
+               parse_block(cond->else_body, false, &Parser::parse_statement);
        }
 
        return cond;
@@ -884,76 +892,68 @@ RefPtr<Conditional> Parser::parse_conditional()
 
 RefPtr<Iteration> Parser::parse_for()
 {
-       expect("for");
-       RefPtr<Iteration> loop = new Iteration;
-       loop->source = source_index;
-       loop->line = current_line;
-       expect("(");
-       string token = peek_token();
+       tokenizer.expect("for");
+       RefPtr<Iteration> loop = create_node<Iteration>();
+       tokenizer.expect("(");
+       string token = tokenizer.peek_token();
        if(is_type(token))
                loop->init_statement = parse_statement();
        else
        {
                if(token!=";")
                {
-                       RefPtr<ExpressionStatement> expr = new ExpressionStatement;
+                       RefPtr<ExpressionStatement> expr = create_node<ExpressionStatement>();
                        expr->expression = parse_expression();
                        loop->init_statement = expr;
                }
-               expect(";");
+               tokenizer.expect(";");
        }
-       if(peek_token()!=";")
+       if(tokenizer.peek_token()!=";")
                loop->condition = parse_expression();
-       expect(";");
-       if(peek_token()!=")")
+       tokenizer.expect(";");
+       if(tokenizer.peek_token()!=")")
                loop->loop_expression = parse_expression();
-       expect(")");
+       tokenizer.expect(")");
 
-       parse_block(loop->body, false);
+       parse_block(loop->body, false, &Parser::parse_statement);
 
        return loop;
 }
 
 RefPtr<Iteration> Parser::parse_while()
 {
-       expect("while");
-       RefPtr<Iteration> loop = new Iteration;
-       loop->source = source_index;
-       loop->line = current_line;
-       expect("(");
+       tokenizer.expect("while");
+       RefPtr<Iteration> loop = create_node<Iteration>();
+       tokenizer.expect("(");
        loop->condition = parse_expression();
-       expect(")");
+       tokenizer.expect(")");
 
-       parse_block(loop->body, false);
+       parse_block(loop->body, false, &Parser::parse_statement);
 
        return loop;
 }
 
 RefPtr<Passthrough> Parser::parse_passthrough()
 {
-       expect("passthrough");
-       RefPtr<Passthrough> pass = new Passthrough;
-       pass->source = source_index;
-       pass->line = current_line;
-       if(cur_stage->type==GEOMETRY)
+       tokenizer.expect("passthrough");
+       RefPtr<Passthrough> pass = create_node<Passthrough>();
+       if(cur_stage->type==Stage::GEOMETRY)
        {
-               expect("[");
+               tokenizer.expect("[");
                pass->subscript = parse_expression();
-               expect("]");
+               tokenizer.expect("]");
        }
-       expect(";");
+       tokenizer.expect(";");
        return pass;
 }
 
 RefPtr<Return> Parser::parse_return()
 {
-       expect("return");
-       RefPtr<Return> ret = new Return;
-       ret->source = source_index;
-       ret->line = current_line;
-       if(peek_token()!=";")
+       tokenizer.expect("return");
+       RefPtr<Return> ret = create_node<Return>();
+       if(tokenizer.peek_token()!=";")
                ret->expression = parse_expression();
-       expect(";");
+       tokenizer.expect(";");
        return ret;
 }