Retain assignment location when moving out variables to global scope

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index fea7a73fb78c3e8a0b68d12c7a9aa25f73018840..0bff354a50571128a0fa31bed3dbe8c935a0b1dc 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -29,12 +29,12 @@ private:
        struct BlockModifier: Visitor
        {
                bool remove_node;
-               std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+               std::vector<RefPtr<ProgramSyntax::Statement> > insert_nodes;
 
                BlockModifier();
 
                void flatten_block(ProgramSyntax::Block &);
-               void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+               void apply_and_increment(ProgramSyntax::Block &, ProgramSyntax::NodeList<ProgramSyntax::Statement>::iterator &);
                using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
        };
@@ -44,9 +44,10 @@ private:
                typedef std::string ResultType;
 
                std::string formatted;
+               unsigned source_index;
+               unsigned source_line;
                unsigned indent;
                bool parameter_list;
-               unsigned else_if;
                std::string block_interface;
 
                Formatter();
@@ -54,6 +55,9 @@ private:
                virtual void apply(ProgramSyntax::Stage &);
                const std::string &get_result() const { return formatted; }
                using Visitor::visit;
+               void append(const std::string &);
+               void append(char);
+               void set_source(unsigned, unsigned);
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::Literal &);
                virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -81,9 +85,9 @@ private:
        template<typename T>
        struct NodeGatherer: Visitor
        {
-               typedef std::list<T *> ResultType;
+               typedef std::vector<T *> ResultType;
 
-               std::list<T *> nodes;
+               std::vector<T *> nodes;
 
                const ResultType &get_result() const { return nodes; }
                using Visitor::visit;
@@ -152,19 +156,12 @@ private:
                virtual void visit(ProgramSyntax::Block &);
                std::string change_prefix(const std::string &, const std::string &) const;
                bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
-               void insert_assignment(const std::string &, ProgramSyntax::Expression *);
+               ProgramSyntax::ExpressionStatement &insert_assignment(const std::string &, ProgramSyntax::Expression *);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::Passthrough &);
        };
 
-       struct VariableRenamer: Visitor
-       {
-               using Visitor::visit;
-               virtual void visit(ProgramSyntax::VariableReference &);
-               virtual void visit(ProgramSyntax::VariableDeclaration &);
-       };
-
        struct DeclarationReorderer: Visitor
        {
                enum DeclarationKind
@@ -176,17 +173,21 @@ private:
                        FUNCTION
                };
 
+               unsigned scope_level;
                DeclarationKind kind;
+               std::set<ProgramSyntax::Node *> ordered_funcs;
+               std::set<ProgramSyntax::Node *> needed_funcs;
 
                DeclarationReorderer();
 
                using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
+               virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
                virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
-               virtual void visit(ProgramSyntax::VariableDeclaration &) { kind = VARIABLE; }
+               virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &) { kind = VARIABLE; }
-               virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+               virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
 
        struct InlineableFunctionLocator: Visitor
@@ -219,7 +220,9 @@ private:
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::Return &);
        };
 
@@ -245,12 +248,14 @@ private:
        struct ConstantConditionEliminator: BlockModifier
        {
                unsigned scope_level;
+               bool record_only;
                ExpressionEvaluator::ValueMap variable_values;
 
                ConstantConditionEliminator();
 
                using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
+               virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::Assignment &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::Conditional &);
@@ -278,6 +283,7 @@ private:
                std::vector<BlockVariableMap> variables;
                ProgramSyntax::Assignment *assignment;
                bool assignment_target;
+               bool assign_to_subscript;
                bool global_scope;
 
                UnusedVariableLocator();
@@ -324,6 +330,7 @@ private:
                using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
+               virtual void visit(ProgramSyntax::Iteration &);
        };
 
        struct PrecisionRemover: BlockModifier
@@ -357,6 +364,7 @@ private:
                LegacyConverter(const Version &);
 
                bool check_version(const Version &) const;
+               bool check_extension(const Extension &) const;
                using Visitor::visit;
                bool supports_unified_interface_syntax() const;
                virtual void visit(ProgramSyntax::VariableReference &);
@@ -364,17 +372,20 @@ private:
                bool supports_unified_sampling_functions() const;
                virtual void visit(ProgramSyntax::FunctionCall &);
                bool supports_interface_layouts() const;
+               bool supports_centroid_sampling() const;
+               bool supports_sample_sampling() const;
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                bool supports_interface_blocks(const std::string &) const;
                virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
        Resources *resources;
-       ProgramParser parser;
        ProgramSyntax::Module *module;
+       std::vector<std::string> imported_names;
 
 public:
        ProgramCompiler();
+       ~ProgramCompiler();
 
        void compile(const std::string &, const std::string & = "<string>");
        void compile(IO::Base &, Resources * = 0, const std::string & = "<file>");
@@ -385,6 +396,8 @@ private:
        static ProgramSyntax::Module *create_builtins_module();
        static ProgramSyntax::Module &get_builtins_module();
        static ProgramSyntax::Stage *get_builtins(ProgramSyntax::StageType);
+       void append_module(ProgramSyntax::Module &);
+       void append_stage(ProgramSyntax::Stage &);
        void process();
        void import(const std::string &);
        void generate(ProgramSyntax::Stage &);