Implement an actual expression parser

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

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index b08f1737e4d542610d1a9401f37ac3df90e580cd..1914831289a9dde32c77892cb3bfdc5411fd4900 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -59,14 +59,65 @@ ProgramCompiler::Formatter::Formatter():
        else_if(false)
 { }
 
-string ProgramCompiler::Formatter::format_expression(Expression &expr)
+void ProgramCompiler::Formatter::visit(Literal &literal)
 {
-       return join(expr.tokens.begin(), expr.tokens.end(), string());
+       formatted += literal.token;
+}
+
+void ProgramCompiler::Formatter::visit(ParenthesizedExpression &parexpr)
+{
+       formatted += '(';
+       parexpr.expression->visit(*this);
+       formatted += ')';
+}
+
+void ProgramCompiler::Formatter::visit(VariableReference &var)
+{
+       formatted += var.name;
+}
+
+void ProgramCompiler::Formatter::visit(MemberAccess &memacc)
+{
+       memacc.left->visit(*this);
+       formatted += format(".%s", memacc.member);
+}
+
+void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
+{
+       if(unary.prefix)
+               formatted += unary.oper;
+       unary.expression->visit(*this);
+       if(!unary.prefix)
+               formatted += unary.oper;
+}
+
+void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
+{
+       binary.left->visit(*this);
+       if(binary.assignment)
+               formatted += format(" %s ", binary.oper);
+       else
+               formatted += binary.oper;
+       binary.right->visit(*this);
+       formatted += binary.after;
+}
+
+void ProgramCompiler::Formatter::visit(FunctionCall &call)
+{
+       formatted += format("%s(", call.name);
+       for(vector<NodePtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+       {
+               if(i!=call.arguments.begin())
+                       formatted += ", ";
+               (*i)->visit(*this);
+       }
+       formatted += ')';
 }
 
 void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
 {
-       formatted += format("%s;", format_expression(expr.expression));
+       expr.expression->visit(*this);
+       formatted += ';';
 }
 
 void ProgramCompiler::Formatter::visit(Block &block)
@@ -84,7 +135,7 @@ void ProgramCompiler::Formatter::visit(Block &block)
        bool change_indent = (!formatted.empty() && !else_if);
        indent += change_indent;
        string spaces(indent*2, ' ');
-       for(vector<Node *>::const_iterator i=block.body.begin(); i!=block.body.end(); ++i)
+       for(vector<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
        {
                if(i!=block.body.begin())
                        formatted += '\n';
@@ -129,9 +180,17 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
                formatted += format("%s ", var.interface);
        formatted += format("%s %s", var.type, var.name);
        if(var.array)
-               formatted += format("[%s]", format_expression(var.array_size));
-       if(!var.init_expression.empty())
-               formatted += format(" = %s", format_expression(var.init_expression));
+       {
+               formatted += '[';
+               if(var.array_size)
+                       var.array_size->visit(*this);
+               formatted += ']';
+       }
+       if(var.init_expression)
+       {
+               formatted += " = ";
+               var.init_expression->visit(*this);
+       }
        if(!parameter_list)
                formatted += ';';
 }
@@ -147,7 +206,7 @@ void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 {
        formatted += format("%s %s(", func.return_type, func.name);
        parameter_list = true;
-       for(vector<VariableDeclaration *>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+       for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
        {
                if(i!=func.parameters.begin())
                        formatted += ", ";
@@ -171,7 +230,11 @@ void ProgramCompiler::Formatter::visit(Conditional &cond)
                formatted += ' ';
                else_if = false;
        }
-       formatted += format("if(%s)\n", format_expression(cond.condition));
+
+       formatted += "if(";
+       cond.condition->visit(*this);
+       formatted += ")\n";
+
        cond.body.visit(*this);
        if(!cond.else_body.body.empty())
        {
@@ -186,13 +249,19 @@ void ProgramCompiler::Formatter::visit(Iteration &iter)
 {
        formatted += "for(";
        iter.init_statement->visit(*this);
-       formatted += format(" %s; %s)\n", format_expression(iter.condition), format_expression(iter.loop_expression));
+       formatted += ' ';
+       iter.condition->visit(*this);
+       formatted += "; ";
+       iter.loop_expression->visit(*this);
+       formatted += ")\n";
        iter.body.visit(*this);
 }
 
 void ProgramCompiler::Formatter::visit(Return &ret)
 {
-       formatted += format("return %s;", format_expression(ret.expression));
+       formatted += "return ";
+       ret.expression->visit(*this);
+       formatted += ';';
 }
 
 } // namespace GL