Implement an import system

[libs/gl.git] / source / programparser.h

diff --git a/source/programparser.h b/source/programparser.h
index 4bd6b70e99e1b9e2064eb9de9416a253ae5286bc..4e8e38f0fcd48fb0c5033ffae76bad2add532783 100644 (file)
--- a/source/programparser.h
+++ b/source/programparser.h
@@ -3,6 +3,7 @@
 
 #include <deque>
 #include <map>
+#include <set>
 #include <string>
 #include <msp/io/base.h>
 #include "programsyntax.h"
@@ -38,17 +39,21 @@ private:
        std::string source;
        std::string::const_iterator iter;
        std::deque<std::string> next_tokens;
-       ProgramSyntax::Module main_module;
-       ProgramSyntax::Module *cur_module;
+       ProgramSyntax::Module *module;
+       ProgramSyntax::Stage *cur_stage;
+       std::set<std::string> declared_types;
 
        static Operator operators[];
 
 public:
+       ProgramParser();
+       ~ProgramParser();
+
        ProgramSyntax::Module &parse(const std::string &);
        ProgramSyntax::Module &parse(IO::Base &);
 
 private:
-       void parse_source(ProgramSyntax::Module &);
+       void parse_source();
 
        const std::string &peek_token(unsigned = 0);
        std::string parse_token();
@@ -71,6 +76,7 @@ private:
 
        ProgramSyntax::Node *parse_global_declaration();
        ProgramSyntax::Node *parse_statement();
+       ProgramSyntax::Import *parse_import();
        ProgramSyntax::Layout *parse_layout();
        void parse_block(ProgramSyntax::Block &, bool);
        ProgramSyntax::Expression *parse_expression(unsigned = 0);
@@ -79,10 +85,10 @@ private:
        ProgramSyntax::StructDeclaration *parse_struct_declaration();
        ProgramSyntax::VariableDeclaration *parse_variable_declaration();
        ProgramSyntax::FunctionDeclaration *parse_function_declaration();
-       void parse_function_parameter_list(ProgramSyntax::FunctionDeclaration &);
        ProgramSyntax::InterfaceBlock *parse_interface_block();
        ProgramSyntax::Conditional *parse_conditional();
        ProgramSyntax::Iteration *parse_iteration();
+       ProgramSyntax::Passthrough *parse_passthrough();
        ProgramSyntax::Return *parse_return();
 };