mesalib pixman xkbcomp git update 13 jan 2011

9 files changed, 550 insertions, 590 deletions

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index f522aa577..22e01415f 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -174,7 +174,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

 

 builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o

-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TALLOC_LIBS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o builtin_compiler

+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o $(TALLOC_LIBS) -o $@

 

 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

 	@echo Regenerating builtin_function.cpp...

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 74a3d4775..ef209d078 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1623,6 +1623,7 @@ ast_expression::hir(exec_list *instructions,
       result = new(ctx) ir_dereference_variable(var);

 

       if (var != NULL) {

+	 var->used = true;

 	 type = result->type;

       } else {

 	 _mesa_glsl_error(& loc, state, "`%s' undeclared",

@@ -1797,8 +1798,16 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
 				 struct _mesa_glsl_parse_state *state,

 				 YYLTYPE *loc)

 {

-   if (qual->flags.q.invariant)

-      var->invariant = 1;

+   if (qual->flags.q.invariant) {

+      if (var->used) {

+	 _mesa_glsl_error(loc, state,

+			  "variable `%s' may not be redeclared "

+			  "`invariant' after being used",

+			  var->name);

+      } else {

+	 var->invariant = 1;

+      }

+   }

 

    /* FINISHME: Mark 'in' variables at global scope as read-only. */

    if (qual->flags.q.constant || qual->flags.q.attribute

@@ -2005,6 +2014,11 @@ ast_declarator_list::hir(exec_list *instructions,
 	    _mesa_glsl_error(& loc, state,

 			     "`%s' cannot be marked invariant, fragment shader "

 			     "inputs only\n", decl->identifier);

+	 } else if (earlier->used) {

+	    _mesa_glsl_error(& loc, state,

+			     "variable `%s' may not be redeclared "

+			     "`invariant' after being used",

+			     earlier->name);

 	 } else {

 	    earlier->invariant = true;

 	 }

diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index dfab1f1af..28fe3f4ac 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1325,6 +1325,7 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name,
    this->constant_value = NULL;

    this->origin_upper_left = false;

    this->pixel_center_integer = false;

+   this->used = false;

 

    if (type && type->base_type == GLSL_TYPE_SAMPLER)

       this->read_only = true;

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index d11047f1d..f3a565f2e 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -295,6 +295,15 @@ public:
    unsigned invariant:1;

 

    /**

+    * Has this variable been used for reading or writing?

+    *

+    * Several GLSL semantic checks require knowledge of whether or not a

+    * variable has been used.  For example, it is an error to redeclare a

+    * variable as invariant after it has been used.

+    */

+   unsigned used:1;

+

+   /**

     * Storage class of the variable.

     *

     * \sa ir_variable_mode

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index bed838fe8..3609c0e12 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -281,9 +281,6 @@ void ir_print_visitor::visit(ir_assignment *ir)
 

    if (ir->condition)

       ir->condition->accept(this);

-   else

-      printf("(constant bool (1))");

-

 

    char mask[5];

    unsigned j = 0;

diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp
index b15df6ddf..67e3847e4 100644
--- a/mesalib/src/glsl/ir_reader.cpp
+++ b/mesalib/src/glsl/ir_reader.cpp
@@ -21,8 +21,6 @@
  * DEALINGS IN THE SOFTWARE.

  */

 

-#include <cstdarg>

-

 extern "C" {

 #include <talloc.h>

 }

@@ -34,69 +32,78 @@ extern "C" {
 

 const static bool debug = false;

 

-static void ir_read_error(_mesa_glsl_parse_state *, s_expression *,

-			  const char *fmt, ...);

-static const glsl_type *read_type(_mesa_glsl_parse_state *, s_expression *);

-

-static void scan_for_prototypes(_mesa_glsl_parse_state *, exec_list *,

-			        s_expression *);

-static ir_function *read_function(_mesa_glsl_parse_state *, s_list *,

-				  bool skip_body);

-static void read_function_sig(_mesa_glsl_parse_state *, ir_function *,

-			      s_list *, bool skip_body);

-

-static void read_instructions(_mesa_glsl_parse_state *, exec_list *,

-			      s_expression *, ir_loop *);

-static ir_instruction *read_instruction(_mesa_glsl_parse_state *,

-				        s_expression *, ir_loop *);

-static ir_variable *read_declaration(_mesa_glsl_parse_state *, s_list *);

-static ir_if *read_if(_mesa_glsl_parse_state *, s_list *, ir_loop *);

-static ir_loop *read_loop(_mesa_glsl_parse_state *st, s_list *list);

-static ir_return *read_return(_mesa_glsl_parse_state *, s_list *);

-

-static ir_rvalue *read_rvalue(_mesa_glsl_parse_state *, s_expression *);

-static ir_assignment *read_assignment(_mesa_glsl_parse_state *, s_list *);

-static ir_expression *read_expression(_mesa_glsl_parse_state *, s_list *);

-static ir_call *read_call(_mesa_glsl_parse_state *, s_list *);

-static ir_swizzle *read_swizzle(_mesa_glsl_parse_state *, s_list *);

-static ir_constant *read_constant(_mesa_glsl_parse_state *, s_list *);

-static ir_texture *read_texture(_mesa_glsl_parse_state *, s_list *);

-

-static ir_dereference *read_dereference(_mesa_glsl_parse_state *,

-				        s_expression *);

-static ir_dereference_variable *

-read_var_ref(_mesa_glsl_parse_state *, s_list *);

-static ir_dereference_array *

-read_array_ref(_mesa_glsl_parse_state *, s_list *);

-static ir_dereference_record *

-read_record_ref(_mesa_glsl_parse_state *, s_list *);

+class ir_reader {

+public:

+   ir_reader(_mesa_glsl_parse_state *);

+

+   void read(exec_list *instructions, const char *src, bool scan_for_protos);

+

+private:

+   void *mem_ctx;

+   _mesa_glsl_parse_state *state;

+

+   void ir_read_error(s_expression *, const char *fmt, ...);

+

+   const glsl_type *read_type(s_expression *);

+

+   void scan_for_prototypes(exec_list *, s_expression *);

+   ir_function *read_function(s_expression *, bool skip_body);

+   void read_function_sig(ir_function *, s_expression *, bool skip_body);

+

+   void read_instructions(exec_list *, s_expression *, ir_loop *);

+   ir_instruction *read_instruction(s_expression *, ir_loop *);

+   ir_variable *read_declaration(s_expression *);

+   ir_if *read_if(s_expression *, ir_loop *);

+   ir_loop *read_loop(s_expression *);

+   ir_return *read_return(s_expression *);

+   ir_rvalue *read_rvalue(s_expression *);

+   ir_assignment *read_assignment(s_expression *);

+   ir_expression *read_expression(s_expression *);

+   ir_call *read_call(s_expression *);

+   ir_swizzle *read_swizzle(s_expression *);

+   ir_constant *read_constant(s_expression *);

+   ir_texture *read_texture(s_expression *);

+

+   ir_dereference *read_dereference(s_expression *);

+};

+

+ir_reader::ir_reader(_mesa_glsl_parse_state *state) : state(state)

+{

+   this->mem_ctx = state;

+}

 

 void

 _mesa_glsl_read_ir(_mesa_glsl_parse_state *state, exec_list *instructions,

 		   const char *src, bool scan_for_protos)

 {

-   s_expression *expr = s_expression::read_expression(state, src);

+   ir_reader r(state);

+   r.read(instructions, src, scan_for_protos);

+}

+

+void

+ir_reader::read(exec_list *instructions, const char *src, bool scan_for_protos)

+{

+   s_expression *expr = s_expression::read_expression(mem_ctx, src);

    if (expr == NULL) {

-      ir_read_error(state, NULL, "couldn't parse S-Expression.");

+      ir_read_error(NULL, "couldn't parse S-Expression.");

       return;

    }

    

    if (scan_for_protos) {

-      scan_for_prototypes(state, instructions, expr);

+      scan_for_prototypes(instructions, expr);

       if (state->error)

 	 return;

    }

 

-   read_instructions(state, instructions, expr, NULL);

+   read_instructions(instructions, expr, NULL);

    talloc_free(expr);

 

    if (debug)

       validate_ir_tree(instructions);

 }

 

-static void

-ir_read_error(_mesa_glsl_parse_state *state, s_expression *expr,

-	      const char *fmt, ...)

+void

+ir_reader::ir_read_error(s_expression *expr, const char *fmt, ...)

 {

    va_list ap;

 

@@ -121,68 +128,43 @@ ir_read_error(_mesa_glsl_parse_state *state, s_expression *expr,
    }

 }

 

-static const glsl_type *

-read_type(_mesa_glsl_parse_state *st, s_expression *expr)

+const glsl_type *

+ir_reader::read_type(s_expression *expr)

 {

-   s_list *list = SX_AS_LIST(expr);

-   if (list != NULL) {

-      s_symbol *type_sym = SX_AS_SYMBOL(list->subexpressions.get_head());

-      if (type_sym == NULL) {

-	 ir_read_error(st, expr, "expected type (array ...) or (struct ...)");

+   s_expression *s_base_type;

+   s_int *s_size;

+

+   s_pattern pat[] = { "array", s_base_type, s_size };

+   if (MATCH(expr, pat)) {

+      const glsl_type *base_type = read_type(s_base_type);

+      if (base_type == NULL) {

+	 ir_read_error(NULL, "when reading base type of array type");

 	 return NULL;

       }

-      if (strcmp(type_sym->value(), "array") == 0) {

-	 if (list->length() != 3) {

-	    ir_read_error(st, expr, "expected type (array <type> <int>)");

-	    return NULL;

-	 }

 

-	 // Read base type

-	 s_expression *base_expr = (s_expression*) type_sym->next;

-	 const glsl_type *base_type = read_type(st, base_expr);

-	 if (base_type == NULL) {

-	    ir_read_error(st, NULL, "when reading base type of array");

-	    return NULL;

-	 }

-

-	 // Read array size

-	 s_int *size = SX_AS_INT(base_expr->next);

-	 if (size == NULL) {

-	    ir_read_error(st, expr, "found non-integer array size");

-	    return NULL;

-	 }

-

-	 return glsl_type::get_array_instance(base_type, size->value());

-      } else if (strcmp(type_sym->value(), "struct") == 0) {

-	 assert(false); // FINISHME

-      } else {

-	 ir_read_error(st, expr, "expected (array ...) or (struct ...); "

-				 "found (%s ...)", type_sym->value());

-	 return NULL;

-      }

+      return glsl_type::get_array_instance(base_type, s_size->value());

    }

    

    s_symbol *type_sym = SX_AS_SYMBOL(expr);

    if (type_sym == NULL) {

-      ir_read_error(st, expr, "expected <type> (symbol or list)");

+      ir_read_error(expr, "expected <type>");

       return NULL;

    }

 

-   const glsl_type *type = st->symbols->get_type(type_sym->value());

+   const glsl_type *type = state->symbols->get_type(type_sym->value());

    if (type == NULL)

-      ir_read_error(st, expr, "invalid type: %s", type_sym->value());

+      ir_read_error(expr, "invalid type: %s", type_sym->value());

 

    return type;

 }

 

 

-static void

-scan_for_prototypes(_mesa_glsl_parse_state *st, exec_list *instructions,

-		    s_expression *expr)

+void

+ir_reader::scan_for_prototypes(exec_list *instructions, s_expression *expr)

 {

    s_list *list = SX_AS_LIST(expr);

    if (list == NULL) {

-      ir_read_error(st, expr, "Expected (<instruction> ...); found an atom.");

+      ir_read_error(expr, "Expected (<instruction> ...); found an atom.");

       return;

    }

 

@@ -195,94 +177,73 @@ scan_for_prototypes(_mesa_glsl_parse_state *st, exec_list *instructions,
       if (tag == NULL || strcmp(tag->value(), "function") != 0)

 	 continue; // not a (function ...); ignore it.

 

-      ir_function *f = read_function(st, sub, true);

+      ir_function *f = read_function(sub, true);

       if (f == NULL)

 	 return;

       instructions->push_tail(f);

    }

 }

 

-static ir_function *

-read_function(_mesa_glsl_parse_state *st, s_list *list, bool skip_body)

+ir_function *

+ir_reader::read_function(s_expression *expr, bool skip_body)

 {

-   void *ctx = st;

    bool added = false;

-   if (list->length() < 3) {

-      ir_read_error(st, list, "Expected (function <name> (signature ...) ...)");

-      return NULL;

-   }

+   s_symbol *name;

 

-   s_symbol *name = SX_AS_SYMBOL(list->subexpressions.head->next);

-   if (name == NULL) {

-      ir_read_error(st, list, "Expected (function <name> ...)");

+   s_pattern pat[] = { "function", name };

+   if (!PARTIAL_MATCH(expr, pat)) {

+      ir_read_error(expr, "Expected (function <name> (signature ...) ...)");

       return NULL;

    }

 

-   ir_function *f = st->symbols->get_function(name->value());

+   ir_function *f = state->symbols->get_function(name->value());

    if (f == NULL) {

-      f = new(ctx) ir_function(name->value());

-      added = st->symbols->add_function(f);

+      f = new(mem_ctx) ir_function(name->value());

+      added = state->symbols->add_function(f);

       assert(added);

    }

 

-   exec_list_iterator it = list->subexpressions.iterator();

+   exec_list_iterator it = ((s_list *) expr)->subexpressions.iterator();

    it.next(); // skip "function" tag

    it.next(); // skip function name

    for (/* nothing */; it.has_next(); it.next()) {

-      s_list *siglist = SX_AS_LIST(it.get());

-      if (siglist == NULL) {

-	 ir_read_error(st, list, "Expected (function (signature ...) ...)");

-	 return NULL;

-      }

-

-      s_symbol *tag = SX_AS_SYMBOL(siglist->subexpressions.get_head());

-      if (tag == NULL || strcmp(tag->value(), "signature") != 0) {

-	 ir_read_error(st, siglist, "Expected (signature ...)");

-	 return NULL;

-      }

-

-      read_function_sig(st, f, siglist, skip_body);

+      s_expression *s_sig = (s_expression *) it.get();

+      read_function_sig(f, s_sig, skip_body);

    }

    return added ? f : NULL;

 }

 

-static void

-read_function_sig(_mesa_glsl_parse_state *st, ir_function *f, s_list *list,

-		  bool skip_body)

+void

+ir_reader::read_function_sig(ir_function *f, s_expression *expr, bool skip_body)

 {

-   void *ctx = st;

-   if (list->length() != 4) {

-      ir_read_error(st, list, "Expected (signature <type> (parameters ...) "

-			      "(<instruction> ...))");

+   s_expression *type_expr;

+   s_list *paramlist;

+   s_list *body_list;

+

+   s_pattern pat[] = { "signature", type_expr, paramlist, body_list };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "Expected (signature <type> (parameters ...) "

+			  "(<instruction> ...))");

       return;

    }

 

-   s_expression *type_expr = (s_expression*) list->subexpressions.head->next;

-   const glsl_type *return_type = read_type(st, type_expr);

+   const glsl_type *return_type = read_type(type_expr);

    if (return_type == NULL)

       return;

 

-   s_list *paramlist = SX_AS_LIST(type_expr->next);

-   s_list *body_list = SX_AS_LIST(type_expr->next->next);

-   if (paramlist == NULL || body_list == NULL) {

-      ir_read_error(st, list, "Expected (signature <type> (parameters ...) "

-			      "(<instruction> ...))");

-      return;

-   }

    s_symbol *paramtag = SX_AS_SYMBOL(paramlist->subexpressions.get_head());

    if (paramtag == NULL || strcmp(paramtag->value(), "parameters") != 0) {

-      ir_read_error(st, paramlist, "Expected (parameters ...)");

+      ir_read_error(paramlist, "Expected (parameters ...)");

       return;

    }

 

    // Read the parameters list into a temporary place.

    exec_list hir_parameters;

-   st->symbols->push_scope();

+   state->symbols->push_scope();

 

    exec_list_iterator it = paramlist->subexpressions.iterator();

    for (it.next() /* skip "parameters" */; it.has_next(); it.next()) {

-      s_list *decl = SX_AS_LIST(it.get());

-      ir_variable *var = read_declaration(st, decl);

+      ir_variable *var = read_declaration((s_expression *) it.get());

       if (var == NULL)

 	 return;

 

@@ -292,25 +253,25 @@ read_function_sig(_mesa_glsl_parse_state *st, ir_function *f, s_list *list,
    ir_function_signature *sig = f->exact_matching_signature(&hir_parameters);

    if (sig == NULL && skip_body) {

       /* If scanning for prototypes, generate a new signature. */

-      sig = new(ctx) ir_function_signature(return_type);

+      sig = new(mem_ctx) ir_function_signature(return_type);

       sig->is_builtin = true;

       f->add_signature(sig);

    } else if (sig != NULL) {

       const char *badvar = sig->qualifiers_match(&hir_parameters);

       if (badvar != NULL) {

-	 ir_read_error(st, list, "function `%s' parameter `%s' qualifiers "

+	 ir_read_error(expr, "function `%s' parameter `%s' qualifiers "

 		       "don't match prototype", f->name, badvar);

 	 return;

       }

 

       if (sig->return_type != return_type) {

-	 ir_read_error(st, list, "function `%s' return type doesn't "

+	 ir_read_error(expr, "function `%s' return type doesn't "

 		       "match prototype", f->name);

 	 return;

       }

    } else {

       /* No prototype for this body exists - skip it. */

-      st->symbols->pop_scope();

+      state->symbols->pop_scope();

       return;

    }

    assert(sig != NULL);

@@ -319,39 +280,39 @@ read_function_sig(_mesa_glsl_parse_state *st, ir_function *f, s_list *list,
 

    if (!skip_body && !body_list->subexpressions.is_empty()) {

       if (sig->is_defined) {

-	 ir_read_error(st, list, "function %s redefined", f->name);

+	 ir_read_error(expr, "function %s redefined", f->name);

 	 return;

       }

-      st->current_function = sig;

-      read_instructions(st, &sig->body, body_list, NULL);

-      st->current_function = NULL;

+      state->current_function = sig;

+      read_instructions(&sig->body, body_list, NULL);

+      state->current_function = NULL;

       sig->is_defined = true;

    }

 

-   st->symbols->pop_scope();

+   state->symbols->pop_scope();

 }

 

-static void

-read_instructions(_mesa_glsl_parse_state *st, exec_list *instructions,

-		  s_expression *expr, ir_loop *loop_ctx)

+void

+ir_reader::read_instructions(exec_list *instructions, s_expression *expr,

+			     ir_loop *loop_ctx)

 {

    // Read in a list of instructions

    s_list *list = SX_AS_LIST(expr);

    if (list == NULL) {

-      ir_read_error(st, expr, "Expected (<instruction> ...); found an atom.");

+      ir_read_error(expr, "Expected (<instruction> ...); found an atom.");

       return;

    }

 

    foreach_iter(exec_list_iterator, it, list->subexpressions) {

       s_expression *sub = (s_expression*) it.get();

-      ir_instruction *ir = read_instruction(st, sub, loop_ctx);

+      ir_instruction *ir = read_instruction(sub, loop_ctx);

       if (ir != NULL) {

 	 /* Global variable declarations should be moved to the top, before

 	  * any functions that might use them.  Functions are added to the

 	  * instruction stream when scanning for prototypes, so without this

 	  * hack, they always appear before variable declarations.

 	  */

-	 if (st->current_function == NULL && ir->as_variable() != NULL)

+	 if (state->current_function == NULL && ir->as_variable() != NULL)

 	    instructions->push_head(ir);

 	 else

 	    instructions->push_tail(ir);

@@ -360,88 +321,74 @@ read_instructions(_mesa_glsl_parse_state *st, exec_list *instructions,
 }

 

 

-static ir_instruction *

-read_instruction(_mesa_glsl_parse_state *st, s_expression *expr,

-	         ir_loop *loop_ctx)

+ir_instruction *

+ir_reader::read_instruction(s_expression *expr, ir_loop *loop_ctx)

 {

-   void *ctx = st;

    s_symbol *symbol = SX_AS_SYMBOL(expr);

    if (symbol != NULL) {

       if (strcmp(symbol->value(), "break") == 0 && loop_ctx != NULL)

-	 return new(ctx) ir_loop_jump(ir_loop_jump::jump_break);

+	 return new(mem_ctx) ir_loop_jump(ir_loop_jump::jump_break);

       if (strcmp(symbol->value(), "continue") == 0 && loop_ctx != NULL)

-	 return new(ctx) ir_loop_jump(ir_loop_jump::jump_continue);

+	 return new(mem_ctx) ir_loop_jump(ir_loop_jump::jump_continue);

    }

 

    s_list *list = SX_AS_LIST(expr);

    if (list == NULL || list->subexpressions.is_empty()) {

-      ir_read_error(st, expr, "Invalid instruction.\n");

+      ir_read_error(expr, "Invalid instruction.\n");

       return NULL;

    }

 

    s_symbol *tag = SX_AS_SYMBOL(list->subexpressions.get_head());

    if (tag == NULL) {

-      ir_read_error(st, expr, "expected instruction tag");

+      ir_read_error(expr, "expected instruction tag");

       return NULL;

    }

 

    ir_instruction *inst = NULL;

    if (strcmp(tag->value(), "declare") == 0) {

-      inst = read_declaration(st, list);

+      inst = read_declaration(list);

    } else if (strcmp(tag->value(), "assign") == 0) {

-      inst = read_assignment(st, list);

+      inst = read_assignment(list);

    } else if (strcmp(tag->value(), "if") == 0) {

-      inst = read_if(st, list, loop_ctx);

+      inst = read_if(list, loop_ctx);

    } else if (strcmp(tag->value(), "loop") == 0) {

-      inst = read_loop(st, list);

+      inst = read_loop(list);

    } else if (strcmp(tag->value(), "return") == 0) {

-      inst = read_return(st, list);

+      inst = read_return(list);

    } else if (strcmp(tag->value(), "function") == 0) {

-      inst = read_function(st, list, false);

+      inst = read_function(list, false);

    } else {

-      inst = read_rvalue(st, list);

+      inst = read_rvalue(list);

       if (inst == NULL)

-	 ir_read_error(st, NULL, "when reading instruction");

+	 ir_read_error(NULL, "when reading instruction");

    }

    return inst;

 }

 

-

-static ir_variable *

-read_declaration(_mesa_glsl_parse_state *st, s_list *list)

+ir_variable *

+ir_reader::read_declaration(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 4) {

-      ir_read_error(st, list, "expected (declare (<qualifiers>) <type> "

-			      "<name>)");

-      return NULL;

-   }

+   s_list *s_quals;

+   s_expression *s_type;

+   s_symbol *s_name;

 

-   s_list *quals = SX_AS_LIST(list->subexpressions.head->next);

-   if (quals == NULL) {

-      ir_read_error(st, list, "expected a list of variable qualifiers");

+   s_pattern pat[] = { "declare", s_quals, s_type, s_name };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (declare (<qualifiers>) <type> <name>)");

       return NULL;

    }

 

-   s_expression *type_expr = (s_expression*) quals->next;

-   const glsl_type *type = read_type(st, type_expr);

+   const glsl_type *type = read_type(s_type);

    if (type == NULL)

       return NULL;

 

-   s_symbol *var_name = SX_AS_SYMBOL(type_expr->next);

-   if (var_name == NULL) {

-      ir_read_error(st, list, "expected variable name, found non-symbol");

-      return NULL;

-   }

-

-   ir_variable *var = new(ctx) ir_variable(type, var_name->value(),

-					   ir_var_auto);

+   ir_variable *var = new(mem_ctx) ir_variable(type, s_name->value(),

+					       ir_var_auto);

 

-   foreach_iter(exec_list_iterator, it, quals->subexpressions) {

+   foreach_iter(exec_list_iterator, it, s_quals->subexpressions) {

       s_symbol *qualifier = SX_AS_SYMBOL(it.get());

       if (qualifier == NULL) {

-	 ir_read_error(st, list, "qualifier list must contain only symbols");

-	 delete var;

+	 ir_read_error(expr, "qualifier list must contain only symbols");

 	 return NULL;

       }

 

@@ -467,44 +414,42 @@ read_declaration(_mesa_glsl_parse_state *st, s_list *list)
       } else if (strcmp(qualifier->value(), "noperspective") == 0) {

 	 var->interpolation = ir_var_noperspective;

       } else {

-	 ir_read_error(st, list, "unknown qualifier: %s", qualifier->value());

-	 delete var;

+	 ir_read_error(expr, "unknown qualifier: %s", qualifier->value());

 	 return NULL;

       }

    }

 

    // Add the variable to the symbol table

-   st->symbols->add_variable(var);

+   state->symbols->add_variable(var);

 

    return var;

 }

 

 

-static ir_if *

-read_if(_mesa_glsl_parse_state *st, s_list *list, ir_loop *loop_ctx)

+ir_if *

+ir_reader::read_if(s_expression *expr, ir_loop *loop_ctx)

 {

-   void *ctx = st;

-   if (list->length() != 4) {

-      ir_read_error(st, list, "expected (if <condition> (<then> ...) "

-                          "(<else> ...))");

+   s_expression *s_cond;

+   s_expression *s_then;

+   s_expression *s_else;

+

+   s_pattern pat[] = { "if", s_cond, s_then, s_else };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (if <condition> (<then>...) (<else>...))");

       return NULL;

    }

 

-   s_expression *cond_expr = (s_expression*) list->subexpressions.head->next;

-   ir_rvalue *condition = read_rvalue(st, cond_expr);

+   ir_rvalue *condition = read_rvalue(s_cond);

    if (condition == NULL) {

-      ir_read_error(st, NULL, "when reading condition of (if ...)");

+      ir_read_error(NULL, "when reading condition of (if ...)");

       return NULL;

    }

 

-   s_expression *then_expr = (s_expression*) cond_expr->next;

-   s_expression *else_expr = (s_expression*) then_expr->next;

+   ir_if *iff = new(mem_ctx) ir_if(condition);

 

-   ir_if *iff = new(ctx) ir_if(condition);

-

-   read_instructions(st, &iff->then_instructions, then_expr, loop_ctx);

-   read_instructions(st, &iff->else_instructions, else_expr, loop_ctx);

-   if (st->error) {

+   read_instructions(&iff->then_instructions, s_then, loop_ctx);

+   read_instructions(&iff->else_instructions, s_else, loop_ctx);

+   if (state->error) {

       delete iff;

       iff = NULL;

    }

@@ -512,27 +457,23 @@ read_if(_mesa_glsl_parse_state *st, s_list *list, ir_loop *loop_ctx)
 }

 

 

-static ir_loop *

-read_loop(_mesa_glsl_parse_state *st, s_list *list)

+ir_loop *

+ir_reader::read_loop(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 6) {

-      ir_read_error(st, list, "expected (loop <counter> <from> <to> "

-			      "<increment> <body>)");

+   s_expression *s_counter, *s_from, *s_to, *s_inc, *s_body;

+

+   s_pattern pat[] = { "loop", s_counter, s_from, s_to, s_inc, s_body };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (loop <counter> <from> <to> "

+			  "<increment> <body>)");

       return NULL;

    }

 

-   s_expression *count_expr = (s_expression*) list->subexpressions.head->next;

-   s_expression *from_expr  = (s_expression*) count_expr->next;

-   s_expression *to_expr    = (s_expression*) from_expr->next;

-   s_expression *inc_expr   = (s_expression*) to_expr->next;

-   s_expression *body_expr  = (s_expression*) inc_expr->next;

-

    // FINISHME: actually read the count/from/to fields.

 

-   ir_loop *loop = new(ctx) ir_loop;

-   read_instructions(st, &loop->body_instructions, body_expr, loop);

-   if (st->error) {

+   ir_loop *loop = new(mem_ctx) ir_loop;

+   read_instructions(&loop->body_instructions, s_body, loop);

+   if (state->error) {

       delete loop;

       loop = NULL;

    }

@@ -540,29 +481,29 @@ read_loop(_mesa_glsl_parse_state *st, s_list *list)
 }

 

 

-static ir_return *

-read_return(_mesa_glsl_parse_state *st, s_list *list)

+ir_return *

+ir_reader::read_return(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 2) {

-      ir_read_error(st, list, "expected (return <rvalue>)");

+   s_expression *s_retval;

+

+   s_pattern pat[] = { "return", s_retval};

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (return <rvalue>)");

       return NULL;

    }

 

-   s_expression *expr = (s_expression*) list->subexpressions.head->next;

-

-   ir_rvalue *retval = read_rvalue(st, expr);

+   ir_rvalue *retval = read_rvalue(s_retval);

    if (retval == NULL) {

-      ir_read_error(st, NULL, "when reading return value");

+      ir_read_error(NULL, "when reading return value");

       return NULL;

    }

 

-   return new(ctx) ir_return(retval);

+   return new(mem_ctx) ir_return(retval);

 }

 

 

-static ir_rvalue *

-read_rvalue(_mesa_glsl_parse_state *st, s_expression *expr)

+ir_rvalue *

+ir_reader::read_rvalue(s_expression *expr)

 {

    s_list *list = SX_AS_LIST(expr);

    if (list == NULL || list->subexpressions.is_empty())

@@ -570,68 +511,63 @@ read_rvalue(_mesa_glsl_parse_state *st, s_expression *expr)
 

    s_symbol *tag = SX_AS_SYMBOL(list->subexpressions.get_head());

    if (tag == NULL) {

-      ir_read_error(st, expr, "expected rvalue tag");

+      ir_read_error(expr, "expected rvalue tag");

       return NULL;

    }

 

-   ir_rvalue *rvalue = read_dereference(st, list);

-   if (rvalue != NULL || st->error)

+   ir_rvalue *rvalue = read_dereference(list);

+   if (rvalue != NULL || state->error)

       return rvalue;

    else if (strcmp(tag->value(), "swiz") == 0) {

-      rvalue = read_swizzle(st, list);

+      rvalue = read_swizzle(list);

    } else if (strcmp(tag->value(), "expression") == 0) {

-      rvalue = read_expression(st, list);

+      rvalue = read_expression(list);

    } else if (strcmp(tag->value(), "call") == 0) {

-      rvalue = read_call(st, list);

+      rvalue = read_call(list);

    } else if (strcmp(tag->value(), "constant") == 0) {

-      rvalue = read_constant(st, list);

+      rvalue = read_constant(list);

    } else {

-      rvalue = read_texture(st, list);

-      if (rvalue == NULL && !st->error)

-	 ir_read_error(st, expr, "unrecognized rvalue tag: %s", tag->value());

+      rvalue = read_texture(list);

+      if (rvalue == NULL && !state->error)

+	 ir_read_error(expr, "unrecognized rvalue tag: %s", tag->value());

    }

 

    return rvalue;

 }

 

-static ir_assignment *

-read_assignment(_mesa_glsl_parse_state *st, s_list *list)

+ir_assignment *

+ir_reader::read_assignment(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 5) {

-      ir_read_error(st, list, "expected (assign <condition> (<write mask>) "

-			      "<lhs> <rhs>)");

-      return NULL;

-   }

-

-   s_expression *cond_expr = (s_expression*) list->subexpressions.head->next;

-   s_list       *mask_list = SX_AS_LIST(cond_expr->next);

-   s_expression *lhs_expr  = (s_expression*) cond_expr->next->next;

-   s_expression *rhs_expr  = (s_expression*) lhs_expr->next;

+   s_expression *cond_expr = NULL;

+   s_expression *lhs_expr, *rhs_expr;

+   s_list       *mask_list;

 

-   ir_rvalue *condition = read_rvalue(st, cond_expr);

-   if (condition == NULL) {

-      ir_read_error(st, NULL, "when reading condition of assignment");

+   s_pattern pat4[] = { "assign",            mask_list, lhs_expr, rhs_expr };

+   s_pattern pat5[] = { "assign", cond_expr, mask_list, lhs_expr, rhs_expr };

+   if (!MATCH(expr, pat4) && !MATCH(expr, pat5)) {

+      ir_read_error(expr, "expected (assign [<condition>] (<write mask>) "

+			  "<lhs> <rhs>)");

       return NULL;

    }

 

-   if (mask_list == NULL || mask_list->length() > 1) {

-      ir_read_error(st, mask_list, "expected () or (<write mask>)");

-      return NULL;

+   ir_rvalue *condition = NULL;

+   if (cond_expr != NULL) {

+      condition = read_rvalue(cond_expr);

+      if (condition == NULL) {

+	 ir_read_error(NULL, "when reading condition of assignment");

+	 return NULL;

+      }

    }

 

    unsigned mask = 0;

-   if (mask_list->length() == 1) {

-      s_symbol *mask_symbol = SX_AS_SYMBOL(mask_list->subexpressions.head);

-      if (mask_symbol == NULL) {

-	 ir_read_error(st, list, "expected a write mask; found non-symbol");

-	 return NULL;

-      }

 

+   s_symbol *mask_symbol;

+   s_pattern mask_pat[] = { mask_symbol };

+   if (MATCH(mask_list, mask_pat)) {

       const char *mask_str = mask_symbol->value();

       unsigned mask_length = strlen(mask_str);

       if (mask_length > 4) {

-	 ir_read_error(st, list, "invalid write mask: %s", mask_str);

+	 ir_read_error(expr, "invalid write mask: %s", mask_str);

 	 return NULL;

       }

 

@@ -639,47 +575,46 @@ read_assignment(_mesa_glsl_parse_state *st, s_list *list)
 

       for (unsigned i = 0; i < mask_length; i++) {

 	 if (mask_str[i] < 'w' || mask_str[i] > 'z') {

-	    ir_read_error(st, list, "write mask contains invalid character: %c",

+	    ir_read_error(expr, "write mask contains invalid character: %c",

 			  mask_str[i]);

 	    return NULL;

 	 }

 	 mask |= 1 << idx_map[mask_str[i] - 'w'];

       }

+   } else if (!mask_list->subexpressions.is_empty()) {

+      ir_read_error(mask_list, "expected () or (<write mask>)");

+      return NULL;

    }

 

-   ir_dereference *lhs = read_dereference(st, lhs_expr);

+   ir_dereference *lhs = read_dereference(lhs_expr);

    if (lhs == NULL) {

-      ir_read_error(st, NULL, "when reading left-hand side of assignment");

+      ir_read_error(NULL, "when reading left-hand side of assignment");

       return NULL;

    }

 

-   ir_rvalue *rhs = read_rvalue(st, rhs_expr);

+   ir_rvalue *rhs = read_rvalue(rhs_expr);

    if (rhs == NULL) {

-      ir_read_error(st, NULL, "when reading right-hand side of assignment");

+      ir_read_error(NULL, "when reading right-hand side of assignment");

       return NULL;

    }

 

    if (mask == 0 && (lhs->type->is_vector() || lhs->type->is_scalar())) {

-      ir_read_error(st, list, "non-zero write mask required.");

+      ir_read_error(expr, "non-zero write mask required.");

       return NULL;

    }

 

-   return new(ctx) ir_assignment(lhs, rhs, condition, mask);

+   return new(mem_ctx) ir_assignment(lhs, rhs, condition, mask);

 }

 

-static ir_call *

-read_call(_mesa_glsl_parse_state *st, s_list *list)

+ir_call *

+ir_reader::read_call(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 3) {

-      ir_read_error(st, list, "expected (call <name> (<param> ...))");

-      return NULL;

-   }

+   s_symbol *name;

+   s_list *params;

 

-   s_symbol *name = SX_AS_SYMBOL(list->subexpressions.head->next);

-   s_list *params = SX_AS_LIST(list->subexpressions.head->next->next);

-   if (name == NULL || params == NULL) {

-      ir_read_error(st, list, "expected (call <name> (<param> ...))");

+   s_pattern pat[] = { "call", name, params };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (call <name> (<param> ...))");

       return NULL;

    }

 

@@ -687,173 +622,156 @@ read_call(_mesa_glsl_parse_state *st, s_list *list)
 

    foreach_iter(exec_list_iterator, it, params->subexpressions) {

       s_expression *expr = (s_expression*) it.get();

-      ir_rvalue *param = read_rvalue(st, expr);

+      ir_rvalue *param = read_rvalue(expr);

       if (param == NULL) {

-	 ir_read_error(st, list, "when reading parameter to function call");

+	 ir_read_error(expr, "when reading parameter to function call");

 	 return NULL;

       }

       parameters.push_tail(param);

    }

 

-   ir_function *f = st->symbols->get_function(name->value());

+   ir_function *f = state->symbols->get_function(name->value());

    if (f == NULL) {

-      ir_read_error(st, list, "found call to undefined function %s",

+      ir_read_error(expr, "found call to undefined function %s",

 		    name->value());

       return NULL;

    }

 

    ir_function_signature *callee = f->matching_signature(&parameters);

    if (callee == NULL) {

-      ir_read_error(st, list, "couldn't find matching signature for function "

+      ir_read_error(expr, "couldn't find matching signature for function "

                     "%s", name->value());

       return NULL;

    }

 

-   return new(ctx) ir_call(callee, &parameters);

+   return new(mem_ctx) ir_call(callee, &parameters);

 }

 

-static ir_expression *

-read_expression(_mesa_glsl_parse_state *st, s_list *list)

+ir_expression *

+ir_reader::read_expression(s_expression *expr)

 {

-   void *ctx = st;

-   const unsigned list_length = list->length();

-   if (list_length < 4) {

-      ir_read_error(st, list, "expected (expression <type> <operator> "

-			      "<operand> [<operand>])");

+   s_expression *s_type;

+   s_symbol *s_op;

+   s_expression *s_arg1;

+

+   s_pattern pat[] = { "expression", s_type, s_op, s_arg1 };

+   if (!PARTIAL_MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (expression <type> <operator> "

+			  "<operand> [<operand>])");

       return NULL;

    }

+   s_expression *s_arg2 = (s_expression *) s_arg1->next; // may be tail sentinel

 

-   s_expression *type_expr = (s_expression*) list->subexpressions.head->next;

-   const glsl_type *type = read_type(st, type_expr);

+   const glsl_type *type = read_type(s_type);

    if (type == NULL)

       return NULL;

 

    /* Read the operator */

-   s_symbol *op_sym = SX_AS_SYMBOL(type_expr->next);

-   if (op_sym == NULL) {

-      ir_read_error(st, list, "expected operator, found non-symbol");

-      return NULL;

-   }

-

-   ir_expression_operation op = ir_expression::get_operator(op_sym->value());

+   ir_expression_operation op = ir_expression::get_operator(s_op->value());

    if (op == (ir_expression_operation) -1) {

-      ir_read_error(st, list, "invalid operator: %s", op_sym->value());

+      ir_read_error(expr, "invalid operator: %s", s_op->value());

       return NULL;

    }

     

-   /* Now that we know the operator, check for the right number of operands */ 

-   if (ir_expression::get_num_operands(op) == 2) {

-      if (list_length != 5) {

-	 ir_read_error(st, list, "expected (expression <type> %s <operand> "

-				 " <operand>)", op_sym->value());

-	 return NULL;

-      }

-   } else {

-      if (list_length != 4) {

-	 ir_read_error(st, list, "expected (expression <type> %s <operand>)",

-		       op_sym->value());

-	 return NULL;

-      }

+   unsigned num_operands = ir_expression::get_num_operands(op);

+   if (num_operands == 1 && !s_arg1->next->is_tail_sentinel()) {

+      ir_read_error(expr, "expected (expression <type> %s <operand>)",

+		    s_op->value());

+      return NULL;

    }

 

-   s_expression *exp1 = (s_expression*) (op_sym->next);

-   ir_rvalue *arg1 = read_rvalue(st, exp1);

+   ir_rvalue *arg1 = read_rvalue(s_arg1);

+   ir_rvalue *arg2 = NULL;

    if (arg1 == NULL) {

-      ir_read_error(st, NULL, "when reading first operand of %s",

-		    op_sym->value());

+      ir_read_error(NULL, "when reading first operand of %s", s_op->value());

       return NULL;

    }

 

-   ir_rvalue *arg2 = NULL;

-   if (ir_expression::get_num_operands(op) == 2) {

-      s_expression *exp2 = (s_expression*) (exp1->next);

-      arg2 = read_rvalue(st, exp2);

+   if (num_operands == 2) {

+      if (s_arg2->is_tail_sentinel() || !s_arg2->next->is_tail_sentinel()) {

+	 ir_read_error(expr, "expected (expression <type> %s <operand> "

+			     "<operand>)", s_op->value());

+	 return NULL;

+      }

+      arg2 = read_rvalue(s_arg2);

       if (arg2 == NULL) {

-	 ir_read_error(st, NULL, "when reading second operand of %s",

-		       op_sym->value());

+	 ir_read_error(NULL, "when reading second operand of %s",

+		       s_op->value());

 	 return NULL;

       }

    }

 

-   return new(ctx) ir_expression(op, type, arg1, arg2);

+   return new(mem_ctx) ir_expression(op, type, arg1, arg2);

 }

 

-static ir_swizzle *

-read_swizzle(_mesa_glsl_parse_state *st, s_list *list)

+ir_swizzle *

+ir_reader::read_swizzle(s_expression *expr)

 {

-   if (list->length() != 3) {

-      ir_read_error(st, list, "expected (swiz <swizzle> <rvalue>)");

-      return NULL;

-   }

+   s_symbol *swiz;

+   s_expression *sub;

 

-   s_symbol *swiz = SX_AS_SYMBOL(list->subexpressions.head->next);

-   if (swiz == NULL) {

-      ir_read_error(st, list, "expected a valid swizzle; found non-symbol");

+   s_pattern pat[] = { "swiz", swiz, sub };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (swiz <swizzle> <rvalue>)");

       return NULL;

    }

 

    if (strlen(swiz->value()) > 4) {

-      ir_read_error(st, list, "expected a valid swizzle; found %s",

-		    swiz->value());

+      ir_read_error(expr, "expected a valid swizzle; found %s", swiz->value());

       return NULL;

    }

 

-   s_expression *sub = (s_expression*) swiz->next;

-   ir_rvalue *rvalue = read_rvalue(st, sub);

+   ir_rvalue *rvalue = read_rvalue(sub);

    if (rvalue == NULL)

       return NULL;

 

    ir_swizzle *ir = ir_swizzle::create(rvalue, swiz->value(),

 				       rvalue->type->vector_elements);

    if (ir == NULL)

-      ir_read_error(st, list, "invalid swizzle");

+      ir_read_error(expr, "invalid swizzle");

 

    return ir;

 }

 

-static ir_constant *

-read_constant(_mesa_glsl_parse_state *st, s_list *list)

+ir_constant *

+ir_reader::read_constant(s_expression *expr)

 {

-   void *ctx = st;

-   if (list->length() != 3) {

-      ir_read_error(st, list, "expected (constant <type> (...))");

+   s_expression *type_expr;

+   s_list *values;

+

+   s_pattern pat[] = { "constant", type_expr, values };

+   if (!MATCH(expr, pat)) {

+      ir_read_error(expr, "expected (constant <type> (...))");

       return NULL;

    }

 

-   s_expression *type_expr = (s_expression*) list->subexpressions.head->next;

-   const glsl_type *type = read_type(st, type_expr);

+   const glsl_type *type = read_type(type_expr);

    if (type == NULL)

       return NULL;

 

-   s_list *values = SX_AS_LIST(type_expr->next);

    if (values == NULL) {

-      ir_read_error(st, list, "expected (constant <type> (...))");

+      ir_read_error(expr, "expected (constant <type> (...))");

       return NULL;

    }

 

    if (type->is_array()) {

-      const unsigned elements_supplied = values->length();

-      if (elements_supplied != type->length) {

-	 ir_read_error(st, values, "expected exactly %u array elements, "

-		       "given %u", type->length, elements_supplied);

-	 return NULL;

-      }

-

+      unsigned elements_supplied = 0;

       exec_list elements;

       foreach_iter(exec_list_iterator, it, values->subexpressions) {

-	 s_expression *expr = (s_expression *) it.get();

-	 s_list *elt = SX_AS_LIST(expr);

-	 if (elt == NULL) {

-	    ir_read_error(st, expr, "expected (constant ...) array element");

-	    return NULL;

-	 }

-

-	 ir_constant *ir_elt = read_constant(st, elt);

+	 s_expression *elt = (s_expression *) it.get();

+	 ir_constant *ir_elt = read_constant(elt);

 	 if (ir_elt == NULL)

 	    return NULL;

 	 elements.push_tail(ir_elt);

+	 elements_supplied++;

+      }

+

+      if (elements_supplied != type->length) {

+	 ir_read_error(values, "expected exactly %u array elements, "

+		       "given %u", type->length, elements_supplied);

+	 return NULL;

       }

-      return new(ctx) ir_constant(type, &elements);

+      return new(mem_ctx) ir_constant(type, &elements);

    }

 

    const glsl_type *const base_type = type->get_base_type();

@@ -864,7 +782,7 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
    int k = 0;

    foreach_iter(exec_list_iterator, it, values->subexpressions) {

       if (k >= 16) {

-	 ir_read_error(st, values, "expected at most 16 numbers");

+	 ir_read_error(values, "expected at most 16 numbers");

 	 return NULL;

       }

 

@@ -873,14 +791,14 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
       if (base_type->base_type == GLSL_TYPE_FLOAT) {

 	 s_number *value = SX_AS_NUMBER(expr);

 	 if (value == NULL) {

-	    ir_read_error(st, values, "expected numbers");

+	    ir_read_error(values, "expected numbers");

 	    return NULL;

 	 }

 	 data.f[k] = value->fvalue();

       } else {

 	 s_int *value = SX_AS_INT(expr);

 	 if (value == NULL) {

-	    ir_read_error(st, values, "expected integers");

+	    ir_read_error(values, "expected integers");

 	    return NULL;

 	 }

 

@@ -898,246 +816,185 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
 	    break;

 	 }

 	 default:

-	    ir_read_error(st, values, "unsupported constant type");

+	    ir_read_error(values, "unsupported constant type");

 	    return NULL;

 	 }

       }

       ++k;

    }

 

-   return new(ctx) ir_constant(type, &data);

+   return new(mem_ctx) ir_constant(type, &data);

 }

 

-static ir_dereference *

-read_dereference(_mesa_glsl_parse_state *st, s_expression *expr)

+ir_dereference *

+ir_reader::read_dereference(s_expression *expr)

 {

-   s_list *list = SX_AS_LIST(expr);

-   if (list == NULL || list->subexpressions.is_empty())

-      return NULL;

-

-   s_symbol *tag = SX_AS_SYMBOL(list->subexpressions.head);

-   assert(tag != NULL);

-

-   if (strcmp(tag->value(), "var_ref") == 0)

-      return read_var_ref(st, list);

-   if (strcmp(tag->value(), "array_ref") == 0)

-      return read_array_ref(st, list);

-   if (strcmp(tag->value(), "record_ref") == 0)

-      return read_record_ref(st, list);

-   return NULL;

-}

-

-static ir_dereference_variable *

-read_var_ref(_mesa_glsl_parse_state *st, s_list *list)

-{

-   void *ctx = st;

-   if (list->length() != 2) {

-      ir_read_error(st, list, "expected (var_ref <variable name>)");

-      return NULL;

-   }

-   s_symbol *var_name = SX_AS_SYMBOL(list->subexpressions.head->next);

-   if (var_name == NULL) {

-      ir_read_error(st, list, "expected (var_ref <variable name>)");

-      return NULL;

-   }

-

-   ir_variable *var = st->symbols->get_variable(var_name->value());

-   if (var == NULL) {

-      ir_read_error(st, list, "undeclared variable: %s", var_name->value());

-      return NULL;

-   }

-

-   return new(ctx) ir_dereference_variable(var);

-}

-

-static ir_dereference_array *

-read_array_ref(_mesa_glsl_parse_state *st, s_list *list)

-{

-   void *ctx = st;

-   if (list->length() != 3) {

-      ir_read_error(st, list, "expected (array_ref <rvalue> <index>)");

-      return NULL;

-   }

-

-   s_expression *subj_expr = (s_expression*) list->subexpressions.head->next;

-   ir_rvalue *subject = read_rvalue(st, subj_expr);

-   if (subject == NULL) {

-      ir_read_error(st, NULL, "when reading the subject of an array_ref");

-      return NULL;

-   }

-

-   s_expression *idx_expr = (s_expression*) subj_expr->next;

-   ir_rvalue *idx = read_rvalue(st, idx_expr);

-   return new(ctx) ir_dereference_array(subject, idx);

-}

-

-static ir_dereference_record *

-read_record_ref(_mesa_glsl_parse_state *st, s_list *list)

-{

-   void *ctx = st;

-   if (list->length() != 3) {

-      ir_read_error(st, list, "expected (record_ref <rvalue> <field>)");

-      return NULL;

-   }

-

-   s_expression *subj_expr = (s_expression*) list->subexpressions.head->next;

-   ir_rvalue *subject = read_rvalue(st, subj_expr);

-   if (subject == NULL) {

-      ir_read_error(st, NULL, "when reading the subject of a record_ref");

-      return NULL;

-   }

+   s_symbol *s_var;

+   s_expression *s_subject;

+   s_expression *s_index;

+   s_symbol *s_field;

+

+   s_pattern var_pat[] = { "var_ref", s_var };

+   s_pattern array_pat[] = { "array_ref", s_subject, s_index };

+   s_pattern record_pat[] = { "record_ref", s_subject, s_field };

+

+   if (MATCH(expr, var_pat)) {

+      ir_variable *var = state->symbols->get_variable(s_var->value());

+      if (var == NULL) {

+	 ir_read_error(expr, "undeclared variable: %s", s_var->value());

+	 return NULL;

+      }

+      return new(mem_ctx) ir_dereference_variable(var);

+   } else if (MATCH(expr, array_pat)) {

+      ir_rvalue *subject = read_rvalue(s_subject);

+      if (subject == NULL) {

+	 ir_read_error(NULL, "when reading the subject of an array_ref");

+	 return NULL;

+      }

 

-   s_symbol *field = SX_AS_SYMBOL(subj_expr->next);

-   if (field == NULL) {

-      ir_read_error(st, list, "expected (record_ref ... <field name>)");

-      return NULL;

+      ir_rvalue *idx = read_rvalue(s_index);

+      if (subject == NULL) {

+	 ir_read_error(NULL, "when reading the index of an array_ref");

+	 return NULL;

+      }

+      return new(mem_ctx) ir_dereference_array(subject, idx);

+   } else if (MATCH(expr, record_pat)) {

+      ir_rvalue *subject = read_rvalue(s_subject);

+      if (subject == NULL) {

+	 ir_read_error(NULL, "when reading the subject of a record_ref");

+	 return NULL;

+      }

+      return new(mem_ctx) ir_dereference_record(subject, s_field->value());

    }

-   return new(ctx) ir_dereference_record(subject, field->value());

-}

-

-static bool

-valid_texture_list_length(ir_texture_opcode op, s_list *list)

-{

-   unsigned required_length = 7;

-   if (op == ir_txf)

-      required_length = 5;

-   else if (op == ir_tex)

-      required_length = 6;

-

-   return list->length() == required_length;

+   return NULL;

 }

 

-static ir_texture *

-read_texture(_mesa_glsl_parse_state *st, s_list *list)

+ir_texture *

+ir_reader::read_texture(s_expression *expr)

 {

-   void *ctx = st;

-   s_symbol *tag = SX_AS_SYMBOL(list->subexpressions.head);

-   assert(tag != NULL);

-

-   ir_texture_opcode op = ir_texture::get_opcode(tag->value());

-   if (op == (ir_texture_opcode) -1)

-      return NULL;

-

-   if (!valid_texture_list_length(op, list)) {

-      ir_read_error(st, NULL, "invalid list size in (%s ...)", tag->value());

-      return NULL;

+   s_symbol *tag = NULL;

+   s_expression *s_sampler = NULL;

+   s_expression *s_coord = NULL;

+   s_list *s_offset = NULL;

+   s_expression *s_proj = NULL;

+   s_list *s_shadow = NULL;

+   s_expression *s_lod = NULL;

+

+   ir_texture_opcode op;

+

+   s_pattern tex_pattern[] =

+      { "tex", s_sampler, s_coord, s_offset, s_proj, s_shadow };

+   s_pattern txf_pattern[] =

+      { "txf", s_sampler, s_coord, s_offset, s_lod };

+   s_pattern other_pattern[] =

+      { tag, s_sampler, s_coord, s_offset, s_proj, s_shadow, s_lod };

+

+   if (MATCH(expr, tex_pattern)) {

+      op = ir_tex;

+   } else if (MATCH(expr, txf_pattern)) {

+      op = ir_txf;

+   } else if (MATCH(expr, other_pattern)) {

+      op = ir_texture::get_opcode(tag->value());

+      if (op == -1)

+	 return NULL;

    }

 

-   ir_texture *tex = new(ctx) ir_texture(op);

+   ir_texture *tex = new(mem_ctx) ir_texture(op);

 

    // Read sampler (must be a deref)

-   s_expression *sampler_expr = (s_expression *) tag->next;

-   ir_dereference *sampler = read_dereference(st, sampler_expr);

+   ir_dereference *sampler = read_dereference(s_sampler);

    if (sampler == NULL) {

-      ir_read_error(st, NULL, "when reading sampler in (%s ...)", tag->value());

+      ir_read_error(NULL, "when reading sampler in (%s ...)",

+		    tex->opcode_string());

       return NULL;

    }

    tex->set_sampler(sampler);

 

    // Read coordinate (any rvalue)

-   s_expression *coordinate_expr = (s_expression *) sampler_expr->next;

-   tex->coordinate = read_rvalue(st, coordinate_expr);

+   tex->coordinate = read_rvalue(s_coord);

    if (tex->coordinate == NULL) {

-      ir_read_error(st, NULL, "when reading coordinate in (%s ...)",

-		    tag->value());

+      ir_read_error(NULL, "when reading coordinate in (%s ...)",

+		    tex->opcode_string());

       return NULL;

    }

 

    // Read texel offset, i.e. (0 0 0)

-   s_list *offset_list = SX_AS_LIST(coordinate_expr->next);

-   if (offset_list == NULL || offset_list->length() != 3) {

-      ir_read_error(st, offset_list, "expected (<int> <int> <int>)");

-      return NULL;

-   }

-   s_int *offset_x = SX_AS_INT(offset_list->subexpressions.head);

-   s_int *offset_y = SX_AS_INT(offset_list->subexpressions.head->next);

-   s_int *offset_z = SX_AS_INT(offset_list->subexpressions.head->next->next);

-   if (offset_x == NULL || offset_y == NULL || offset_z == NULL) {

-      ir_read_error(st, offset_list, "expected (<int> <int> <int>)");

+   s_int *offset_x;

+   s_int *offset_y;

+   s_int *offset_z;

+   s_pattern offset_pat[] = { offset_x, offset_y, offset_z };

+   if (!MATCH(s_offset, offset_pat)) {

+      ir_read_error(s_offset, "expected (<int> <int> <int>)");

       return NULL;

    }

    tex->offsets[0] = offset_x->value();

    tex->offsets[1] = offset_y->value();

    tex->offsets[2] = offset_z->value();

 

-   if (op == ir_txf) {

-      s_expression *lod_expr = (s_expression *) offset_list->next;

-      tex->lod_info.lod = read_rvalue(st, lod_expr);

-      if (tex->lod_info.lod == NULL) {

-	 ir_read_error(st, NULL, "when reading LOD in (txf ...)");

-	 return NULL;

-      }

-   } else {

-      s_expression *proj_expr = (s_expression *) offset_list->next;

-      s_int *proj_as_int = SX_AS_INT(proj_expr);

+   if (op != ir_txf) {

+      s_int *proj_as_int = SX_AS_INT(s_proj);

       if (proj_as_int && proj_as_int->value() == 1) {

 	 tex->projector = NULL;

       } else {

-	 tex->projector = read_rvalue(st, proj_expr);

+	 tex->projector = read_rvalue(s_proj);

 	 if (tex->projector == NULL) {

-	    ir_read_error(st, NULL, "when reading projective divide in (%s ..)",

-	                  tag->value());

+	    ir_read_error(NULL, "when reading projective divide in (%s ..)",

+	                  tex->opcode_string());

 	    return NULL;

 	 }

       }

 

-      s_list *shadow_list = SX_AS_LIST(proj_expr->next);

-      if (shadow_list == NULL) {

-	 ir_read_error(st, NULL, "shadow comparitor must be a list");

-	 return NULL;

-      }

-      if (shadow_list->subexpressions.is_empty()) {

-	 tex->shadow_comparitor= NULL;

+      if (s_shadow->subexpressions.is_empty()) {

+	 tex->shadow_comparitor = NULL;

       } else {

-	 tex->shadow_comparitor = read_rvalue(st, shadow_list);

+	 tex->shadow_comparitor = read_rvalue(s_shadow);

 	 if (tex->shadow_comparitor == NULL) {

-	    ir_read_error(st, NULL, "when reading shadow comparitor in (%s ..)",

-			  tag->value());

+	    ir_read_error(NULL, "when reading shadow comparitor in (%s ..)",

+			  tex->opcode_string());

 	    return NULL;

 	 }

       }

-      s_expression *lod_expr = (s_expression *) shadow_list->next;

-

-      switch (op) {

-      case ir_txb:

-	 tex->lod_info.bias = read_rvalue(st, lod_expr);

-	 if (tex->lod_info.bias == NULL) {

-	    ir_read_error(st, NULL, "when reading LOD bias in (txb ...)");

-	    return NULL;

-	 }

-	 break;

-      case ir_txl:

-	 tex->lod_info.lod = read_rvalue(st, lod_expr);

-	 if (tex->lod_info.lod == NULL) {

-	    ir_read_error(st, NULL, "when reading LOD in (txl ...)");

-	    return NULL;

-	 }

-	 break;

-      case ir_txd: {

-	 s_list *lod_list = SX_AS_LIST(lod_expr);

-	 if (lod_list->length() != 2) {

-	    ir_read_error(st, lod_expr, "expected (dPdx dPdy) in (txd ...)");

-	    return NULL;

-	 }

-	 s_expression *dx_expr = (s_expression *) lod_list->subexpressions.head;

-	 s_expression *dy_expr = (s_expression *) dx_expr->next;

+   }

 

-	 tex->lod_info.grad.dPdx = read_rvalue(st, dx_expr);

-	 if (tex->lod_info.grad.dPdx == NULL) {

-	    ir_read_error(st, NULL, "when reading dPdx in (txd ...)");

-	    return NULL;

-	 }

-	 tex->lod_info.grad.dPdy = read_rvalue(st, dy_expr);

-	 if (tex->lod_info.grad.dPdy == NULL) {

-	    ir_read_error(st, NULL, "when reading dPdy in (txd ...)");

-	    return NULL;

-	 }

-	 break;

+   switch (op) {

+   case ir_txb:

+      tex->lod_info.bias = read_rvalue(s_lod);

+      if (tex->lod_info.bias == NULL) {

+	 ir_read_error(NULL, "when reading LOD bias in (txb ...)");

+	 return NULL;

+      }

+      break;

+   case ir_txl:

+   case ir_txf:

+      tex->lod_info.lod = read_rvalue(s_lod);

+      if (tex->lod_info.lod == NULL) {

+	 ir_read_error(NULL, "when reading LOD in (%s ...)",

+		       tex->opcode_string());

+	 return NULL;

+      }

+      break;

+   case ir_txd: {

+      s_expression *s_dx, *s_dy;

+      s_pattern dxdy_pat[] = { s_dx, s_dy };

+      if (!MATCH(s_lod, dxdy_pat)) {

+	 ir_read_error(s_lod, "expected (dPdx dPdy) in (txd ...)");

+	 return NULL;

+      }

+      tex->lod_info.grad.dPdx = read_rvalue(s_dx);

+      if (tex->lod_info.grad.dPdx == NULL) {

+	 ir_read_error(NULL, "when reading dPdx in (txd ...)");

+	 return NULL;

+      }

+      tex->lod_info.grad.dPdy = read_rvalue(s_dy);

+      if (tex->lod_info.grad.dPdy == NULL) {

+	 ir_read_error(NULL, "when reading dPdy in (txd ...)");

+	 return NULL;

       }

-      default:

-	 // tex doesn't have any extra parameters and txf was handled earlier.

-	 break;

-      };

+      break;

    }

+   default:

+      // tex doesn't have any extra parameters.

+      break;

+   };

    return tex;

 }

diff --git a/mesalib/src/glsl/lower_jumps.cpp b/mesalib/src/glsl/lower_jumps.cpp
index 7c3463e58..17be39f5b 100644
--- a/mesalib/src/glsl/lower_jumps.cpp
+++ b/mesalib/src/glsl/lower_jumps.cpp
@@ -66,7 +66,7 @@ enum jump_strength
    strength_always_clears_execute_flag,

    strength_continue,

    strength_break,

-   strength_return,

+   strength_return

 };

 

 struct block_record

diff --git a/mesalib/src/glsl/s_expression.cpp b/mesalib/src/glsl/s_expression.cpp
index 0aecfa19c..36624541b 100644
--- a/mesalib/src/glsl/s_expression.cpp
+++ b/mesalib/src/glsl/s_expression.cpp
@@ -38,14 +38,15 @@ s_list::s_list()
 {

 }

 

-unsigned

-s_list::length() const

+static void

+skip_whitespace(const char *& src)

 {

-   unsigned i = 0;

-   foreach_iter(exec_list_iterator, it, this->subexpressions) {

-      i++;

+   src += strspn(src, " \v\t\r\n");

+   /* Also skip Scheme-style comments: semi-colon 'til end of line */

+   if (src[0] == ';') {

+      src += strcspn(src, "\n");

+      skip_whitespace(src);

    }

-   return i;

 }

 

 static s_expression *

@@ -53,10 +54,9 @@ read_atom(void *ctx, const char *& src)
 {

    s_expression *expr = NULL;

 

-   // Skip leading spaces.

-   src += strspn(src, " \v\t\r\n");

+   skip_whitespace(src);

 

-   size_t n = strcspn(src, "( \v\t\r\n)");

+   size_t n = strcspn(src, "( \v\t\r\n);");

    if (n == 0)

       return NULL; // no atom

 

@@ -90,8 +90,7 @@ s_expression::read_expression(void *ctx, const char *&src)
    if (atom != NULL)

       return atom;

 

-   // Skip leading spaces.

-   src += strspn(src, " \v\t\r\n");

+   skip_whitespace(src);

    if (src[0] == '(') {

       ++src;

 

@@ -101,7 +100,7 @@ s_expression::read_expression(void *ctx, const char *&src)
       while ((expr = read_expression(ctx, src)) != NULL) {

 	 list->subexpressions.push_tail(expr);

       }

-      src += strspn(src, " \v\t\r\n");

+      skip_whitespace(src);

       if (src[0] != ')') {

 	 printf("Unclosed expression (check your parenthesis).\n");

 	 return NULL;

@@ -139,3 +138,49 @@ void s_list::print()
    printf(")");

 }

 

+// --------------------------------------------------

+

+bool

+s_pattern::match(s_expression *expr)

+{

+   switch (type)

+   {

+   case EXPR:   *p_expr = expr; break;

+   case LIST:   if (expr->is_list())   *p_list   = (s_list *)   expr; break;

+   case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;

+   case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;

+   case INT:    if (expr->is_int())    *p_int    = (s_int *)    expr; break;

+   case STRING:

+      s_symbol *sym = SX_AS_SYMBOL(expr);

+      if (sym != NULL && strcmp(sym->value(), literal) == 0)

+	 return true;

+      return false;

+   };

+

+   return *p_expr == expr;

+}

+

+bool

+s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)

+{

+   s_list *list = SX_AS_LIST(top);

+   if (list == NULL)

+      return false;

+

+   unsigned i = 0;

+   foreach_iter(exec_list_iterator, it, list->subexpressions) {

+      if (i >= n)

+	 return partial; /* More actual items than the pattern expected */

+

+      s_expression *expr = (s_expression *) it.get();

+      if (expr == NULL || !pattern[i].match(expr))

+	 return false;

+

+      i++;

+   }

+

+   if (i < n)

+      return false; /* Less actual items than the pattern expected */

+

+   return true;

+}

diff --git a/mesalib/src/glsl/s_expression.h b/mesalib/src/glsl/s_expression.h
index 6b5e52f5a..1bb437736 100644
--- a/mesalib/src/glsl/s_expression.h
+++ b/mesalib/src/glsl/s_expression.h
@@ -26,9 +26,11 @@
 #ifndef S_EXPRESSION_H

 #define S_EXPRESSION_H

 

+#include "main/core.h" /* for Elements */

 #include "strtod.h"

 #include "list.h"

 

+/* Type-safe downcasting macros (also safe to pass NULL) */

 #define SX_AS_(t,x) ((x) && ((s_expression*) x)->is_##t()) ? ((s_##t*) (x)) \

                                                            : NULL

 #define SX_AS_LIST(x)   SX_AS_(list, x)

@@ -36,6 +38,10 @@
 #define SX_AS_NUMBER(x) SX_AS_(number, x)

 #define SX_AS_INT(x)    SX_AS_(int, x)

 

+/* Pattern matching macros */

+#define MATCH(list, pat) s_match(list, Elements(pat), pat, false)

+#define PARTIAL_MATCH(list, pat) s_match(list, Elements(pat), pat, true)

+

 /* For our purposes, S-Expressions are:

  * - <int>

  * - <float>

@@ -133,11 +139,42 @@ public:
    s_list();

 

    virtual bool is_list() const { return true; }

-   unsigned length() const;

 

    void print();

 

    exec_list subexpressions;

 };

 

+// ------------------------------------------------------------

+

+/**

+ * Part of a pattern to match - essentially a record holding a pointer to the

+ * storage for the component to match, along with the appropriate type.

+ */

+class s_pattern {

+public:

+   s_pattern(s_expression *&s) : p_expr(&s),   type(EXPR)   { }

+   s_pattern(s_list       *&s) : p_list(&s),   type(LIST)   { }

+   s_pattern(s_symbol     *&s) : p_symbol(&s), type(SYMBOL) { }

+   s_pattern(s_number     *&s) : p_number(&s), type(NUMBER) { }

+   s_pattern(s_int        *&s) : p_int(&s),    type(INT)    { }

+   s_pattern(const char *str)  : literal(str), type(STRING) { }

+

+   bool match(s_expression *expr);

+

+private:

+   union {

+      s_expression **p_expr;

+      s_list       **p_list;

+      s_symbol     **p_symbol;

+      s_number     **p_number;

+      s_int        **p_int;

+      const char *literal;

+   };

+   enum { EXPR, LIST, SYMBOL, NUMBER, INT, STRING } type;

+};

+

+bool

+s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial);

+

 #endif /* S_EXPRESSION_H */