Make the GLSL parser resilient against common errors

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

diff --git a/source/glsl/parser.h b/source/glsl/parser.h
index b6c8369debb91d379e66d8f1a2afda5f2e53bea9..acfb7d9eed9a8cc857becf5436e59a92bac522ba 100644 (file)
--- a/source/glsl/parser.h
+++ b/source/glsl/parser.h
@@ -16,7 +16,7 @@ class Parser
 {
 private:
        std::string source;
-       std::string source_name;
+       unsigned base_index;
        unsigned source_index;
        Tokenizer tokenizer;
        Preprocessor preprocessor;
@@ -24,6 +24,7 @@ private:
        Module *module;
        Stage *cur_stage;
        std::set<std::string> declared_types;
+       std::vector<std::string> errors;
 
 public:
        Parser();
@@ -33,12 +34,15 @@ public:
        Module &parse(IO::Base &, const std::string &, unsigned = 0);
 
 private:
-       void parse_source(const std::string &);
+       void parse_source(const std::string &, unsigned);
        void set_required_version(const Version &);
+       void source_reference(unsigned, const std::string &);
        void stage_change(Stage::Type);
+       void line_change(int, unsigned);
 
        std::string expect_type();
        std::string expect_identifier();
+       int expect_integer();
        bool check(const std::string &);
 
        static bool is_interface_qualifier(const std::string &);
@@ -57,16 +61,20 @@ private:
        void preprocess_stage();
 
        RefPtr<Statement> parse_global_declaration();
+       template<typename T>
+       RefPtr<T> parse_with_recovery(RefPtr<T> (Parser::*)());
        RefPtr<Statement> parse_statement();
        RefPtr<Import> parse_import();
        RefPtr<Precision> parse_precision();
        RefPtr<Layout> parse_layout();
-       void parse_block(Block &, bool);
+       template<typename T>
+       void parse_block(Block &, bool, RefPtr<T> (Parser::*)());
        RefPtr<Expression> parse_expression(unsigned = 0);
        RefPtr<BinaryExpression> parse_binary(const RefPtr<Expression> &, const Operator *);
        RefPtr<FunctionCall> parse_function_call(const VariableReference &);
        RefPtr<StructDeclaration> parse_struct_declaration();
        RefPtr<VariableDeclaration> parse_variable_declaration();
+       RefPtr<VariableDeclaration> parse_variable_declaration_with_layout();
        RefPtr<FunctionDeclaration> parse_function_declaration();
        RefPtr<InterfaceBlock> parse_interface_block();
        RefPtr<Conditional> parse_conditional();