Process MemberAccess nodes in FunctionInliner

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

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 1c84a96dc925f18095368d63aa13aaaf19a7d88d..a1be91ca4f575228fe2f48ccb374fb0097c6dccb 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -557,8 +557,12 @@ void ProgramCompiler::Formatter::visit(Iteration &iter)
 
 void ProgramCompiler::Formatter::visit(Return &ret)
 {
-       formatted += "return ";
-       ret.expression->visit(*this);
+       formatted += "return";
+       if(ret.expression)
+       {
+               formatted += ' ';
+               ret.expression->visit(*this);
+       }
        formatted += ';';
 }
 
@@ -1171,6 +1175,12 @@ void ProgramCompiler::FunctionInliner::visit(BinaryExpression &binary)
        inline_result = 0;
 }
 
+void ProgramCompiler::FunctionInliner::visit(MemberAccess &memacc)
+{
+       visit_and_inline(memacc.left);
+       inline_result = 0;
+}
+
 void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
 {
        for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
@@ -1200,12 +1210,14 @@ void ProgramCompiler::FunctionInliner::visit(Return &ret)
 
 ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator():
        variable_values(0),
+       const_only(false),
        result(0.0f),
        result_valid(false)
 { }
 
-ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap &v):
-       variable_values(&v),
+ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap *v, bool c):
+       variable_values(v),
+       const_only(c),
        result(0.0f),
        result_valid(false)
 { }
@@ -1230,6 +1242,8 @@ void ProgramCompiler::ExpressionEvaluator::visit(VariableReference &var)
 {
        if(!var.declaration)
                return;
+       if(const_only && !var.declaration->constant)
+               return;
 
        if(variable_values)
        {
@@ -1289,7 +1303,8 @@ void ProgramCompiler::ExpressionEvaluator::visit(BinaryExpression &binary)
 
 
 ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
-       scope_level(0)
+       scope_level(0),
+       in_loop(false)
 { }
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
@@ -1314,7 +1329,7 @@ void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &va
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
 {
-       ExpressionEvaluator eval(variable_values);
+       ExpressionEvaluator eval(&variable_values, in_loop);
        cond.condition->visit(eval);
        if(eval.result_valid)
                flatten_block(eval.result ? cond.body : cond.else_body);
@@ -1324,9 +1339,10 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
 {
+       // XXX Should this not visit init_statement first?
        if(iter.condition)
        {
-               ExpressionEvaluator eval;
+               ExpressionEvaluator eval(0, in_loop);
                iter.condition->visit(eval);
                if(eval.result_valid && !eval.result)
                {
@@ -1335,6 +1351,7 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
                }
        }
 
+       SetFlag set_loop(in_loop);
        TraversingVisitor::visit(iter);
 }