Process MemberAccess nodes in FunctionInliner

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 56bf1d538fc1be3069f1ed816547fbbc20638585..2c8b33b6f905b726ed6eea6aa5a0230dee27f970 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -216,6 +216,7 @@ 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::Return &);
        };
@@ -225,11 +226,12 @@ 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 &);
+               ExpressionEvaluator(const ValueMap *, bool);
 
                using ProgramSyntax::NodeVisitor::visit;
                virtual void visit(ProgramSyntax::Literal &);
@@ -242,6 +244,7 @@ private:
        struct ConstantConditionEliminator: BlockModifier
        {
                unsigned scope_level;
+               bool in_loop;
                ExpressionEvaluator::ValueMap variable_values;
 
                ConstantConditionEliminator();