glsl: Fix handling of function calls inside nested loops.

[mesa.git] / src / glsl / s_expression.h

diff --git a/src/glsl/s_expression.h b/src/glsl/s_expression.h
index c444ba4338dc355b74a8baa78c2b8cf2b29f1b65..642af19b439261a35c51890fd4ee38d5c952d50e 100644 (file)
--- a/src/glsl/s_expression.h
+++ b/src/glsl/s_expression.h
@@ -57,7 +57,7 @@ public:
     * Read an S-Expression from the given string.
     * Advances the supplied pointer to just after the expression read.
     *
-    * Any allocation will be performed with 'ctx' as the talloc owner.
+    * Any allocation will be performed with 'ctx' as the ralloc owner.
     */
    static s_expression *read_expression(void *ctx, const char *&src);
 
@@ -129,7 +129,7 @@ public:
    void print();
 
 private:
-   char *str;
+   const char *str;
 };
 
 /* Lists of expressions: (expr1 ... exprN) */
@@ -139,7 +139,6 @@ public:
    s_list();
 
    virtual bool is_list() const { return true; }
-   unsigned length() const;
 
    void print();