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 d8b2608afe9b885a5e5b376761b80f1bed0d02c7..0bff354a50571128a0fa31bed3dbe8c935a0b1dc 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -29,12 +29,12 @@ private:
        struct BlockModifier: Visitor
        {
                bool remove_node;
-               std::vector<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 &);
@@ -152,7 +156,7 @@ 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 &);
@@ -216,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 &);
        };
 
@@ -225,12 +231,11 @@ private:
                typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
 
                const ValueMap *variable_values;
-               bool const_only;
                float result;
                bool result_valid;
 
                ExpressionEvaluator();
-               ExpressionEvaluator(const ValueMap *, bool);
+               ExpressionEvaluator(const ValueMap &);
 
                using ProgramSyntax::NodeVisitor::visit;
                virtual void visit(ProgramSyntax::Literal &);
@@ -243,13 +248,14 @@ private:
        struct ConstantConditionEliminator: BlockModifier
        {
                unsigned scope_level;
-               bool in_loop;
+               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 &);
@@ -277,6 +283,7 @@ private:
                std::vector<BlockVariableMap> variables;
                ProgramSyntax::Assignment *assignment;
                bool assignment_target;
+               bool assign_to_subscript;
                bool global_scope;
 
                UnusedVariableLocator();
@@ -323,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
@@ -356,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 &);
@@ -372,7 +381,7 @@ private:
 
        Resources *resources;
        ProgramSyntax::Module *module;
-       std::set<std::string> imported_names;
+       std::vector<std::string> imported_names;
 
 public:
        ProgramCompiler();