Remove the ParenthesizedExpression node type

[libs/gl.git] / source / glsl / evaluate.h

diff --git a/source/glsl/evaluate.h b/source/glsl/evaluate.h
index 6cbc6cb4a24c0aa8325e300a780e3bf34ee79393..4ad267797152050de9e44b34605119c58484b110 100644 (file)
--- a/source/glsl/evaluate.h
+++ b/source/glsl/evaluate.h
@@ -7,6 +7,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Evaluates an expression.  Only expressions consisting entirely of compile-
+time constants can be evaluated. */
 class ExpressionEvaluator: public NodeVisitor
 {
 public:
@@ -14,19 +16,18 @@ public:
 
 private:
        const ValueMap *variable_values;
-       float result;
-       bool result_valid;
+       float r_result;
+       bool r_result_valid;
 
 public:
        ExpressionEvaluator();
        ExpressionEvaluator(const ValueMap &);
 
-       float get_result() const { return result; }
-       bool is_result_valid() const { return result_valid; }
+       float get_result() const { return r_result; }
+       bool is_result_valid() const { return r_result_valid; }
 
        using NodeVisitor::visit;
        virtual void visit(Literal &);
-       virtual void visit(ParenthesizedExpression &);
        virtual void visit(VariableReference &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);