remove stray tab
[mesa.git] / src / mesa / shader / slang / slang_compile.c
index ed82712b20f3aea95c14128cd8eb2209445b89a6..c459eb29e744a72baea680004c666cc59bf3a7f0 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5.2
  *
- * Copyright (C) 2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  */
 
 #include "imports.h"
+#include "context.h"
+#include "program.h"
+#include "prog_parameter.h"
 #include "grammar_mesa.h"
-#include "slang_utility.h"
+#include "slang_codegen.h"
 #include "slang_compile.h"
 #include "slang_preprocess.h"
 #include "slang_storage.h"
-#include "slang_assemble.h"
-#include "slang_execute.h"
+#include "slang_error.h"
+#include "slang_emit.h"
+#include "slang_vartable.h"
+
+#include "slang_print.h"
 
 /*
-       This is a straightforward implementation of the slang front-end compiler.
-       Lots of error-checking functionality is missing but every well-formed shader source should
-       compile successfully and execute as expected. However, some semantically ill-formed shaders
-       may be accepted resulting in undefined behaviour.
-*/
-
-static void slang_variable_construct (slang_variable *);
-static int slang_variable_copy (slang_variable *, const slang_variable *);
-static void slang_struct_destruct (slang_struct *);
-static int slang_struct_equal (const slang_struct *, const slang_struct *);
-static void slang_variable_destruct (slang_variable *);
-
-/* slang_type_specifier_type */
-
-/* these must match with slang_type_specifier_type enum */
-static const char *type_specifier_type_names[] = {
-       "void",
-       "bool",
-       "bvec2",
-       "bvec3",
-       "bvec4",
-       "int",
-       "ivec2",
-       "ivec3",
-       "ivec4",
-       "float",
-       "vec2",
-       "vec3",
-       "vec4",
-       "mat2",
-       "mat3",
-       "mat4",
-       "sampler1D",
-       "sampler2D",
-       "sampler3D",
-       "samplerCube",
-       "sampler1DShadow",
-       "sampler2DShadow",
-       NULL
-};
+ * This is a straightforward implementation of the slang front-end
+ * compiler.  Lots of error-checking functionality is missing but
+ * every well-formed shader source should compile successfully and
+ * execute as expected. However, some semantically ill-formed shaders
+ * may be accepted resulting in undefined behaviour.
+ */
 
-slang_type_specifier_type slang_type_specifier_type_from_string (const char *name)
-{
-       const char **p = type_specifier_type_names;
-       while (*p != NULL)
-       {
-               if (slang_string_compare (*p, name) == 0)
-                       return (slang_type_specifier_type) (p - type_specifier_type_names);
-               p++;
-       }
-       return slang_spec_void;
-}
 
-/* slang_type_specifier */
 
-void slang_type_specifier_construct (slang_type_specifier *spec)
+/**
+ * Allocate storage for a variable of 'size' bytes from given pool.
+ * Return the allocated address for the variable.
+ */
+static GLuint
+slang_var_pool_alloc(slang_var_pool * pool, unsigned int size)
 {
-       spec->type = slang_spec_void;
-       spec->_struct = NULL;
-       spec->_array = NULL;
+   const GLuint addr = pool->next_addr;
+   pool->next_addr += size;
+   return addr;
 }
 
-void slang_type_specifier_destruct (slang_type_specifier *spec)
-{
-       if (spec->_struct != NULL)
-       {
-               slang_struct_destruct (spec->_struct);
-               slang_alloc_free (spec->_struct);
-       }
-       if (spec->_array != NULL)
-       {
-               slang_type_specifier_destruct (spec->_array);
-               slang_alloc_free (spec->_array);
-       }
-}
+/*
+ * slang_code_unit
+ */
 
-int slang_type_specifier_copy (slang_type_specifier *x, const slang_type_specifier *y)
+GLvoid
+_slang_code_unit_ctr(slang_code_unit * self,
+                     struct slang_code_object_ * object)
 {
-       slang_type_specifier_destruct (x);
-       slang_type_specifier_construct (x);
-       x->type = y->type;
-       if (x->type == slang_spec_struct)
-       {
-               x->_struct = (slang_struct *) slang_alloc_malloc (sizeof (slang_struct));
-               if (x->_struct == NULL)
-                       return 0;
-               if (!slang_struct_construct_a (x->_struct))
-               {
-                       slang_alloc_free (x->_struct);
-                       x->_struct = NULL;
-                       return 0;
-               }
-               return slang_struct_copy (x->_struct, y->_struct);
-       }
-       if (x->type == slang_spec_array)
-       {
-               x->_array = (slang_type_specifier *) slang_alloc_malloc (sizeof (slang_type_specifier));
-               if (x->_array == NULL)
-                       return 0;
-               slang_type_specifier_construct (x->_array);
-               return slang_type_specifier_copy (x->_array, y->_array);
-       }
-       return 1;
+   _slang_variable_scope_ctr(&self->vars);
+   _slang_function_scope_ctr(&self->funs);
+   _slang_struct_scope_ctr(&self->structs);
+   self->object = object;
 }
 
-int slang_type_specifier_equal (const slang_type_specifier *x, const slang_type_specifier *y)
+GLvoid
+_slang_code_unit_dtr(slang_code_unit * self)
 {
-       if (x->type != y->type)
-               return 0;
-       if (x->type == slang_spec_struct)
-               return slang_struct_equal (x->_struct, y->_struct);
-       if (x->type == slang_spec_array)
-               return slang_type_specifier_equal (x->_array, y->_array);
-       return 1;
+   slang_variable_scope_destruct(&self->vars);
+   slang_function_scope_destruct(&self->funs);
+   slang_struct_scope_destruct(&self->structs);
 }
 
-/* slang_fully_specified_type */
-
-static void slang_fully_specified_type_construct (slang_fully_specified_type *type)
-{
-       type->qualifier = slang_qual_none;
-       slang_type_specifier_construct (&type->specifier);
-}
+/*
+ * slang_code_object
+ */
 
-static void slang_fully_specified_type_destruct (slang_fully_specified_type *type)
+GLvoid
+_slang_code_object_ctr(slang_code_object * self)
 {
-       slang_type_specifier_destruct (&type->specifier);
-}
+   GLuint i;
 
-static int slang_fully_specified_type_copy (slang_fully_specified_type *x,
-       const slang_fully_specified_type *y)
-{
-       slang_fully_specified_type_construct (x);
-       slang_fully_specified_type_destruct (x);
-       x->qualifier = y->qualifier;
-       return slang_type_specifier_copy (&x->specifier, &y->specifier);
+   for (i = 0; i < SLANG_BUILTIN_TOTAL; i++)
+      _slang_code_unit_ctr(&self->builtin[i], self);
+   _slang_code_unit_ctr(&self->unit, self);
+#if 01
+   _slang_assembly_file_ctr(&self->assembly);
+#endif
+   slang_machine_ctr(&self->machine);
+   self->varpool.next_addr = 0;
+   slang_atom_pool_construct(&self->atompool);
+   slang_export_data_table_ctr(&self->expdata);
+   self->expdata.atoms = &self->atompool;
+   slang_export_code_table_ctr(&self->expcode);
+   self->expcode.atoms = &self->atompool;
 }
 
-/* slang_variable_scope */
-
-static void slang_variable_scope_construct (slang_variable_scope *scope)
+GLvoid
+_slang_code_object_dtr(slang_code_object * self)
 {
-       scope->variables = NULL;
-       scope->num_variables = 0;
-       scope->outer_scope = NULL;
-}
+   GLuint i;
 
-static void slang_variable_scope_destruct (slang_variable_scope *scope)
-{
-       unsigned int i;
-       for (i = 0; i < scope->num_variables; i++)
-               slang_variable_destruct (scope->variables + i);
-       slang_alloc_free (scope->variables);
+   for (i = 0; i < SLANG_BUILTIN_TOTAL; i++)
+      _slang_code_unit_dtr(&self->builtin[i]);
+   _slang_code_unit_dtr(&self->unit);
+#if 01
+   slang_assembly_file_destruct(&self->assembly);
+#endif
+   slang_machine_dtr(&self->machine);
+   slang_atom_pool_destruct(&self->atompool);
+   slang_export_data_table_dtr(&self->expdata);
+   slang_export_code_table_ctr(&self->expcode);
 }
 
-static int slang_variable_scope_copy (slang_variable_scope *x, const slang_variable_scope *y)
-{
-       unsigned int i;
-       slang_variable_scope_destruct (x);
-       slang_variable_scope_construct (x);
-       x->variables = (slang_variable *) slang_alloc_malloc (y->num_variables * sizeof (
-               slang_variable));
-       if (x->variables == NULL)
-               return 0;
-       x->num_variables = y->num_variables;
-       for (i = 0; i < x->num_variables; i++)
-               slang_variable_construct (x->variables + i);
-       for (i = 0; i < x->num_variables; i++)
-               if (!slang_variable_copy (x->variables + i, y->variables + i))
-                       return 0;
-       x->outer_scope = y->outer_scope;
-       return 1;
-}
-
-/* slang_operation */
-
-int slang_operation_construct_a (slang_operation *oper)
-{
-       oper->type = slang_oper_none;
-       oper->children = NULL;
-       oper->num_children = 0;
-       oper->literal = (float) 0;
-       oper->identifier = NULL;
-       oper->locals = (slang_variable_scope *) slang_alloc_malloc (sizeof (slang_variable_scope));
-       if (oper->locals == NULL)
-               return 0;
-       slang_variable_scope_construct (oper->locals);
-       return 1;
-}
+/* slang_info_log */
 
-void slang_operation_destruct (slang_operation *oper)
-{
-       unsigned int i;
-       for (i = 0; i < oper->num_children; i++)
-               slang_operation_destruct (oper->children + i);
-       slang_alloc_free (oper->children);
-       slang_alloc_free (oper->identifier);
-       slang_variable_scope_destruct (oper->locals);
-       slang_alloc_free (oper->locals);
-}
+static char *out_of_memory = "Error: Out of memory.\n";
 
-static int slang_operation_copy (slang_operation *x, const slang_operation *y)
+void
+slang_info_log_construct(slang_info_log * log)
 {
-       unsigned int i;
-       for (i = 0; i < x->num_children; i++)
-               slang_operation_destruct (x->children + i);
-       slang_alloc_free (x->children);
-       x->num_children = 0;
-       slang_alloc_free (x->identifier);
-       x->identifier = NULL;
-       slang_variable_scope_destruct (x->locals);
-       slang_variable_scope_construct (x->locals);
-
-       x->type = y->type;
-       x->children = (slang_operation *) slang_alloc_malloc (y->num_children * sizeof (
-               slang_operation));
-       if (x->children == NULL)
-               return 0;
-       for (i = 0; i < y->num_children; i++)
-               if (!slang_operation_construct_a (x->children + i))
-               {
-                       unsigned int j;
-                       for (j = 0; j < i; j++)
-                               slang_operation_destruct (x->children + j);
-                       slang_alloc_free (x->children);
-                       x->children = NULL;
-                       return 0;
-               }
-       x->num_children = y->num_children;
-       for (i = 0; i < x->num_children; i++)
-               if (!slang_operation_copy (x->children + i, y->children + i))
-                       return 0;
-       x->literal = y->literal;
-       if (y->identifier != NULL)
-       {
-               x->identifier = slang_string_duplicate (y->identifier);
-               if (x->identifier == NULL)
-                       return 0;
-       }
-       if (!slang_variable_scope_copy (x->locals, y->locals))
-               return 0;
-       return 1;
+   log->text = NULL;
+   log->dont_free_text = 0;
 }
 
-/* slang_variable */
-
-static void slang_variable_construct (slang_variable *var)
+void
+slang_info_log_destruct(slang_info_log * log)
 {
-       slang_fully_specified_type_construct (&var->type);
-       var->name = NULL;
-       var->array_size = NULL;
-       var->initializer = NULL;
-       var->address = ~0;
+   if (!log->dont_free_text)
+      slang_alloc_free(log->text);
 }
 
-static void slang_variable_destruct (slang_variable *var)
+static int
+slang_info_log_message(slang_info_log * log, const char *prefix,
+                       const char *msg)
 {
-       slang_fully_specified_type_destruct (&var->type);
-       slang_alloc_free (var->name);
-       if (var->array_size != NULL)
-       {
-               slang_operation_destruct (var->array_size);
-               slang_alloc_free (var->array_size);
-       }
-       if (var->initializer != NULL)
-       {
-               slang_operation_destruct (var->initializer);
-               slang_alloc_free (var->initializer);
-       }
-}
+   GLuint size;
 
-static int slang_variable_copy (slang_variable *x, const slang_variable *y)
-{
-       slang_variable_destruct (x);
-       slang_variable_construct (x);
-       if (!slang_fully_specified_type_copy (&x->type, &y->type))
-               return 0;
-       if (y->name != NULL)
-       {
-               x->name = slang_string_duplicate (y->name);
-               if (x->name == NULL)
-                       return 0;
-       }
-       if (y->array_size != NULL)
-       {
-               x->array_size = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-               if (x->array_size == NULL)
-                       return 0;
-               if (!slang_operation_construct_a (x->array_size))
-               {
-                       slang_alloc_free (x->array_size);
-                       x->array_size = NULL;
-                       return 0;
-               }
-               if (!slang_operation_copy (x->array_size, y->array_size))
-                       return 0;
-       }
-       if (y->initializer != NULL)
-       {
-               x->initializer = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-               if (x->initializer == NULL)
-                       return 0;
-               if (!slang_operation_construct_a (x->initializer))
-               {
-                       slang_alloc_free (x->initializer);
-                       x->initializer = NULL;
-                       return 0;
-               }
-               if (!slang_operation_copy (x->initializer, y->initializer))
-                       return 0;
-       }
-       return 1;
+   if (log->dont_free_text)
+      return 0;
+   size = slang_string_length(msg) + 2;
+   if (prefix != NULL)
+      size += slang_string_length(prefix) + 2;
+   if (log->text != NULL) {
+      GLuint old_len = slang_string_length(log->text);
+      log->text = (char *)
+        slang_alloc_realloc(log->text, old_len + 1, old_len + size);
+   }
+   else {
+      log->text = (char *) (slang_alloc_malloc(size));
+      if (log->text != NULL)
+         log->text[0] = '\0';
+   }
+   if (log->text == NULL)
+      return 0;
+   if (prefix != NULL) {
+      slang_string_concat(log->text, prefix);
+      slang_string_concat(log->text, ": ");
+   }
+   slang_string_concat(log->text, msg);
+   slang_string_concat(log->text, "\n");
+   return 1;
 }
 
-slang_variable *_slang_locate_variable (slang_variable_scope *scope, const char *name, int all)
+int
+slang_info_log_print(slang_info_log * log, const char *msg, ...)
 {
-       unsigned int i;
-       for (i = 0; i < scope->num_variables; i++)
-               if (slang_string_compare (name, scope->variables[i].name) == 0)
-                       return scope->variables + i;
-       if (all && scope->outer_scope != NULL)
-               return _slang_locate_variable (scope->outer_scope, name, 1);
-       return NULL;
-}
+   va_list va;
+   char buf[1024];
 
-/* slang_struct_scope */
-
-static void slang_struct_scope_construct (slang_struct_scope *scope)
-{
-       scope->structs = NULL;
-       scope->num_structs = 0;
-       scope->outer_scope = NULL;
+   va_start(va, msg);
+   _mesa_vsprintf(buf, msg, va);
+   va_end(va);
+   return slang_info_log_message(log, NULL, buf);
 }
 
-static void slang_struct_scope_destruct (slang_struct_scope *scope)
+int
+slang_info_log_error(slang_info_log * log, const char *msg, ...)
 {
-       unsigned int i;
-       for (i = 0; i < scope->num_structs; i++)
-               slang_struct_destruct (scope->structs + i);
-       slang_alloc_free (scope->structs);
-}
+   va_list va;
+   char buf[1024];
 
-static int slang_struct_scope_copy (slang_struct_scope *x, const slang_struct_scope *y)
-{
-       unsigned int i;
-       slang_struct_scope_destruct (x);
-       slang_struct_scope_construct (x);
-       x->structs = (slang_struct *) slang_alloc_malloc (y->num_structs * sizeof (slang_struct));
-       if (x->structs == NULL)
-               return 0;
-       x->num_structs = y->num_structs;
-       for (i = 0; i < x->num_structs; i++)
-       {
-               unsigned int j;
-               if (!slang_struct_construct_a (x->structs + i))
-               {
-                       for (j = 0; j < i; j++)
-                               slang_struct_destruct (x->structs + j);
-                       slang_alloc_free (x->structs);
-                       x->structs = NULL;
-                       return 0;
-               }
-       }
-       for (i = 0; i < x->num_structs; i++)
-               if (!slang_struct_copy (x->structs + i, y->structs + i))
-                       return 0;
-       x->outer_scope = y->outer_scope;
-       return 1;
+   va_start(va, msg);
+   _mesa_vsprintf(buf, msg, va);
+   va_end(va);
+   if (slang_info_log_message(log, "Error", buf))
+      return 1;
+   slang_info_log_memory(log);
+   return 0;
 }
 
-slang_struct *slang_struct_scope_find (slang_struct_scope *stru, const char *name, int all_scopes)
+int
+slang_info_log_warning(slang_info_log * log, const char *msg, ...)
 {
-       unsigned int i;
-       for (i = 0; i < stru->num_structs; i++)
-               if (slang_string_compare (name, stru->structs[i].name) == 0)
-                       return stru->structs + i;
-       if (all_scopes && stru->outer_scope != NULL)
-               return slang_struct_scope_find (stru->outer_scope, name, 1);
-       return NULL;
-}
+   va_list va;
+   char buf[1024];
 
-/* slang_struct */
-
-int slang_struct_construct_a (slang_struct *stru)
-{
-       stru->name = NULL;
-       stru->fields = (slang_variable_scope *) slang_alloc_malloc (sizeof (slang_variable_scope));
-       if (stru->fields == NULL)
-               return 0;
-       slang_variable_scope_construct (stru->fields);
-       stru->structs = (slang_struct_scope *) slang_alloc_malloc (sizeof (slang_struct_scope));
-       if (stru->structs == NULL)
-       {
-               slang_variable_scope_destruct (stru->fields);
-               slang_alloc_free (stru->fields);
-               return 0;
-       }
-       slang_struct_scope_construct (stru->structs);
-       return 1;
+   va_start(va, msg);
+   _mesa_vsprintf(buf, msg, va);
+   va_end(va);
+   if (slang_info_log_message(log, "Warning", buf))
+      return 1;
+   slang_info_log_memory(log);
+   return 0;
 }
 
-static void slang_struct_destruct (slang_struct *stru)
+void
+slang_info_log_memory(slang_info_log * log)
 {
-       slang_alloc_free (stru->name);
-       slang_variable_scope_destruct (stru->fields);
-       slang_alloc_free (stru->fields);
-       slang_struct_scope_destruct (stru->structs);
-       slang_alloc_free (stru->structs);
+   if (!slang_info_log_message(log, "Error", "Out of memory.")) {
+      log->dont_free_text = 1;
+      log->text = out_of_memory;
+   }
+   abort();
 }
 
-int slang_struct_copy (slang_struct *x, const slang_struct *y)
-{
-       slang_alloc_free (x->name);
-       x->name = NULL;
-       slang_variable_scope_destruct (x->fields);
-       slang_variable_scope_construct (x->fields);
-       slang_struct_scope_destruct (x->structs);
-       slang_struct_scope_construct (x->structs);
-       if (y->name != NULL)
-       {
-               x->name = slang_string_duplicate (y->name);
-               if (x->name == NULL)
-                       return 0;
-       }
-       if (!slang_variable_scope_copy (x->fields, y->fields))
-               return 0;
-       if (!slang_struct_scope_copy (x->structs, y->structs))
-               return 0;
-       return 1;
-}
-
-static int slang_struct_equal (const slang_struct *x, const slang_struct *y)
-{
-       unsigned int i;
-       if (x->fields->num_variables != y->fields->num_variables)
-               return 0;
-       for (i = 0; i < x->fields->num_variables; i++)
-       {
-               slang_variable *varx = x->fields->variables + i;
-               slang_variable *vary = y->fields->variables + i;
-               if (slang_string_compare (varx->name, vary->name) != 0)
-                       return 0;
-               if (!slang_type_specifier_equal (&varx->type.specifier, &vary->type.specifier))
-                       return 0;
-               if (varx->type.specifier.type == slang_spec_array)
-               {
-                       /* TODO compare array sizes */
-               }
-       }
-       return 1;
-}
-
-/* slang_function */
-/* XXX mem! */
-static void slang_function_construct (slang_function *func)
-{
-       func->kind = slang_func_ordinary;
-       slang_variable_construct (&func->header);
-       func->parameters = (slang_variable_scope *) slang_alloc_malloc (sizeof (slang_variable_scope));
-       slang_variable_scope_construct (func->parameters);
-       func->body = NULL;
-       func->address = ~0;
-}
+/* slang_parse_ctx */
 
-static void slang_function_destruct (slang_function *func)
+typedef struct slang_parse_ctx_
 {
-       slang_variable_destruct (&func->header);
-       slang_variable_scope_destruct (func->parameters);
-       slang_alloc_free (func->parameters);
-       if (func->body != NULL)
-       {
-               slang_operation_destruct (func->body);
-               slang_alloc_free (func->body);
-       }
-}
+   const byte *I;
+   slang_info_log *L;
+   int parsing_builtin;
+   GLboolean global_scope;   /**< Is object being declared a global? */
+   slang_atom_pool *atoms;
+   slang_unit_type type;     /**< Vertex vs. Fragment */
+} slang_parse_ctx;
 
-/* slang_function_scope */
+/* slang_output_ctx */
 
-static void slang_function_scope_construct (slang_function_scope *scope)
+typedef struct slang_output_ctx_
 {
-       scope->functions = NULL;
-       scope->num_functions = 0;
-       scope->outer_scope = NULL;
-}
+   slang_variable_scope *vars;
+   slang_function_scope *funs;
+   slang_struct_scope *structs;
+   slang_assembly_file *assembly;
+   slang_var_pool *global_pool;
+   slang_machine *machine;
+   struct gl_program *program;
+   slang_var_table *vartable;
+} slang_output_ctx;
 
-static void slang_function_scope_destruct (slang_function_scope *scope)
-{
-       unsigned int i;
-       for (i = 0; i < scope->num_functions; i++)
-               slang_function_destruct (scope->functions + i);
-       slang_alloc_free (scope->functions);
-}
+/* _slang_compile() */
 
-static int slang_function_scope_find_by_name (slang_function_scope *funcs, const char *name,
-       int all_scopes)
+static void
+parse_identifier_str(slang_parse_ctx * C, char **id)
 {
-       unsigned int i;
-       for (i = 0; i < funcs->num_functions; i++)
-               if (slang_string_compare (name, funcs->functions[i].header.name) == 0)
-                       return 1;
-       if (all_scopes && funcs->outer_scope != NULL)
-               return slang_function_scope_find_by_name (funcs->outer_scope, name, 1);
-       return 0;
+   *id = (char *) C->I;
+   C->I += _mesa_strlen(*id) + 1;
 }
 
-static slang_function *slang_function_scope_find (slang_function_scope *funcs, slang_function *fun,
-       int all_scopes)
+static slang_atom
+parse_identifier(slang_parse_ctx * C)
 {
-       unsigned int i;
-       for (i = 0; i < funcs->num_functions; i++)
-       {
-               slang_function *f = funcs->functions + i;
-               unsigned int j;
-               if (slang_string_compare (fun->header.name, f->header.name) != 0)
-                       continue;
-               if (fun->param_count != f->param_count)
-                       continue;
-               for (j = 0; j < fun->param_count; j++)
-               {
-                       if (!slang_type_specifier_equal (&fun->parameters->variables[j].type.specifier,
-                               &f->parameters->variables[j].type.specifier))
-                       {
-                               break;
-                       }
-               }
-               if (j == fun->param_count)
-                       return f;
-       }
-       if (all_scopes && funcs->outer_scope != NULL)
-               return slang_function_scope_find (funcs->outer_scope, fun, 1);
-       return NULL;
-}
-
-/* slang_translation_unit */
+   const char *id;
 
-void slang_translation_unit_construct (slang_translation_unit *unit)
-{
-       slang_variable_scope_construct (&unit->globals);
-       slang_function_scope_construct (&unit->functions);
-       slang_struct_scope_construct (&unit->structs);
+   id = (const char *) C->I;
+   C->I += _mesa_strlen(id) + 1;
+   return slang_atom_pool_atom(C->atoms, id);
 }
 
-void slang_translation_unit_destruct (slang_translation_unit *unit)
+static int
+parse_number(slang_parse_ctx * C, int *number)
 {
-       slang_variable_scope_destruct (&unit->globals);
-       slang_function_scope_destruct (&unit->functions);
-       slang_struct_scope_destruct (&unit->structs);
+   const int radix = (int) (*C->I++);
+   *number = 0;
+   while (*C->I != '\0') {
+      int digit;
+      if (*C->I >= '0' && *C->I <= '9')
+         digit = (int) (*C->I - '0');
+      else if (*C->I >= 'A' && *C->I <= 'Z')
+         digit = (int) (*C->I - 'A') + 10;
+      else
+         digit = (int) (*C->I - 'a') + 10;
+      *number = *number * radix + digit;
+      C->I++;
+   }
+   C->I++;
+   if (*number > 65535)
+      slang_info_log_warning(C->L, "%d: literal integer overflow.", *number);
+   return 1;
 }
 
-/* slang_info_log */
-
-static char *out_of_memory = "error: out of memory\n";
-
-void slang_info_log_construct (slang_info_log *log)
+static int
+parse_float(slang_parse_ctx * C, float *number)
 {
-       log->text = NULL;
-       log->dont_free_text = 0;
-}
+   char *integral = NULL;
+   char *fractional = NULL;
+   char *exponent = NULL;
+   char *whole = NULL;
 
-void slang_info_log_destruct (slang_info_log *log)
-{
-       if (!log->dont_free_text)
-               slang_alloc_free (log->text);
-}
+   parse_identifier_str(C, &integral);
+   parse_identifier_str(C, &fractional);
+   parse_identifier_str(C, &exponent);
 
-static int slang_info_log_message (slang_info_log *log, const char *prefix, const char *msg)
-{
-       unsigned int new_size;
-       if (log->dont_free_text)
-               return 0;
-       new_size = slang_string_length (prefix) + 3 + slang_string_length (msg);
-       if (log->text != NULL)
-       {
-               log->text = (char *) slang_alloc_realloc (log->text, slang_string_length (log->text) + 1,
-                       new_size + slang_string_length (log->text) + 1);
-       }
-       else
-       {
-               log->text = (char *) slang_alloc_malloc (new_size + 1);
-               if (log->text != NULL)
-                       *log->text = '\0';
-       }
-       if (log->text == NULL)
-               return 0;
-       slang_string_concat (log->text, prefix);
-       slang_string_concat (log->text, ": ");
-       slang_string_concat (log->text, msg);
-       slang_string_concat (log->text, "\n");
-       return 1;
-}
+   whole = (char *) (slang_alloc_malloc((_mesa_strlen(integral) +
+                                         _mesa_strlen(fractional) +
+                                         _mesa_strlen(exponent) + 3) * sizeof(char)));
+   if (whole == NULL) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
 
-int slang_info_log_error (slang_info_log *log, const char *msg, ...)
-{
-       va_list va;
-       char buf[1024];
-
-       va_start (va, msg);
-       vsprintf (buf, msg, va);
-       if (slang_info_log_message (log, "error", buf))
-               return 1;
-       slang_info_log_memory (log);
-       va_end (va);
-       return 0;
-}
+   slang_string_copy(whole, integral);
+   slang_string_concat(whole, ".");
+   slang_string_concat(whole, fractional);
+   slang_string_concat(whole, "E");
+   slang_string_concat(whole, exponent);
 
-int slang_info_log_warning (slang_info_log *log, const char *msg, ...)
-{
-       va_list va;
-       char buf[1024];
-
-       va_start (va, msg);
-       vsprintf (buf, msg, va);
-       if (slang_info_log_message (log, "warning", buf))
-               return 1;
-       slang_info_log_memory (log);
-       va_end (va);
-       return 0;
-}
+   *number = (float) (_mesa_strtod(whole, (char **) NULL));
 
-void slang_info_log_memory (slang_info_log *log)
-{
-       if (!slang_info_log_message (log, "error", "out of memory"))
-       {
-               log->dont_free_text = 1;
-               log->text = out_of_memory;
-       }
+   slang_alloc_free(whole);
+   return 1;
 }
 
-/* slang_parse_ctx */
-
-typedef struct slang_parse_ctx_
-{
-       const byte *I;
-       slang_info_log *L;
-       int parsing_builtin;
-} slang_parse_ctx;
-
-/* _slang_compile() */
-
-static int parse_identifier (slang_parse_ctx *C, char **id)
-{
-       *id = slang_string_duplicate ((const char *) C->I);
-       if (*id == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       C->I += strlen ((const char *) C->I) + 1;
-       return 1;
-}
-
-static int parse_number (slang_parse_ctx *C, int *number)
-{
-       const int radix = (int) (*C->I++);
-       *number = 0;
-       while (*C->I != '\0')
-       {
-               int digit;
-               if (*C->I >= '0' && *C->I <= '9')
-                       digit = (int) (*C->I - '0');
-               else if (*C->I >= 'A' && *C->I <= 'Z')
-                       digit = (int) (*C->I - 'A') + 10;
-               else
-                       digit = (int) (*C->I - 'a') + 10;
-               *number = *number * radix + digit;
-               C->I++;
-       }
-       C->I++;
-       if (*number > 65535)
-               slang_info_log_warning (C->L, "%d: literal integer overflow", *number);
-       return 1;
-}
-
-static int parse_float (slang_parse_ctx *C, float *number)
-{
-       char *integral = NULL;
-       char *fractional = NULL;
-       char *exponent = NULL;
-       char *whole = NULL;
-
-       if (!parse_identifier (C, &integral))
-               return 0;
-
-       if (!parse_identifier (C, &fractional))
-       {
-               slang_alloc_free (integral);
-               return 0;
-       }
-
-       if (!parse_identifier (C, &exponent))
-       {
-               slang_alloc_free (fractional);
-               slang_alloc_free (integral);
-               return 0;
-       }
-
-       whole = (char *) (slang_alloc_malloc ((strlen (integral) + strlen (fractional) + strlen (
-               exponent) + 3) * sizeof (char)));
-       if (whole == NULL)
-       {
-               slang_alloc_free (exponent);
-               slang_alloc_free (fractional);
-               slang_alloc_free (integral);
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-
-       slang_string_copy (whole, integral);
-       slang_string_concat (whole, ".");
-       slang_string_concat (whole, fractional);
-       slang_string_concat (whole, "E");
-       slang_string_concat (whole, exponent);
-
-       *number = (float) (atof (whole));
-
-       slang_alloc_free (whole);
-       slang_alloc_free (exponent);
-       slang_alloc_free (fractional);
-       slang_alloc_free (integral);
-       return 1;
+/* revision number - increment after each change affecting emitted output */
+#define REVISION 3
+
+static int
+check_revision(slang_parse_ctx * C)
+{
+   if (*C->I != REVISION) {
+      slang_info_log_error(C->L, "Internal compiler error.");
+      return 0;
+   }
+   C->I++;
+   return 1;
+}
+
+static int parse_statement(slang_parse_ctx *, slang_output_ctx *,
+                           slang_operation *);
+static int parse_expression(slang_parse_ctx *, slang_output_ctx *,
+                            slang_operation *);
+static int parse_type_specifier(slang_parse_ctx *, slang_output_ctx *,
+                                slang_type_specifier *);
+
+static GLboolean
+parse_array_len(slang_parse_ctx * C, slang_output_ctx * O, GLuint * len)
+{
+   slang_operation array_size;
+   slang_assembly_name_space space;
+   GLboolean result;
+
+   if (!slang_operation_construct(&array_size))
+      return GL_FALSE;
+   if (!parse_expression(C, O, &array_size)) {
+      slang_operation_destruct(&array_size);
+      return GL_FALSE;
+   }
+
+   space.funcs = O->funs;
+   space.structs = O->structs;
+   space.vars = O->vars;
+   result = _slang_evaluate_int(O->assembly, O->machine, &space,
+                                &array_size, len, C->atoms);
+   slang_operation_destruct(&array_size);
+   return result;
+}
+
+static GLboolean
+calculate_var_size(slang_parse_ctx * C, slang_output_ctx * O,
+                   slang_variable * var)
+{
+   slang_storage_aggregate agg;
+
+   if (!slang_storage_aggregate_construct(&agg))
+      return GL_FALSE;
+   if (!_slang_aggregate_variable(&agg, &var->type.specifier, var->array_len,
+                                  O->funs, O->structs, O->vars, O->machine,
+                                  O->assembly, C->atoms)) {
+      slang_storage_aggregate_destruct(&agg);
+      return GL_FALSE;
+   }
+   var->size = _slang_sizeof_aggregate(&agg);
+   slang_storage_aggregate_destruct(&agg);
+   return GL_TRUE;
+}
+
+static GLboolean
+convert_to_array(slang_parse_ctx * C, slang_variable * var,
+                 const slang_type_specifier * sp)
+{
+   /* sized array - mark it as array, copy the specifier to the array element and
+    * parse the expression */
+   var->type.specifier.type = slang_spec_array;
+   var->type.specifier._array = (slang_type_specifier *)
+      slang_alloc_malloc(sizeof(slang_type_specifier));
+   if (var->type.specifier._array == NULL) {
+      slang_info_log_memory(C->L);
+      return GL_FALSE;
+   }
+   slang_type_specifier_ctr(var->type.specifier._array);
+   return slang_type_specifier_copy(var->type.specifier._array, sp);
 }
 
-/* revision number - increment after each change affecting emitted output */
-#define REVISION 2
+/* structure field */
+#define FIELD_NONE 0
+#define FIELD_NEXT 1
+#define FIELD_ARRAY 2
 
-static int check_revision (slang_parse_ctx *C)
-{
-       if (*C->I != REVISION)
-       {
-               slang_info_log_error (C->L, "internal compiler error");
-               return 0;
-       }
-       C->I++;
-       return 1;
+static GLboolean
+parse_struct_field_var(slang_parse_ctx * C, slang_output_ctx * O,
+                       slang_variable * var, const slang_type_specifier * sp)
+{
+   var->a_name = parse_identifier(C);
+   if (var->a_name == SLANG_ATOM_NULL)
+      return GL_FALSE;
+
+   switch (*C->I++) {
+   case FIELD_NONE:
+      if (!slang_type_specifier_copy(&var->type.specifier, sp))
+         return GL_FALSE;
+      break;
+   case FIELD_ARRAY:
+      if (!convert_to_array(C, var, sp))
+         return GL_FALSE;
+      if (!parse_array_len(C, O, &var->array_len))
+         return GL_FALSE;
+      break;
+   default:
+      return GL_FALSE;
+   }
+
+   return calculate_var_size(C, O, var);
+}
+
+static int
+parse_struct_field(slang_parse_ctx * C, slang_output_ctx * O,
+                   slang_struct * st, slang_type_specifier * sp)
+{
+   slang_output_ctx o = *O;
+
+   o.structs = st->structs;
+   if (!parse_type_specifier(C, &o, sp))
+      return 0;
+
+   do {
+      slang_variable *var = slang_variable_scope_grow(st->fields);
+      if (!var) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      if (!parse_struct_field_var(C, &o, var, sp))
+         return 0;
+   }
+   while (*C->I++ != FIELD_NONE);
+
+   return 1;
+}
+
+static int
+parse_struct(slang_parse_ctx * C, slang_output_ctx * O, slang_struct ** st)
+{
+   slang_atom a_name;
+   const char *name;
+
+   /* parse struct name (if any) and make sure it is unique in current scope */
+   a_name = parse_identifier(C);
+   if (a_name == SLANG_ATOM_NULL)
+      return 0;
+
+   name = slang_atom_pool_id(C->atoms, a_name);
+   if (name[0] != '\0'
+       && slang_struct_scope_find(O->structs, a_name, 0) != NULL) {
+      slang_info_log_error(C->L, "%s: duplicate type name.", name);
+      return 0;
+   }
+
+   /* set-up a new struct */
+   *st = (slang_struct *) slang_alloc_malloc(sizeof(slang_struct));
+   if (*st == NULL) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+   if (!slang_struct_construct(*st)) {
+      slang_alloc_free(*st);
+      *st = NULL;
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+   (**st).a_name = a_name;
+   (**st).structs->outer_scope = O->structs;
+
+   /* parse individual struct fields */
+   do {
+      slang_type_specifier sp;
+
+      slang_type_specifier_ctr(&sp);
+      if (!parse_struct_field(C, O, *st, &sp)) {
+         slang_type_specifier_dtr(&sp);
+         return 0;
+      }
+      slang_type_specifier_dtr(&sp);
+   }
+   while (*C->I++ != FIELD_NONE);
+
+   /* if named struct, copy it to current scope */
+   if (name[0] != '\0') {
+      slang_struct *s;
+
+      O->structs->structs =
+         (slang_struct *) slang_alloc_realloc(O->structs->structs,
+                                              O->structs->num_structs *
+                                              sizeof(slang_struct),
+                                              (O->structs->num_structs +
+                                               1) * sizeof(slang_struct));
+      if (O->structs->structs == NULL) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      s = &O->structs->structs[O->structs->num_structs];
+      if (!slang_struct_construct(s))
+         return 0;
+      O->structs->num_structs++;
+      if (!slang_struct_copy(s, *st))
+         return 0;
+   }
+
+   return 1;
 }
 
-static int parse_statement (slang_parse_ctx *, slang_operation *, slang_variable_scope *,
-       slang_struct_scope *, slang_function_scope *);
-static int parse_expression (slang_parse_ctx *, slang_operation *, slang_variable_scope *,
-       slang_struct_scope *, slang_function_scope *);
 
 /* type qualifier */
 #define TYPE_QUALIFIER_NONE 0
@@ -788,35 +545,35 @@ static int parse_expression (slang_parse_ctx *, slang_operation *, slang_variabl
 #define TYPE_QUALIFIER_FIXEDOUTPUT 5
 #define TYPE_QUALIFIER_FIXEDINPUT 6
 
-static int parse_type_qualifier (slang_parse_ctx *C, slang_type_qualifier *qual)
-{
-       switch (*C->I++)
-       {
-       case TYPE_QUALIFIER_NONE:
-               *qual = slang_qual_none;
-               break;
-       case TYPE_QUALIFIER_CONST:
-               *qual = slang_qual_const;
-               break;
-       case TYPE_QUALIFIER_ATTRIBUTE:
-               *qual = slang_qual_attribute;
-               break;
-       case TYPE_QUALIFIER_VARYING:
-               *qual = slang_qual_varying;
-               break;
-       case TYPE_QUALIFIER_UNIFORM:
-               *qual = slang_qual_uniform;
-               break;
-       case TYPE_QUALIFIER_FIXEDOUTPUT:
-               *qual = slang_qual_fixedoutput;
-               break;
-       case TYPE_QUALIFIER_FIXEDINPUT:
-               *qual = slang_qual_fixedinput;
-               break;
-       default:
-               return 0;
-       }
-       return 1;
+static int
+parse_type_qualifier(slang_parse_ctx * C, slang_type_qualifier * qual)
+{
+   switch (*C->I++) {
+   case TYPE_QUALIFIER_NONE:
+      *qual = slang_qual_none;
+      break;
+   case TYPE_QUALIFIER_CONST:
+      *qual = slang_qual_const;
+      break;
+   case TYPE_QUALIFIER_ATTRIBUTE:
+      *qual = slang_qual_attribute;
+      break;
+   case TYPE_QUALIFIER_VARYING:
+      *qual = slang_qual_varying;
+      break;
+   case TYPE_QUALIFIER_UNIFORM:
+      *qual = slang_qual_uniform;
+      break;
+   case TYPE_QUALIFIER_FIXEDOUTPUT:
+      *qual = slang_qual_fixedoutput;
+      break;
+   case TYPE_QUALIFIER_FIXEDINPUT:
+      *qual = slang_qual_fixedinput;
+      break;
+   default:
+      return 0;
+   }
+   return 1;
 }
 
 /* type specifier */
@@ -845,243 +602,129 @@ static int parse_type_qualifier (slang_parse_ctx *C, slang_type_qualifier *qual)
 #define TYPE_SPECIFIER_STRUCT 22
 #define TYPE_SPECIFIER_TYPENAME 23
 
-/* structure field */
-#define FIELD_NONE 0
-#define FIELD_NEXT 1
-#define FIELD_ARRAY 2
-
-static int parse_type_specifier (slang_parse_ctx *C, slang_type_specifier *spec,
-       slang_struct_scope *structs, slang_variable_scope *scope, slang_function_scope *funcs)
-{
-       switch (*C->I++)
-       {
-       case TYPE_SPECIFIER_VOID:
-               spec->type = slang_spec_void;
-               break;
-       case TYPE_SPECIFIER_BOOL:
-               spec->type = slang_spec_bool;
-               break;
-       case TYPE_SPECIFIER_BVEC2:
-               spec->type = slang_spec_bvec2;
-               break;
-       case TYPE_SPECIFIER_BVEC3:
-               spec->type = slang_spec_bvec3;
-               break;
-       case TYPE_SPECIFIER_BVEC4:
-               spec->type = slang_spec_bvec4;
-               break;
-       case TYPE_SPECIFIER_INT:
-               spec->type = slang_spec_int;
-               break;
-       case TYPE_SPECIFIER_IVEC2:
-               spec->type = slang_spec_ivec2;
-               break;
-       case TYPE_SPECIFIER_IVEC3:
-               spec->type = slang_spec_ivec3;
-               break;
-       case TYPE_SPECIFIER_IVEC4:
-               spec->type = slang_spec_ivec4;
-               break;
-       case TYPE_SPECIFIER_FLOAT:
-               spec->type = slang_spec_float;
-               break;
-       case TYPE_SPECIFIER_VEC2:
-               spec->type = slang_spec_vec2;
-               break;
-       case TYPE_SPECIFIER_VEC3:
-               spec->type = slang_spec_vec3;
-               break;
-       case TYPE_SPECIFIER_VEC4:
-               spec->type = slang_spec_vec4;
-               break;
-       case TYPE_SPECIFIER_MAT2:
-               spec->type = slang_spec_mat2;
-               break;
-       case TYPE_SPECIFIER_MAT3:
-               spec->type = slang_spec_mat3;
-               break;
-       case TYPE_SPECIFIER_MAT4:
-               spec->type = slang_spec_mat4;
-               break;
-       case TYPE_SPECIFIER_SAMPLER1D:
-               spec->type = slang_spec_sampler1D;
-               break;
-       case TYPE_SPECIFIER_SAMPLER2D:
-               spec->type = slang_spec_sampler2D;
-               break;
-       case TYPE_SPECIFIER_SAMPLER3D:
-               spec->type = slang_spec_sampler3D;
-               break;
-       case TYPE_SPECIFIER_SAMPLERCUBE:
-               spec->type = slang_spec_samplerCube;
-               break;
-       case TYPE_SPECIFIER_SAMPLER1DSHADOW:
-               spec->type = slang_spec_sampler1DShadow;
-               break;
-       case TYPE_SPECIFIER_SAMPLER2DSHADOW:
-               spec->type = slang_spec_sampler2DShadow;
-               break;
-       case TYPE_SPECIFIER_STRUCT:
-               spec->type = slang_spec_struct;
-               {
-                       char *name;
-                       if (!parse_identifier (C, &name))
-                               return 0;
-                       if (*name != '\0' && slang_struct_scope_find (structs, name, 0) != NULL)
-                       {
-                               slang_info_log_error (C->L, "%s: duplicate type name", name);
-                               slang_alloc_free (name);
-                               return 0;
-                       }
-                       spec->_struct = (slang_struct *) slang_alloc_malloc (sizeof (slang_struct));
-                       if (spec->_struct == NULL)
-                       {
-                               slang_alloc_free (name);
-                               slang_info_log_memory (C->L);
-                               return 0;
-                       }
-                       if (!slang_struct_construct_a (spec->_struct))
-                       {
-                               slang_alloc_free (spec->_struct);
-                               spec->_struct = NULL;
-                               slang_alloc_free (name);
-                               slang_info_log_memory (C->L);
-                               return 0;
-                       }
-                       spec->_struct->name = name;
-                       spec->_struct->structs->outer_scope = structs;
-               }
-               do
-               {
-                       slang_type_specifier sp;
-                       slang_type_specifier_construct (&sp);
-                       if (!parse_type_specifier (C, &sp, spec->_struct->structs, scope, funcs))
-                       {
-                               slang_type_specifier_destruct (&sp);
-                               return 0;
-                       }
-                       do
-                       {
-                               slang_variable *var;
-                               spec->_struct->fields->variables = (slang_variable *) slang_alloc_realloc (
-                                       spec->_struct->fields->variables,
-                                       spec->_struct->fields->num_variables * sizeof (slang_variable),
-                                       (spec->_struct->fields->num_variables + 1) * sizeof (slang_variable));
-                               if (spec->_struct->fields->variables == NULL)
-                               {
-                                       slang_type_specifier_destruct (&sp);
-                                       slang_info_log_memory (C->L);
-                                       return 0;
-                               }
-                               var = spec->_struct->fields->variables + spec->_struct->fields->num_variables;
-                               spec->_struct->fields->num_variables++;
-                               slang_variable_construct (var);
-                               if (!slang_type_specifier_copy (&var->type.specifier, &sp))
-                               {
-                                       slang_type_specifier_destruct (&sp);
-                                       return 0;
-                               }
-                               if (!parse_identifier (C, &var->name))
-                               {
-                                       slang_type_specifier_destruct (&sp);
-                                       return 0;
-                               }
-                               switch (*C->I++)
-                               {
-                               case FIELD_NONE:
-                                       break;
-                               case FIELD_ARRAY:
-                                       var->array_size = (slang_operation *) slang_alloc_malloc (sizeof (
-                                               slang_operation));
-                                       if (var->array_size == NULL)
-                                       {
-                                               slang_type_specifier_destruct (&sp);
-                                               slang_info_log_memory (C->L);
-                                               return 0;
-                                       }
-                                       if (!slang_operation_construct_a (var->array_size))
-                                       {
-                                               slang_alloc_free (var->array_size);
-                                               var->array_size = NULL;
-                                               slang_type_specifier_destruct (&sp);
-                                               slang_info_log_memory (C->L);
-                                               return 0;
-                                       }
-                                       if (!parse_expression (C, var->array_size, scope, structs, funcs))
-                                       {
-                                               slang_type_specifier_destruct (&sp);
-                                               return 0;
-                                       }
-                                       break;
-                               default:
-                                       return 0;
-                               }
-                       }
-                       while (*C->I++ != FIELD_NONE);
-               }
-               while (*C->I++ != FIELD_NONE);
-               if (*spec->_struct->name != '\0')
-               {
-                       slang_struct *s;
-                       structs->structs = (slang_struct *) slang_alloc_realloc (structs->structs,
-                               structs->num_structs * sizeof (slang_struct),
-                               (structs->num_structs + 1) * sizeof (slang_struct));
-                       if (structs->structs == NULL)
-                       {
-                               slang_info_log_memory (C->L);
-                               return 0;
-                       }
-                       s = structs->structs + structs->num_structs;
-                       if (!slang_struct_construct_a (s))
-                               return 0;
-                       structs->num_structs++;
-                       if (!slang_struct_copy (s, spec->_struct))
-                               return 0;
-               }
-               break;
-       case TYPE_SPECIFIER_TYPENAME:
-               spec->type = slang_spec_struct;
-               {
-                       char *name;
-                       slang_struct *stru;
-                       if (!parse_identifier (C, &name))
-                               return 0;
-                       stru = slang_struct_scope_find (structs, name, 1);
-                       if (stru == NULL)
-                       {
-                               slang_info_log_error (C->L, "%s: undeclared type name", name);
-                               slang_alloc_free (name);
-                               return 0;
-                       }
-                       slang_alloc_free (name);
-                       spec->_struct = (slang_struct *) slang_alloc_malloc (sizeof (slang_struct));
-                       if (spec->_struct == NULL)
-                       {
-                               slang_info_log_memory (C->L);
-                               return 0;
-                       }
-                       if (!slang_struct_construct_a (spec->_struct))
-                       {
-                               slang_alloc_free (spec->_struct);
-                               spec->_struct = NULL;
-                               return 0;
-                       }
-                       if (!slang_struct_copy (spec->_struct, stru))
-                               return 0;
-               }
-               break;
-       default:
-               return 0;
-       }
-       return 1;
-}
-
-static int parse_fully_specified_type (slang_parse_ctx *C, slang_fully_specified_type *type,
-       slang_struct_scope *structs, slang_variable_scope *scope, slang_function_scope *funcs)
-{
-       if (!parse_type_qualifier (C, &type->qualifier))
-               return 0;
-       return parse_type_specifier (C, &type->specifier, structs, scope, funcs);
+static int
+parse_type_specifier(slang_parse_ctx * C, slang_output_ctx * O,
+                     slang_type_specifier * spec)
+{
+   switch (*C->I++) {
+   case TYPE_SPECIFIER_VOID:
+      spec->type = slang_spec_void;
+      break;
+   case TYPE_SPECIFIER_BOOL:
+      spec->type = slang_spec_bool;
+      break;
+   case TYPE_SPECIFIER_BVEC2:
+      spec->type = slang_spec_bvec2;
+      break;
+   case TYPE_SPECIFIER_BVEC3:
+      spec->type = slang_spec_bvec3;
+      break;
+   case TYPE_SPECIFIER_BVEC4:
+      spec->type = slang_spec_bvec4;
+      break;
+   case TYPE_SPECIFIER_INT:
+      spec->type = slang_spec_int;
+      break;
+   case TYPE_SPECIFIER_IVEC2:
+      spec->type = slang_spec_ivec2;
+      break;
+   case TYPE_SPECIFIER_IVEC3:
+      spec->type = slang_spec_ivec3;
+      break;
+   case TYPE_SPECIFIER_IVEC4:
+      spec->type = slang_spec_ivec4;
+      break;
+   case TYPE_SPECIFIER_FLOAT:
+      spec->type = slang_spec_float;
+      break;
+   case TYPE_SPECIFIER_VEC2:
+      spec->type = slang_spec_vec2;
+      break;
+   case TYPE_SPECIFIER_VEC3:
+      spec->type = slang_spec_vec3;
+      break;
+   case TYPE_SPECIFIER_VEC4:
+      spec->type = slang_spec_vec4;
+      break;
+   case TYPE_SPECIFIER_MAT2:
+      spec->type = slang_spec_mat2;
+      break;
+   case TYPE_SPECIFIER_MAT3:
+      spec->type = slang_spec_mat3;
+      break;
+   case TYPE_SPECIFIER_MAT4:
+      spec->type = slang_spec_mat4;
+      break;
+   case TYPE_SPECIFIER_SAMPLER1D:
+      spec->type = slang_spec_sampler1D;
+      break;
+   case TYPE_SPECIFIER_SAMPLER2D:
+      spec->type = slang_spec_sampler2D;
+      break;
+   case TYPE_SPECIFIER_SAMPLER3D:
+      spec->type = slang_spec_sampler3D;
+      break;
+   case TYPE_SPECIFIER_SAMPLERCUBE:
+      spec->type = slang_spec_samplerCube;
+      break;
+   case TYPE_SPECIFIER_SAMPLER1DSHADOW:
+      spec->type = slang_spec_sampler1DShadow;
+      break;
+   case TYPE_SPECIFIER_SAMPLER2DSHADOW:
+      spec->type = slang_spec_sampler2DShadow;
+      break;
+   case TYPE_SPECIFIER_STRUCT:
+      spec->type = slang_spec_struct;
+      if (!parse_struct(C, O, &spec->_struct))
+         return 0;
+      break;
+   case TYPE_SPECIFIER_TYPENAME:
+      spec->type = slang_spec_struct;
+      {
+         slang_atom a_name;
+         slang_struct *stru;
+
+         a_name = parse_identifier(C);
+         if (a_name == NULL)
+            return 0;
+
+         stru = slang_struct_scope_find(O->structs, a_name, 1);
+         if (stru == NULL) {
+            slang_info_log_error(C->L, "undeclared type name '%s'",
+                                 slang_atom_pool_id(C->atoms, a_name));
+            return 0;
+         }
+
+         spec->_struct =
+            (slang_struct *) slang_alloc_malloc(sizeof(slang_struct));
+         if (spec->_struct == NULL) {
+            slang_info_log_memory(C->L);
+            return 0;
+         }
+         if (!slang_struct_construct(spec->_struct)) {
+            slang_alloc_free(spec->_struct);
+            spec->_struct = NULL;
+            return 0;
+         }
+         if (!slang_struct_copy(spec->_struct, stru))
+            return 0;
+      }
+      break;
+   default:
+      return 0;
+   }
+   return 1;
+}
+
+static int
+parse_fully_specified_type(slang_parse_ctx * C, slang_output_ctx * O,
+                           slang_fully_specified_type * type)
+{
+   if (!parse_type_qualifier(C, &type->qualifier))
+      return 0;
+   if (!parse_type_specifier(C, O, &type->specifier))
+      return 0;
+   return 1;
 }
 
 /* operation */
@@ -1148,479 +791,473 @@ static int parse_fully_specified_type (slang_parse_ctx *C, slang_fully_specified
 #define OP_POSTINCREMENT 60
 #define OP_POSTDECREMENT 61
 
-static int parse_child_operation (slang_parse_ctx *C, slang_operation *oper, int statement,
-       slang_variable_scope *scope, slang_struct_scope *structs, slang_function_scope *funcs)
-{
-       oper->children = (slang_operation *) slang_alloc_realloc (oper->children,
-               oper->num_children * sizeof (slang_operation),
-               (oper->num_children + 1) * sizeof (slang_operation));
-       if (oper->children == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       if (!slang_operation_construct_a (oper->children + oper->num_children))
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       oper->num_children++;
-       if (statement)
-               return parse_statement (C, oper->children + oper->num_children - 1, scope, structs, funcs);
-       return parse_expression (C, oper->children + oper->num_children - 1, scope, structs, funcs);
-}
-
-static int parse_declaration (slang_parse_ctx *C, slang_variable_scope *, slang_struct_scope *,
-       slang_function_scope *);
-
-static int parse_statement (slang_parse_ctx *C, slang_operation *oper, slang_variable_scope *scope,
-       slang_struct_scope *structs, slang_function_scope *funcs)
-{
-       oper->locals->outer_scope = scope;
-       switch (*C->I++)
-       {
-       case OP_BLOCK_BEGIN_NO_NEW_SCOPE:
-               oper->type = slang_oper_block_no_new_scope;
-               while (*C->I != OP_END)
-                       if (!parse_child_operation (C, oper, 1, scope, structs, funcs))
-                               return 0;
-               C->I++;
-               break;
-       case OP_BLOCK_BEGIN_NEW_SCOPE:
-               oper->type = slang_oper_block_new_scope;
-               while (*C->I != OP_END)
-                       if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                               return 0;
-               C->I++;
-               break;
-       case OP_DECLARE:
-               oper->type = slang_oper_variable_decl;
-               {
-                       const unsigned int first_var = scope->num_variables;
-                       if (!parse_declaration (C, scope, structs, funcs))
-                               return 0;
-                       if (first_var < scope->num_variables)
-                       {
-                               const unsigned int num_vars = scope->num_variables - first_var;
-                               unsigned int i;
-                               oper->children = (slang_operation *) slang_alloc_malloc (num_vars * sizeof (
-                                       slang_operation));
-                               if (oper->children == NULL)
-                               {
-                                       slang_info_log_memory (C->L);
-                                       return 0;
-                               }
-                               for (i = 0; i < num_vars; i++)
-                                       if (!slang_operation_construct_a (oper->children + i))
-                                       {
-                                               unsigned int j;
-                                               for (j = 0; j < i; j++)
-                                                       slang_operation_destruct (oper->children + j);
-                                               slang_alloc_free (oper->children);
-                                               oper->children = NULL;
-                                               slang_info_log_memory (C->L);
-                                               return 0;
-                                       }
-                               oper->num_children = num_vars;
-                               for (i = first_var; i < scope->num_variables; i++)
-                               {
-                                       slang_operation *o = oper->children + i - first_var;
-                                       o->type = slang_oper_identifier;
-                                       o->locals->outer_scope = scope;
-                                       o->identifier = slang_string_duplicate (scope->variables[i].name);
-                                       if (o->identifier == NULL)
-                                       {
-                                               slang_info_log_memory (C->L);
-                                               return 0;
-                                       }
-                               }
-                       }
-               }
-               break;
-       case OP_ASM:
-               oper->type = slang_oper_asm;
-               if (!parse_identifier (C, &oper->identifier))
-                       return 0;
-               while (*C->I != OP_END)
-                       if (!parse_child_operation (C, oper, 0, scope, structs, funcs))
-                               return 0;
-               C->I++;
-               break;
-       case OP_BREAK:
-               oper->type = slang_oper_break;
-               break;
-       case OP_CONTINUE:
-               oper->type = slang_oper_continue;
-               break;
-       case OP_DISCARD:
-               oper->type = slang_oper_discard;
-               break;
-       case OP_RETURN:
-               oper->type = slang_oper_return;
-               if (!parse_child_operation (C, oper, 0, scope, structs, funcs))
-                       return 0;
-               break;
-       case OP_EXPRESSION:
-               oper->type = slang_oper_expression;
-               if (!parse_child_operation (C, oper, 0, scope, structs, funcs))
-                       return 0;
-               break;
-       case OP_IF:
-               oper->type = slang_oper_if;
-               if (!parse_child_operation (C, oper, 0, scope, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 1, scope, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 1, scope, structs, funcs))
-                       return 0;
-               break;
-       case OP_WHILE:
-               oper->type = slang_oper_while;
-               if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                       return 0;
-               break;
-       case OP_DO:
-               oper->type = slang_oper_do;
-               if (!parse_child_operation (C, oper, 1, scope, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 0, scope, structs, funcs))
-                       return 0;
-               break;
-       case OP_FOR:
-               oper->type = slang_oper_for;
-               if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 0, oper->locals, structs, funcs))
-                       return 0;
-               if (!parse_child_operation (C, oper, 1, oper->locals, structs, funcs))
-                       return 0;
-               break;
-       default:
-               return 0;
-       }
-       return 1;
-}
-
-static int handle_trinary_expression (slang_parse_ctx *C, slang_operation *op,
-       slang_operation **ops, unsigned int *num_ops)
-{
-       op->num_children = 3;
-       op->children = (slang_operation *) slang_alloc_malloc (3 * sizeof (slang_operation));
-       if (op->children == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       op->children[0] = (*ops)[*num_ops - 4];
-       op->children[1] = (*ops)[*num_ops - 3];
-       op->children[2] = (*ops)[*num_ops - 2];
-       (*ops)[*num_ops - 4] = (*ops)[*num_ops - 1];
-       *num_ops -= 3;
-       *ops = (slang_operation *) slang_alloc_realloc (*ops, (*num_ops + 3) * sizeof (slang_operation),
-               *num_ops * sizeof (slang_operation));
-       if (*ops == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       return 1;
-}
-
-static int handle_binary_expression (slang_parse_ctx *C, slang_operation *op,
-       slang_operation **ops, unsigned int *num_ops)
-{
-       op->num_children = 2;
-       op->children = (slang_operation *) slang_alloc_malloc (2 * sizeof (slang_operation));
-       if (op->children == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       op->children[0] = (*ops)[*num_ops - 3];
-       op->children[1] = (*ops)[*num_ops - 2];
-       (*ops)[*num_ops - 3] = (*ops)[*num_ops - 1];
-       *num_ops -= 2;
-       *ops = (slang_operation *) slang_alloc_realloc (*ops, (*num_ops + 2) * sizeof (slang_operation),
-               *num_ops * sizeof (slang_operation));
-       if (*ops == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       return 1;
-}
-
-static int handle_unary_expression (slang_parse_ctx *C, slang_operation *op,
-       slang_operation **ops, unsigned int *num_ops)
-{
-       op->num_children = 1;
-       op->children = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-       if (op->children == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       op->children[0] = (*ops)[*num_ops - 2];
-       (*ops)[*num_ops - 2] = (*ops)[*num_ops - 1];
-       (*num_ops)--;
-       *ops = (slang_operation *) slang_alloc_realloc (*ops, (*num_ops + 1) * sizeof (slang_operation),
-               *num_ops * sizeof (slang_operation));
-       if (*ops == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       return 1;
-}
-
-static int is_constructor_name (const char *name, slang_struct_scope *structs)
-{
-       if (slang_type_specifier_type_from_string (name) != slang_spec_void)
-               return 1;
-       return slang_struct_scope_find (structs, name, 1) != NULL;
-}
 
-static int parse_expression (slang_parse_ctx *C, slang_operation *oper, slang_variable_scope *scope,
-       slang_struct_scope *structs, slang_function_scope *funcs)
-{
-       slang_operation *ops = NULL;
-       unsigned int num_ops = 0;
-       int number;
-
-       while (*C->I != OP_END)
-       {
-               slang_operation *op;
-               const unsigned int op_code = *C->I++;
-               ops = (slang_operation *) slang_alloc_realloc (ops,
-                       num_ops * sizeof (slang_operation), (num_ops + 1) * sizeof (slang_operation));
-               if (ops == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               op = ops + num_ops;
-               if (!slang_operation_construct_a (op))
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               num_ops++;
-               op->locals->outer_scope = scope;
-               switch (op_code)
-               {
-               case OP_PUSH_VOID:
-                       op->type = slang_oper_void;
-                       break;
-               case OP_PUSH_BOOL:
-                       op->type = slang_oper_literal_bool;
-                       if (!parse_number (C, &number))
-                               return 0;
-                       op->literal = (float) number;
-                       break;
-               case OP_PUSH_INT:
-                       op->type = slang_oper_literal_int;
-                       if (!parse_number (C, &number))
-                               return 0;
-                       op->literal = (float) number;
-                       break;
-               case OP_PUSH_FLOAT:
-                       op->type = slang_oper_literal_float;
-                       if (!parse_float (C, &op->literal))
-                               return 0;
-                       break;
-               case OP_PUSH_IDENTIFIER:
-                       op->type = slang_oper_identifier;
-                       if (!parse_identifier (C, &op->identifier))
-                               return 0;
-                       break;
-               case OP_SEQUENCE:
-                       op->type = slang_oper_sequence;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_ASSIGN:
-                       op->type = slang_oper_assign;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_ADDASSIGN:
-                       op->type = slang_oper_addassign;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_SUBASSIGN:
-                       op->type = slang_oper_subassign;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_MULASSIGN:
-                       op->type = slang_oper_mulassign;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_DIVASSIGN:
-                       op->type = slang_oper_divassign;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               /*case OP_MODASSIGN:*/
-               /*case OP_LSHASSIGN:*/
-               /*case OP_RSHASSIGN:*/
-               /*case OP_ORASSIGN:*/
-               /*case OP_XORASSIGN:*/
-               /*case OP_ANDASSIGN:*/
-               case OP_SELECT:
-                       op->type = slang_oper_select;
-                       if (!handle_trinary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_LOGICALOR:
-                       op->type = slang_oper_logicalor;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_LOGICALXOR:
-                       op->type = slang_oper_logicalxor;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_LOGICALAND:
-                       op->type = slang_oper_logicaland;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               /*case OP_BITOR:*/
-               /*case OP_BITXOR:*/
-               /*case OP_BITAND:*/
-               case OP_EQUAL:
-                       op->type = slang_oper_equal;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_NOTEQUAL:
-                       op->type = slang_oper_notequal;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_LESS:
-                       op->type = slang_oper_less;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_GREATER:
-                       op->type = slang_oper_greater;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_LESSEQUAL:
-                       op->type = slang_oper_lessequal;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_GREATEREQUAL:
-                       op->type = slang_oper_greaterequal;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               /*case OP_LSHIFT:*/
-               /*case OP_RSHIFT:*/
-               case OP_ADD:
-                       op->type = slang_oper_add;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_SUBTRACT:
-                       op->type = slang_oper_subtract;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_MULTIPLY:
-                       op->type = slang_oper_multiply;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_DIVIDE:
-                       op->type = slang_oper_divide;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               /*case OP_MODULUS:*/
-               case OP_PREINCREMENT:
-                       op->type = slang_oper_preincrement;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_PREDECREMENT:
-                       op->type = slang_oper_predecrement;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_PLUS:
-                       op->type = slang_oper_plus;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_MINUS:
-                       op->type = slang_oper_minus;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_NOT:
-                       op->type = slang_oper_not;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               /*case OP_COMPLEMENT:*/
-               case OP_SUBSCRIPT:
-                       op->type = slang_oper_subscript;
-                       if (!handle_binary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_CALL:
-                       op->type = slang_oper_call;
-                       if (!parse_identifier (C, &op->identifier))
-                               return 0;
-                       while (*C->I != OP_END)
-                               if (!parse_child_operation (C, op, 0, scope, structs, funcs))
-                                       return 0;
-                       C->I++;
-                       if (!C->parsing_builtin &&
-                               !slang_function_scope_find_by_name (funcs, op->identifier, 1) &&
-                               !is_constructor_name (op->identifier, structs))
-                       {
-                               slang_info_log_error (C->L, "%s: undeclared function name", op->identifier);
-                               return 0;
-                       }
-                       break;
-               case OP_FIELD:
-                       op->type = slang_oper_field;
-                       if (!parse_identifier (C, &op->identifier))
-                               return 0;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_POSTINCREMENT:
-                       op->type = slang_oper_postincrement;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               case OP_POSTDECREMENT:
-                       op->type = slang_oper_postdecrement;
-                       if (!handle_unary_expression (C, op, &ops, &num_ops))
-                               return 0;
-                       break;
-               default:
-                       return 0;
-               }
-       }
-       C->I++;
-       *oper = *ops;
-       slang_alloc_free (ops);
-       return 1;
+/**
+ * When parsing a compound production, this function is used to parse the
+ * children.
+ * For example, a a while-loop compound will have two children, the
+ * while condition expression and the loop body.  So, this function will
+ * be called twice to parse those two sub-expressions.
+ * \param C  the parsing context
+ * \param O  the output context
+ * \param oper  the operation we're parsing
+ * \param statement  indicates whether parsing a statement, or expression
+ * \return 1 if success, 0 if error
+ */
+static int
+parse_child_operation(slang_parse_ctx * C, slang_output_ctx * O,
+                      slang_operation * oper, GLboolean statement)
+{
+   slang_operation *ch;
+
+   /* grow child array */
+   ch = slang_operation_grow(&oper->num_children, &oper->children);
+   if (statement)
+      return parse_statement(C, O, ch);
+   return parse_expression(C, O, ch);
+}
+
+static int parse_declaration(slang_parse_ctx * C, slang_output_ctx * O);
+
+static int
+parse_statement(slang_parse_ctx * C, slang_output_ctx * O,
+                slang_operation * oper)
+{
+   oper->locals->outer_scope = O->vars;
+   switch (*C->I++) {
+   case OP_BLOCK_BEGIN_NO_NEW_SCOPE:
+      /* parse child statements, do not create new variable scope */
+      oper->type = slang_oper_block_no_new_scope;
+      while (*C->I != OP_END)
+         if (!parse_child_operation(C, O, oper, 1))
+            return 0;
+      C->I++;
+      break;
+   case OP_BLOCK_BEGIN_NEW_SCOPE:
+      /* parse child statements, create new variable scope */
+      {
+         slang_output_ctx o = *O;
+
+         oper->type = slang_oper_block_new_scope;
+         o.vars = oper->locals;
+         while (*C->I != OP_END)
+            if (!parse_child_operation(C, &o, oper, 1))
+               return 0;
+         C->I++;
+      }
+      break;
+   case OP_DECLARE:
+      /* local variable declaration, individual declarators are stored as
+       * children identifiers
+       */
+      oper->type = slang_oper_block_no_new_scope;
+      {
+         const unsigned int first_var = O->vars->num_variables;
+
+         /* parse the declaration, note that there can be zero or more
+          * than one declarators
+          */
+         if (!parse_declaration(C, O))
+            return 0;
+         if (first_var < O->vars->num_variables) {
+            const unsigned int num_vars = O->vars->num_variables - first_var;
+            unsigned int i;
+
+            oper->num_children = num_vars;
+            oper->children = slang_operation_new(num_vars);
+            if (oper->children == NULL) {
+               slang_info_log_memory(C->L);
+               return 0;
+            }
+            for (i = first_var; i < O->vars->num_variables; i++) {
+               slang_operation *o = &oper->children[i - first_var];
+               o->type = slang_oper_variable_decl;
+               o->locals->outer_scope = O->vars;
+               o->a_id = O->vars->variables[i]->a_name;
+            }
+         }
+      }
+      break;
+   case OP_ASM:
+      /* the __asm statement, parse the mnemonic and all its arguments
+       * as expressions
+       */
+      oper->type = slang_oper_asm;
+      oper->a_id = parse_identifier(C);
+      if (oper->a_id == SLANG_ATOM_NULL)
+         return 0;
+      while (*C->I != OP_END) {
+         if (!parse_child_operation(C, O, oper, 0))
+            return 0;
+      }
+      C->I++;
+      break;
+   case OP_BREAK:
+      oper->type = slang_oper_break;
+      break;
+   case OP_CONTINUE:
+      oper->type = slang_oper_continue;
+      break;
+   case OP_DISCARD:
+      oper->type = slang_oper_discard;
+      break;
+   case OP_RETURN:
+      oper->type = slang_oper_return;
+      if (!parse_child_operation(C, O, oper, 0))
+         return 0;
+      break;
+   case OP_EXPRESSION:
+      oper->type = slang_oper_expression;
+      if (!parse_child_operation(C, O, oper, 0))
+         return 0;
+      break;
+   case OP_IF:
+      oper->type = slang_oper_if;
+      if (!parse_child_operation(C, O, oper, 0))
+         return 0;
+      if (!parse_child_operation(C, O, oper, 1))
+         return 0;
+      if (!parse_child_operation(C, O, oper, 1))
+         return 0;
+      break;
+   case OP_WHILE:
+      {
+         slang_output_ctx o = *O;
+
+         oper->type = slang_oper_while;
+         o.vars = oper->locals;
+         if (!parse_child_operation(C, &o, oper, 1))
+            return 0;
+         if (!parse_child_operation(C, &o, oper, 1))
+            return 0;
+      }
+      break;
+   case OP_DO:
+      oper->type = slang_oper_do;
+      if (!parse_child_operation(C, O, oper, 1))
+         return 0;
+      if (!parse_child_operation(C, O, oper, 0))
+         return 0;
+      break;
+   case OP_FOR:
+      {
+         slang_output_ctx o = *O;
+
+         oper->type = slang_oper_for;
+         o.vars = oper->locals;
+         if (!parse_child_operation(C, &o, oper, 1))
+            return 0;
+         if (!parse_child_operation(C, &o, oper, 1))
+            return 0;
+         if (!parse_child_operation(C, &o, oper, 0))
+            return 0;
+         if (!parse_child_operation(C, &o, oper, 1))
+            return 0;
+      }
+      break;
+   default:
+      return 0;
+   }
+   return 1;
+}
+
+static int
+handle_nary_expression(slang_parse_ctx * C, slang_operation * op,
+                       slang_operation ** ops, unsigned int *total_ops,
+                       unsigned int n)
+{
+   unsigned int i;
+
+   op->children =
+      (slang_operation *) slang_alloc_malloc(n * sizeof(slang_operation));
+   if (op->children == NULL) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+   op->num_children = n;
+
+   for (i = 0; i < n; i++)
+      op->children[i] = (*ops)[*total_ops - (n + 1 - i)];
+   (*ops)[*total_ops - (n + 1)] = (*ops)[*total_ops - 1];
+   *total_ops -= n;
+
+   *ops = (slang_operation *)
+      slang_alloc_realloc(*ops,
+                          (*total_ops + n) * sizeof(slang_operation),
+                          *total_ops * sizeof(slang_operation));
+   if (*ops == NULL) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+   return 1;
+}
+
+static int
+is_constructor_name(const char *name, slang_atom a_name,
+                    slang_struct_scope * structs)
+{
+   if (slang_type_specifier_type_from_string(name) != slang_spec_void)
+      return 1;
+   return slang_struct_scope_find(structs, a_name, 1) != NULL;
+}
+
+static int
+parse_expression(slang_parse_ctx * C, slang_output_ctx * O,
+                 slang_operation * oper)
+{
+   slang_operation *ops = NULL;
+   unsigned int num_ops = 0;
+   int number;
+
+   while (*C->I != OP_END) {
+      slang_operation *op;
+      const unsigned int op_code = *C->I++;
+
+      /* allocate default operation, becomes a no-op if not used  */
+      ops = (slang_operation *)
+         slang_alloc_realloc(ops,
+                             num_ops * sizeof(slang_operation),
+                             (num_ops + 1) * sizeof(slang_operation));
+      if (ops == NULL) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      op = &ops[num_ops];
+      if (!slang_operation_construct(op)) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      num_ops++;
+      op->locals->outer_scope = O->vars;
+
+      switch (op_code) {
+      case OP_PUSH_VOID:
+         op->type = slang_oper_void;
+         break;
+      case OP_PUSH_BOOL:
+         op->type = slang_oper_literal_bool;
+         if (!parse_number(C, &number))
+            return 0;
+         op->literal[0] =
+         op->literal[1] =
+         op->literal[2] =
+         op->literal[3] = (GLfloat) number;
+         break;
+      case OP_PUSH_INT:
+         op->type = slang_oper_literal_int;
+         if (!parse_number(C, &number))
+            return 0;
+         op->literal[0] =
+         op->literal[1] =
+         op->literal[2] =
+         op->literal[3] = (GLfloat) number;
+         break;
+      case OP_PUSH_FLOAT:
+         op->type = slang_oper_literal_float;
+         if (!parse_float(C, &op->literal[0]))
+            return 0;
+         op->literal[1] =
+         op->literal[2] =
+         op->literal[3] = op->literal[0];
+         break;
+      case OP_PUSH_IDENTIFIER:
+         op->type = slang_oper_identifier;
+         op->a_id = parse_identifier(C);
+         if (op->a_id == SLANG_ATOM_NULL)
+            return 0;
+         break;
+      case OP_SEQUENCE:
+         op->type = slang_oper_sequence;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_ASSIGN:
+         op->type = slang_oper_assign;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_ADDASSIGN:
+         op->type = slang_oper_addassign;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_SUBASSIGN:
+         op->type = slang_oper_subassign;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_MULASSIGN:
+         op->type = slang_oper_mulassign;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_DIVASSIGN:
+         op->type = slang_oper_divassign;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+         /*case OP_MODASSIGN: */
+         /*case OP_LSHASSIGN: */
+         /*case OP_RSHASSIGN: */
+         /*case OP_ORASSIGN: */
+         /*case OP_XORASSIGN: */
+         /*case OP_ANDASSIGN: */
+      case OP_SELECT:
+         op->type = slang_oper_select;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 3))
+            return 0;
+         break;
+      case OP_LOGICALOR:
+         op->type = slang_oper_logicalor;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_LOGICALXOR:
+         op->type = slang_oper_logicalxor;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_LOGICALAND:
+         op->type = slang_oper_logicaland;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+         /*case OP_BITOR: */
+         /*case OP_BITXOR: */
+         /*case OP_BITAND: */
+      case OP_EQUAL:
+         op->type = slang_oper_equal;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_NOTEQUAL:
+         op->type = slang_oper_notequal;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_LESS:
+         op->type = slang_oper_less;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_GREATER:
+         op->type = slang_oper_greater;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_LESSEQUAL:
+         op->type = slang_oper_lessequal;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_GREATEREQUAL:
+         op->type = slang_oper_greaterequal;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+         /*case OP_LSHIFT: */
+         /*case OP_RSHIFT: */
+      case OP_ADD:
+         op->type = slang_oper_add;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_SUBTRACT:
+         op->type = slang_oper_subtract;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_MULTIPLY:
+         op->type = slang_oper_multiply;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_DIVIDE:
+         op->type = slang_oper_divide;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+         /*case OP_MODULUS: */
+      case OP_PREINCREMENT:
+         op->type = slang_oper_preincrement;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_PREDECREMENT:
+         op->type = slang_oper_predecrement;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_PLUS:
+         op->type = slang_oper_plus;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_MINUS:
+         op->type = slang_oper_minus;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_NOT:
+         op->type = slang_oper_not;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+         /*case OP_COMPLEMENT: */
+      case OP_SUBSCRIPT:
+         op->type = slang_oper_subscript;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
+            return 0;
+         break;
+      case OP_CALL:
+         op->type = slang_oper_call;
+         op->a_id = parse_identifier(C);
+         if (op->a_id == SLANG_ATOM_NULL)
+            return 0;
+         while (*C->I != OP_END)
+            if (!parse_child_operation(C, O, op, 0))
+               return 0;
+         C->I++;
+
+         if (!C->parsing_builtin
+             && !slang_function_scope_find_by_name(O->funs, op->a_id, 1)) {
+            const char *id;
+
+            id = slang_atom_pool_id(C->atoms, op->a_id);
+            if (!is_constructor_name(id, op->a_id, O->structs)) {
+               slang_info_log_error(C->L, "%s: undeclared function name.", id);
+               return 0;
+            }
+         }
+         break;
+      case OP_FIELD:
+         op->type = slang_oper_field;
+         op->a_id = parse_identifier(C);
+         if (op->a_id == SLANG_ATOM_NULL)
+            return 0;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_POSTINCREMENT:
+         op->type = slang_oper_postincrement;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      case OP_POSTDECREMENT:
+         op->type = slang_oper_postdecrement;
+         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
+            return 0;
+         break;
+      default:
+         return 0;
+      }
+   }
+   C->I++;
+
+   *oper = *ops;
+   slang_alloc_free(ops);
+
+   return 1;
 }
 
 /* parameter qualifier */
@@ -1632,73 +1269,76 @@ static int parse_expression (slang_parse_ctx *C, slang_operation *oper, slang_va
 #define PARAMETER_ARRAY_NOT_PRESENT 0
 #define PARAMETER_ARRAY_PRESENT 1
 
-static int parse_parameter_declaration (slang_parse_ctx *C, slang_variable *param,
-       slang_struct_scope *structs, slang_variable_scope *scope, slang_function_scope *funcs)
-{
-       slang_storage_aggregate agg;
-       if (!parse_type_qualifier (C, &param->type.qualifier))
-               return 0;
-       switch (*C->I++)
-       {
-       case PARAM_QUALIFIER_IN:
-               if (param->type.qualifier != slang_qual_const && param->type.qualifier != slang_qual_none)
-               {
-                       slang_info_log_error (C->L, "invalid type qualifier");
-                       return 0;
-               }
-               break;
-       case PARAM_QUALIFIER_OUT:
-               if (param->type.qualifier == slang_qual_none)
-                       param->type.qualifier = slang_qual_out;
-               else
-               {
-                       slang_info_log_error (C->L, "invalid type qualifier");
-                       return 0;
-               }
-               break;
-       case PARAM_QUALIFIER_INOUT:
-               if (param->type.qualifier == slang_qual_none)
-                       param->type.qualifier = slang_qual_inout;
-               else
-               {
-                       slang_info_log_error (C->L, "invalid type qualifier");
-                       return 0;
-               }
-               break;
-       default:
-               return 0;
-       }
-       if (!parse_type_specifier (C, &param->type.specifier, structs, scope, funcs))
-               return 0;
-       if (!parse_identifier (C, &param->name))
-               return 0;
-       if (*C->I++ == PARAMETER_ARRAY_PRESENT)
-       {
-               param->array_size = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-               if (param->array_size == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!slang_operation_construct_a (param->array_size))
-               {
-                       slang_alloc_free (param->array_size);
-                       param->array_size = NULL;
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!parse_expression (C, param->array_size, scope, structs, funcs))
-                       return 0;
-       }
-       slang_storage_aggregate_construct (&agg);
-       if (!_slang_aggregate_variable (&agg, &param->type.specifier, param->array_size, funcs,
-               structs))
-       {
-               slang_storage_aggregate_destruct (&agg);
-               return 0;
-       }
-       slang_storage_aggregate_destruct (&agg);
-       return 1;
+static int
+parse_parameter_declaration(slang_parse_ctx * C, slang_output_ctx * O,
+                            slang_variable * param)
+{
+   /* parse and validate the parameter's type qualifiers (there can be
+    * two at most) because not all combinations are valid
+    */
+   if (!parse_type_qualifier(C, &param->type.qualifier))
+      return 0;
+   switch (*C->I++) {
+   case PARAM_QUALIFIER_IN:
+      if (param->type.qualifier != slang_qual_const
+          && param->type.qualifier != slang_qual_none) {
+         slang_info_log_error(C->L, "Invalid type qualifier.");
+         return 0;
+      }
+      break;
+   case PARAM_QUALIFIER_OUT:
+      if (param->type.qualifier == slang_qual_none)
+         param->type.qualifier = slang_qual_out;
+      else {
+         slang_info_log_error(C->L, "Invalid type qualifier.");
+         return 0;
+      }
+      break;
+   case PARAM_QUALIFIER_INOUT:
+      if (param->type.qualifier == slang_qual_none)
+         param->type.qualifier = slang_qual_inout;
+      else {
+         slang_info_log_error(C->L, "Invalid type qualifier.");
+         return 0;
+      }
+      break;
+   default:
+      return 0;
+   }
+
+   /* parse parameter's type specifier and name */
+   if (!parse_type_specifier(C, O, &param->type.specifier))
+      return 0;
+   param->a_name = parse_identifier(C);
+   if (param->a_name == SLANG_ATOM_NULL)
+      return 0;
+
+   /* if the parameter is an array, parse its size (the size must be
+    * explicitly defined
+    */
+   if (*C->I++ == PARAMETER_ARRAY_PRESENT) {
+      slang_type_specifier p;
+
+      slang_type_specifier_ctr(&p);
+      if (!slang_type_specifier_copy(&p, &param->type.specifier)) {
+         slang_type_specifier_dtr(&p);
+         return GL_FALSE;
+      }
+      if (!convert_to_array(C, param, &p)) {
+         slang_type_specifier_dtr(&p);
+         return GL_FALSE;
+      }
+      slang_type_specifier_dtr(&p);
+      if (!parse_array_len(C, O, &param->array_len))
+         return GL_FALSE;
+   }
+
+   /* calculate the parameter size */
+   if (!calculate_var_size(C, O, param))
+      return GL_FALSE;
+
+   /* TODO: allocate the local address here? */
+   return 1;
 }
 
 /* function type */
@@ -1711,170 +1351,304 @@ static int parse_parameter_declaration (slang_parse_ctx *C, slang_variable *para
 #define PARAMETER_NEXT 1
 
 /* operator type */
-#define OPERATOR_ASSIGN 1
-#define OPERATOR_ADDASSIGN 2
-#define OPERATOR_SUBASSIGN 3
-#define OPERATOR_MULASSIGN 4
-#define OPERATOR_DIVASSIGN 5
-/*#define OPERATOR_MODASSIGN 6*/
-/*#define OPERATOR_LSHASSIGN 7*/
-/*#define OPERATOR_RSHASSIGN 8*/
-/*#define OPERATOR_ANDASSIGN 9*/
-/*#define OPERATOR_XORASSIGN 10*/
-/*#define OPERATOR_ORASSIGN 11*/
-#define OPERATOR_LOGICALXOR 12
-/*#define OPERATOR_BITOR 13*/
-/*#define OPERATOR_BITXOR 14*/
-/*#define OPERATOR_BITAND 15*/
-#define OPERATOR_EQUAL 16
-#define OPERATOR_NOTEQUAL 17
-#define OPERATOR_LESS 18
-#define OPERATOR_GREATER 19
-#define OPERATOR_LESSEQUAL 20
-#define OPERATOR_GREATEREQUAL 21
-/*#define OPERATOR_LSHIFT 22*/
-/*#define OPERATOR_RSHIFT 23*/
-#define OPERATOR_MULTIPLY 24
-#define OPERATOR_DIVIDE 25
-/*#define OPERATOR_MODULUS 26*/
-#define OPERATOR_INCREMENT 27
-#define OPERATOR_DECREMENT 28
-#define OPERATOR_PLUS 29
-#define OPERATOR_MINUS 30
-/*#define OPERATOR_COMPLEMENT 31*/
-#define OPERATOR_NOT 32
-
-static const struct {
-       unsigned int o_code;
-       const char *o_name;
+#define OPERATOR_ADDASSIGN 1
+#define OPERATOR_SUBASSIGN 2
+#define OPERATOR_MULASSIGN 3
+#define OPERATOR_DIVASSIGN 4
+/*#define OPERATOR_MODASSIGN 5*/
+/*#define OPERATOR_LSHASSIGN 6*/
+/*#define OPERATOR_RSHASSIGN 7*/
+/*#define OPERATOR_ANDASSIGN 8*/
+/*#define OPERATOR_XORASSIGN 9*/
+/*#define OPERATOR_ORASSIGN 10*/
+#define OPERATOR_LOGICALXOR 11
+/*#define OPERATOR_BITOR 12*/
+/*#define OPERATOR_BITXOR 13*/
+/*#define OPERATOR_BITAND 14*/
+#define OPERATOR_LESS 15
+#define OPERATOR_GREATER 16
+#define OPERATOR_LESSEQUAL 17
+#define OPERATOR_GREATEREQUAL 18
+/*#define OPERATOR_LSHIFT 19*/
+/*#define OPERATOR_RSHIFT 20*/
+#define OPERATOR_MULTIPLY 21
+#define OPERATOR_DIVIDE 22
+/*#define OPERATOR_MODULUS 23*/
+#define OPERATOR_INCREMENT 24
+#define OPERATOR_DECREMENT 25
+#define OPERATOR_PLUS 26
+#define OPERATOR_MINUS 27
+/*#define OPERATOR_COMPLEMENT 28*/
+#define OPERATOR_NOT 29
+
+static const struct
+{
+   unsigned int o_code;
+   const char *o_name;
 } operator_names[] = {
-       { OPERATOR_INCREMENT, "++" },
-       { OPERATOR_ADDASSIGN, "+=" },
-       { OPERATOR_PLUS, "+" },
-       { OPERATOR_DECREMENT, "--" },
-       { OPERATOR_SUBASSIGN, "-=" },
-       { OPERATOR_MINUS, "-" },
-       { OPERATOR_NOTEQUAL, "!=" },
-       { OPERATOR_NOT, "!" },
-       { OPERATOR_MULASSIGN, "*=" },
-       { OPERATOR_MULTIPLY, "*" },
-       { OPERATOR_DIVASSIGN, "/=" },
-       { OPERATOR_DIVIDE, "/" },
-       { OPERATOR_LESSEQUAL, "<=" },
-       /*{ OPERATOR_LSHASSIGN, "<<=" },*/
-       /*{ OPERATOR_LSHIFT, "<<" },*/
-       { OPERATOR_LESS, "<" },
-       { OPERATOR_GREATEREQUAL, ">=" },
-       /*{ OPERATOR_RSHASSIGN, ">>=" },*/
-       /*{ OPERATOR_RSHIFT, ">>" },*/
-       { OPERATOR_GREATER, ">" },
-       { OPERATOR_EQUAL, "==" },
-       { OPERATOR_ASSIGN, "=" },
-       /*{ OPERATOR_MODASSIGN, "%=" },*/
-       /*{ OPERATOR_MODULUS, "%" },*/
-       /*{ OPERATOR_ANDASSIGN, "&=" },*/
-       /*{ OPERATOR_BITAND, "&" },*/
-       /*{ OPERATOR_ORASSIGN, "|=" },*/
-       /*{ OPERATOR_BITOR, "|" },*/
-       /*{ OPERATOR_COMPLEMENT, "~" },*/
-       /*{ OPERATOR_XORASSIGN, "^=" },*/
-       { OPERATOR_LOGICALXOR, "^^" }/*,*/
-       /*{ OPERATOR_BITXOR, "^" }*/
+   {OPERATOR_INCREMENT, "++"},
+   {OPERATOR_ADDASSIGN, "+="},
+   {OPERATOR_PLUS, "+"},
+   {OPERATOR_DECREMENT, "--"},
+   {OPERATOR_SUBASSIGN, "-="},
+   {OPERATOR_MINUS, "-"},
+   {OPERATOR_NOT, "!"},
+   {OPERATOR_MULASSIGN, "*="},
+   {OPERATOR_MULTIPLY, "*"},
+   {OPERATOR_DIVASSIGN, "/="},
+   {OPERATOR_DIVIDE, "/"},
+   {OPERATOR_LESSEQUAL, "<="},
+   /*{ OPERATOR_LSHASSIGN, "<<=" }, */
+   /*{ OPERATOR_LSHIFT, "<<" }, */
+   {OPERATOR_LESS, "<"},
+   {OPERATOR_GREATEREQUAL, ">="},
+   /*{ OPERATOR_RSHASSIGN, ">>=" }, */
+   /*{ OPERATOR_RSHIFT, ">>" }, */
+   {OPERATOR_GREATER, ">"},
+   /*{ OPERATOR_MODASSIGN, "%=" }, */
+   /*{ OPERATOR_MODULUS, "%" }, */
+   /*{ OPERATOR_ANDASSIGN, "&=" }, */
+   /*{ OPERATOR_BITAND, "&" }, */
+   /*{ OPERATOR_ORASSIGN, "|=" }, */
+   /*{ OPERATOR_BITOR, "|" }, */
+   /*{ OPERATOR_COMPLEMENT, "~" }, */
+   /*{ OPERATOR_XORASSIGN, "^=" }, */
+   {OPERATOR_LOGICALXOR, "^^"},
+   /*{ OPERATOR_BITXOR, "^" } */
 };
 
-static int parse_operator_name (slang_parse_ctx *C, char **pname)
-{
-       unsigned int i;
-       for (i = 0; i < sizeof (operator_names) / sizeof (*operator_names); i++)
-               if (operator_names[i].o_code == (unsigned int) (*C->I))
-               {
-                       *pname = slang_string_duplicate (operator_names[i].o_name);
-                       if (*pname == NULL)
-                       {
-                               slang_info_log_memory (C->L);
-                               return 0;
-                       }
-                       C->I++;
-                       return 1;
-               }
-       return 0;
-}
-
-static int parse_function_prototype (slang_parse_ctx *C, slang_function *func,
-       slang_struct_scope *structs, slang_variable_scope *scope, slang_function_scope *funcs)
-{
-       if (!parse_fully_specified_type (C, &func->header.type, structs, scope, funcs))
-               return 0;
-       switch (*C->I++)
-       {
-       case FUNCTION_ORDINARY:
-               func->kind = slang_func_ordinary;
-               if (!parse_identifier (C, &func->header.name))
-                       return 0;
-               break;
-       case FUNCTION_CONSTRUCTOR:
-               func->kind = slang_func_constructor;
-               if (func->header.type.specifier.type == slang_spec_struct)
-                       return 0;
-               func->header.name = slang_string_duplicate (
-                       type_specifier_type_names[func->header.type.specifier.type]);
-               if (func->header.name == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               break;
-       case FUNCTION_OPERATOR:
-               func->kind = slang_func_operator;
-               if (!parse_operator_name (C, &func->header.name))
-                       return 0;
-               break;
-       default:
-               return 0;
-       }
-       func->parameters->outer_scope = scope;
-       while (*C->I++ == PARAMETER_NEXT)
-       {
-               func->parameters->variables = (slang_variable *) slang_alloc_realloc (
-                       func->parameters->variables,
-                       func->parameters->num_variables * sizeof (slang_variable),
-                       (func->parameters->num_variables + 1) * sizeof (slang_variable));
-               if (func->parameters->variables == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               slang_variable_construct (func->parameters->variables + func->parameters->num_variables);
-               func->parameters->num_variables++;
-               if (!parse_parameter_declaration (C, func->parameters->variables +
-                       func->parameters->num_variables - 1, structs, scope, funcs))
-                       return 0;
-       }
-       func->param_count = func->parameters->num_variables;
-       return 1;
-}
-
-static int parse_function_definition (slang_parse_ctx *C, slang_function *func,
-       slang_struct_scope *structs, slang_variable_scope *scope, slang_function_scope *funcs)
-{
-       if (!parse_function_prototype (C, func, structs, scope, funcs))
-               return 0;
-       func->body = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-       if (func->body == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       if (!slang_operation_construct_a (func->body))
-       {
-               slang_alloc_free (func->body);
-               func->body = NULL;
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       if (!parse_statement (C, func->body, func->parameters, structs, funcs))
-               return 0;
-       return 1;
+static slang_atom
+parse_operator_name(slang_parse_ctx * C)
+{
+   unsigned int i;
+
+   for (i = 0; i < sizeof(operator_names) / sizeof(*operator_names); i++) {
+      if (operator_names[i].o_code == (unsigned int) (*C->I)) {
+         slang_atom atom =
+            slang_atom_pool_atom(C->atoms, operator_names[i].o_name);
+         if (atom == SLANG_ATOM_NULL) {
+            slang_info_log_memory(C->L);
+            return 0;
+         }
+         C->I++;
+         return atom;
+      }
+   }
+   return 0;
+}
+
+static int
+parse_function_prototype(slang_parse_ctx * C, slang_output_ctx * O,
+                         slang_function * func)
+{
+   /* parse function type and name */
+   if (!parse_fully_specified_type(C, O, &func->header.type))
+      return 0;
+   switch (*C->I++) {
+   case FUNCTION_ORDINARY:
+      func->kind = slang_func_ordinary;
+      func->header.a_name = parse_identifier(C);
+      if (func->header.a_name == SLANG_ATOM_NULL)
+         return 0;
+      break;
+   case FUNCTION_CONSTRUCTOR:
+      func->kind = slang_func_constructor;
+      if (func->header.type.specifier.type == slang_spec_struct)
+         return 0;
+      func->header.a_name =
+         slang_atom_pool_atom(C->atoms,
+                              slang_type_specifier_type_to_string
+                              (func->header.type.specifier.type));
+      if (func->header.a_name == SLANG_ATOM_NULL) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      break;
+   case FUNCTION_OPERATOR:
+      func->kind = slang_func_operator;
+      func->header.a_name = parse_operator_name(C);
+      if (func->header.a_name == SLANG_ATOM_NULL)
+         return 0;
+      break;
+   default:
+      return 0;
+   }
+
+   /* parse function parameters */
+   while (*C->I++ == PARAMETER_NEXT) {
+      slang_variable *p = slang_variable_scope_grow(func->parameters);
+      if (!p) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      if (!parse_parameter_declaration(C, O, p))
+         return 0;
+   }
+
+#if 111
+   /* if the function returns a value, append a hidden __retVal 'out'
+    * parameter that corresponds to the return value.
+    */
+   if (_slang_function_has_return_value(func)) {
+      slang_variable *p = slang_variable_scope_grow(func->parameters);
+      slang_atom a_retVal = slang_atom_pool_atom(C->atoms, "__retVal");
+      assert(a_retVal);
+      p->a_name = a_retVal;
+      p->type = func->header.type;
+      p->type.qualifier = slang_qual_out;
+   }
+#endif
+
+   /* function formal parameters and local variables share the same
+    * scope, so save the information about param count in a seperate
+    * place also link the scope to the global variable scope so when a
+    * given identifier is not found here, the search process continues
+    * in the global space
+    */
+   func->param_count = func->parameters->num_variables;
+   func->parameters->outer_scope = O->vars;
+
+   return 1;
+}
+
+static int
+parse_function_definition(slang_parse_ctx * C, slang_output_ctx * O,
+                          slang_function * func)
+{
+   slang_output_ctx o = *O;
+
+   if (!parse_function_prototype(C, O, func))
+      return 0;
+
+   /* create function's body operation */
+   func->body =
+      (slang_operation *) slang_alloc_malloc(sizeof(slang_operation));
+   if (func->body == NULL) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+   if (!slang_operation_construct(func->body)) {
+      slang_alloc_free(func->body);
+      func->body = NULL;
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+
+   /* to parse the body the parse context is modified in order to
+    * capture parsed variables into function's local variable scope
+    */
+   C->global_scope = GL_FALSE;
+   o.vars = func->parameters;
+   if (!parse_statement(C, &o, func->body))
+      return 0;
+
+   C->global_scope = GL_TRUE;
+   return 1;
+}
+
+static GLboolean
+initialize_global(slang_assemble_ctx * A, slang_variable * var)
+{
+#if 01
+   slang_assembly_file_restore_point point;
+#endif
+   slang_machine mach;
+   slang_assembly_local_info save_local = A->local;
+   slang_operation op_id, op_assign;
+   GLboolean result;
+
+#if 01
+   /* save the current assembly */
+   if (!slang_assembly_file_restore_point_save(A->file, &point))
+      return GL_FALSE;
+#endif
+
+   /* setup the machine */
+   mach = *A->mach;
+   mach.ip = A->file->count;
+
+   /* allocate local storage for expression */
+   A->local.ret_size = 0;
+   A->local.addr_tmp = 0;
+   A->local.swizzle_tmp = 4;
+   if (!slang_assembly_file_push_label(A->file, slang_asm_local_alloc, 20))
+      return GL_FALSE;
+   if (!slang_assembly_file_push_label(A->file, slang_asm_enter, 20))
+      return GL_FALSE;
+
+   /* construct the left side of assignment */
+   if (!slang_operation_construct(&op_id))
+      return GL_FALSE;
+   op_id.type = slang_oper_identifier;
+   op_id.a_id = var->a_name;
+
+   /* put the variable into operation's scope */
+   op_id.locals->variables =
+      (slang_variable **) slang_alloc_malloc(sizeof(slang_variable *));
+   if (op_id.locals->variables == NULL) {
+      slang_operation_destruct(&op_id);
+      return GL_FALSE;
+   }
+   op_id.locals->num_variables = 1;
+   op_id.locals->variables[0] = var;
+
+   /* construct the assignment expression */
+   if (!slang_operation_construct(&op_assign)) {
+      op_id.locals->num_variables = 0;
+      slang_operation_destruct(&op_id);
+      return GL_FALSE;
+   }
+   op_assign.type = slang_oper_assign;
+   op_assign.children =
+      (slang_operation *) slang_alloc_malloc(2 * sizeof(slang_operation));
+   if (op_assign.children == NULL) {
+      slang_operation_destruct(&op_assign);
+      op_id.locals->num_variables = 0;
+      slang_operation_destruct(&op_id);
+      return GL_FALSE;
+   }
+   op_assign.num_children = 2;
+   op_assign.children[0] = op_id;
+   op_assign.children[1] = *var->initializer;
+
+#if 0 /* this should go away */
+   /* insert the actual expression */
+   result = _slang_assemble_operation(A, &op_assign, slang_ref_forbid);
+#else
+   result = 1;
+#endif
+
+   /* carefully destroy the operations */
+   op_assign.num_children = 0;
+   slang_alloc_free(op_assign.children);
+   op_assign.children = NULL;
+   slang_operation_destruct(&op_assign);
+   op_id.locals->num_variables = 0;
+   slang_operation_destruct(&op_id);
+
+   if (!result)
+      return GL_FALSE;
+   if (!slang_assembly_file_push(A->file, slang_asm_exit))
+      return GL_FALSE;
+
+   /* execute the expression */
+#if 0
+   if (!_slang_execute2(A->file, &mach))
+      return GL_FALSE;
+#endif
+
+#if 01
+   /* restore the old assembly */
+   if (!slang_assembly_file_restore_point_load(A->file, &point))
+      return GL_FALSE;
+#endif
+   A->local = save_local;
+
+   /* now we copy the contents of the initialized variable back to the original machine */
+   _mesa_memcpy((GLubyte *) A->mach->mem + var->address,
+                (GLubyte *) mach.mem + var->address, var->size);
+
+   return GL_TRUE;
 }
 
 /* init declarator list */
@@ -1888,262 +1662,311 @@ static int parse_function_definition (slang_parse_ctx *C, slang_function *func,
 #define VARIABLE_ARRAY_EXPLICIT 3
 #define VARIABLE_ARRAY_UNKNOWN 4
 
-static int parse_init_declarator (slang_parse_ctx *C, const slang_fully_specified_type *type,
-       slang_variable_scope *vars, slang_struct_scope *structs, slang_function_scope *funcs)
-{
-       slang_variable *var;
-
-       if (*C->I++ == VARIABLE_NONE)
-               return 1;
-       vars->variables = (slang_variable *) slang_alloc_realloc (vars->variables,
-               vars->num_variables * sizeof (slang_variable),
-               (vars->num_variables + 1) * sizeof (slang_variable));
-       if (vars->variables == NULL)
-       {
-               slang_info_log_memory (C->L);
-               return 0;
-       }
-       var = vars->variables + vars->num_variables;
-       vars->num_variables++;
-       slang_variable_construct (var);
-       var->type.qualifier = type->qualifier;
-       if (!parse_identifier (C, &var->name))
-               return 0;
-       switch (*C->I++)
-       {
-       case VARIABLE_NONE:
-               if (!slang_type_specifier_copy (&var->type.specifier, &type->specifier))
-                       return 0;
-               break;
-       case VARIABLE_INITIALIZER:
-               if (!slang_type_specifier_copy (&var->type.specifier, &type->specifier))
-                       return 0;
-               var->initializer = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-               if (var->initializer == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!slang_operation_construct_a (var->initializer))
-               {
-                       slang_alloc_free (var->initializer);
-                       var->initializer = NULL;
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!parse_expression (C, var->initializer, vars, structs, funcs))
-                       return 0;
-               break;
-       case VARIABLE_ARRAY_UNKNOWN:
-               var->type.specifier.type = slang_spec_array;
-               var->type.specifier._array = (slang_type_specifier *) slang_alloc_malloc (sizeof (
-                       slang_type_specifier));
-               if (var->type.specifier._array == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               slang_type_specifier_construct (var->type.specifier._array);
-               if (!slang_type_specifier_copy (var->type.specifier._array, &type->specifier))
-                       return 0;
-               break;
-       case VARIABLE_ARRAY_EXPLICIT:
-               var->type.specifier.type = slang_spec_array;
-               var->type.specifier._array = (slang_type_specifier *) slang_alloc_malloc (sizeof (
-                       slang_type_specifier));
-               if (var->type.specifier._array == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               slang_type_specifier_construct (var->type.specifier._array);
-               if (!slang_type_specifier_copy (var->type.specifier._array, &type->specifier))
-                       return 0;
-               var->array_size = (slang_operation *) slang_alloc_malloc (sizeof (slang_operation));
-               if (var->array_size == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!slang_operation_construct_a (var->array_size))
-               {
-                       slang_alloc_free (var->array_size);
-                       var->array_size = NULL;
-                       slang_info_log_memory (C->L);
-                       return 0;
-               }
-               if (!parse_expression (C, var->array_size, vars, structs, funcs))
-                       return 0;
-               break;
-       default:
-               return 0;
-       }
-       if (!(var->type.specifier.type == slang_spec_array && var->array_size == NULL))
-       {
-               slang_storage_aggregate agg;
-
-               slang_storage_aggregate_construct (&agg);
-               if (!_slang_aggregate_variable (&agg, &var->type.specifier, var->array_size, funcs,
-                       structs))
-               {
-                       slang_storage_aggregate_destruct (&agg);
-                       return 0;
-               }
-               slang_storage_aggregate_destruct (&agg);
-       }
-       return 1;
-}
 
-static int parse_init_declarator_list (slang_parse_ctx *C, slang_variable_scope *vars,
-       slang_struct_scope *structs, slang_function_scope *funcs)
-{
-       slang_fully_specified_type type;
-
-       slang_fully_specified_type_construct (&type);
-       if (!parse_fully_specified_type (C, &type, structs, vars, funcs))
-       {
-               slang_fully_specified_type_destruct (&type);
-               return 0;
-       }
-       do
-       {
-               if (!parse_init_declarator (C, &type, vars, structs, funcs))
-               {
-                       slang_fully_specified_type_destruct (&type);
-                       return 0;
-               }
-       }
-       while (*C->I++ == DECLARATOR_NEXT);
-       slang_fully_specified_type_destruct (&type);
-       return 1;
+/**
+ * Parse the initializer for a variable declaration.
+ */
+static int
+parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O,
+                      const slang_fully_specified_type * type)
+{
+   slang_variable *var;
+
+   /* empty init declatator (without name, e.g. "float ;") */
+   if (*C->I++ == VARIABLE_NONE)
+      return 1;
+
+   /* make room for the new variable and initialize it */
+   var = slang_variable_scope_grow(O->vars);
+   if (!var) {
+      slang_info_log_memory(C->L);
+      return 0;
+   }
+
+   /* copy the declarator qualifier type, parse the identifier */
+   var->global = C->global_scope;
+   var->type.qualifier = type->qualifier;
+   var->a_name = parse_identifier(C);
+   if (var->a_name == SLANG_ATOM_NULL)
+      return 0;
+
+   switch (*C->I++) {
+   case VARIABLE_NONE:
+      /* simple variable declarator - just copy the specifier */
+      if (!slang_type_specifier_copy(&var->type.specifier, &type->specifier))
+         return 0;
+      break;
+   case VARIABLE_INITIALIZER:
+      /* initialized variable - copy the specifier and parse the expression */
+      if (!slang_type_specifier_copy(&var->type.specifier, &type->specifier))
+         return 0;
+      var->initializer =
+         (slang_operation *) slang_alloc_malloc(sizeof(slang_operation));
+      if (var->initializer == NULL) {
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      if (!slang_operation_construct(var->initializer)) {
+         slang_alloc_free(var->initializer);
+         var->initializer = NULL;
+         slang_info_log_memory(C->L);
+         return 0;
+      }
+      if (!parse_expression(C, O, var->initializer))
+         return 0;
+      break;
+#if 0
+   case VARIABLE_ARRAY_UNKNOWN:
+      /* unsized array - mark it as array and copy the specifier to
+         the array element
+      */
+      if (!convert_to_array(C, var, &type->specifier))
+         return GL_FALSE;
+      break;
+#endif
+   case VARIABLE_ARRAY_EXPLICIT:
+      if (!convert_to_array(C, var, &type->specifier))
+         return GL_FALSE;
+      if (!parse_array_len(C, O, &var->array_len))
+         return GL_FALSE;
+      break;
+   default:
+      return 0;
+   }
+
+#if 1
+   if (C->global_scope) {
+      slang_assemble_ctx A;
+
+      A.file = O->assembly;
+      A.mach = O->machine;
+      A.atoms = C->atoms;
+      A.space.funcs = O->funs;
+      A.space.structs = O->structs;
+      A.space.vars = O->vars;
+      A.program = O->program;
+#if 0
+      A.codegen = O->codegen;
+#endif
+      A.vartable = O->vartable;
+
+      _slang_codegen_global_variable(&A, var, C->type);
+   }
+#endif
+
+   /* allocate global address space for a variable with a known size */
+   if (C->global_scope
+       && !(var->type.specifier.type == slang_spec_array
+            && var->array_len == 0)) {
+      if (!calculate_var_size(C, O, var))
+         return GL_FALSE;
+      var->address = slang_var_pool_alloc(O->global_pool, var->size);
+   }
+
+   /* initialize global variable */
+   if (C->global_scope) {
+      if (var->initializer != NULL) {
+         slang_assemble_ctx A;
+
+         A.file = O->assembly;
+         A.mach = O->machine;
+         A.atoms = C->atoms;
+         A.space.funcs = O->funs;
+         A.space.structs = O->structs;
+         A.space.vars = O->vars;
+         if (!initialize_global(&A, var))
+            return 0;
+      }
+      else {
+         _mesa_memset((GLubyte *) (O->machine->mem) + var->address, 0,
+                      var->size);
+      }
+   }
+   return 1;
 }
 
-static int parse_function (slang_parse_ctx *C, int definition, slang_struct_scope *structs,
-       slang_function_scope *funcs, slang_variable_scope *scope, slang_function **parsed_func_ret)
+/**
+ * Parse a list of variable declarations.  Each variable may have an
+ * initializer.
+ */
+static int
+parse_init_declarator_list(slang_parse_ctx * C, slang_output_ctx * O)
 {
-       slang_function parsed_func, *found_func;
-
-       /* parse function definition/declaration */
-       slang_function_construct (&parsed_func);
-       if (definition)
-       {
-               if (!parse_function_definition (C, &parsed_func, structs, scope, funcs))
-               {
-                       slang_function_destruct (&parsed_func);
-                       return 0;
-               }
-       }
-       else
-       {
-               if (!parse_function_prototype (C, &parsed_func, structs, scope, funcs))
-               {
-                       slang_function_destruct (&parsed_func);
-                       return 0;
-               }
-       }
-
-       /* find a function with a prototype matching the parsed one - only the current scope
-       is being searched to allow built-in function overriding */
-       found_func = slang_function_scope_find (funcs, &parsed_func, 0);
-       if (found_func == NULL)
-       {
-               /* add the parsed function to the function list */
-               funcs->functions = (slang_function *) slang_alloc_realloc (funcs->functions,
-                       funcs->num_functions * sizeof (slang_function), (funcs->num_functions + 1) * sizeof (
-                       slang_function));
-               if (funcs->functions == NULL)
-               {
-                       slang_info_log_memory (C->L);
-                       slang_function_destruct (&parsed_func);
-                       return 0;
-               }
-               funcs->functions[funcs->num_functions] = parsed_func;
-               funcs->num_functions++;
-
-               /* return the newly parsed function */
-               *parsed_func_ret = funcs->functions + funcs->num_functions - 1;
-       }
-       else
-       {
-               /* TODO: check function return type qualifiers and specifiers */
-               if (definition)
-               {
-                       /* destroy the existing function declaration and replace it with the new one */
-                       if (found_func->body != NULL)
-                       {
-                               slang_info_log_error (C->L, "%s: function already has a body",
-                                       parsed_func.header.name);
-                               slang_function_destruct (&parsed_func);
-                               return 0;
-                       }
-                       slang_function_destruct (found_func);
-                       *found_func = parsed_func;
-               }
-               else
-               {
-                       /* another declaration of the same function prototype - ignore it */
-                       slang_function_destruct (&parsed_func);
-               }
-
-               /* return the found function */
-               *parsed_func_ret = found_func;
-       }
-
-       /* assemble the parsed function */
-       if (definition)
-       {
-static int x = 0;
-static
-               slang_assembly_file file;
-               slang_assembly_name_space space;
-x++;
-if (x == 1)
-               slang_assembly_file_construct (&file);
-               space.funcs = funcs;
-               space.structs = structs;
-               space.vars = scope;
-if (x == 1)
-xxx_first (&file);\r
-               (**parsed_func_ret).address = file.count;
-               if (!_slang_assemble_function (&file, *parsed_func_ret, &space))
-               {
-                       slang_assembly_file_destruct (&file);
-                       return 0;
-               }
-if (slang_string_compare ("main", (**parsed_func_ret).header.name) == 0)
-{\r
-xxx_prolog (&file, (**parsed_func_ret).address);
-_slang_execute (&file);
-slang_assembly_file_destruct (&file);
-exit (0);
+   slang_fully_specified_type type;
+
+   /* parse the fully specified type, common to all declarators */
+   if (!slang_fully_specified_type_construct(&type))
+      return 0;
+   if (!parse_fully_specified_type(C, O, &type)) {
+      slang_fully_specified_type_destruct(&type);
+      return 0;
+   }
+
+   /* parse declarators, pass-in the parsed type */
+   do {
+      if (!parse_init_declarator(C, O, &type)) {
+         slang_fully_specified_type_destruct(&type);
+         return 0;
+      }
+   }
+   while (*C->I++ == DECLARATOR_NEXT);
+
+   slang_fully_specified_type_destruct(&type);
+   return 1;
 }
-       }
-       return 1;
+
+
+/**
+ * Parse a function definition or declaration.
+ * \param C  parsing context
+ * \param O  output context
+ * \param definition if non-zero expect a definition, else a declaration
+ * \param parsed_func_ret  returns the parsed function
+ * \return GL_TRUE if success, GL_FALSE if failure
+ */
+static GLboolean
+parse_function(slang_parse_ctx * C, slang_output_ctx * O, int definition,
+               slang_function ** parsed_func_ret)
+{
+   slang_function parsed_func, *found_func;
+
+   /* parse function definition/declaration */
+   if (!slang_function_construct(&parsed_func))
+      return GL_FALSE;
+   if (definition) {
+      if (!parse_function_definition(C, O, &parsed_func)) {
+         slang_function_destruct(&parsed_func);
+         return GL_FALSE;
+      }
+   }
+   else {
+      if (!parse_function_prototype(C, O, &parsed_func)) {
+         slang_function_destruct(&parsed_func);
+         return GL_FALSE;
+      }
+   }
+
+   /* find a function with a prototype matching the parsed one - only
+    * the current scope is being searched to allow built-in function
+    * overriding
+    */
+   found_func = slang_function_scope_find(O->funs, &parsed_func, 0);
+   if (found_func == NULL) {
+      /* New function, add it to the function list */
+      O->funs->functions =
+         (slang_function *) slang_alloc_realloc(O->funs->functions,
+                                                O->funs->num_functions *
+                                                sizeof(slang_function),
+                                                (O->funs->num_functions +
+                                                 1) * sizeof(slang_function));
+      if (O->funs->functions == NULL) {
+         slang_info_log_memory(C->L);
+         slang_function_destruct(&parsed_func);
+         return GL_FALSE;
+      }
+      O->funs->functions[O->funs->num_functions] = parsed_func;
+      O->funs->num_functions++;
+
+      /* return the newly parsed function */
+      *parsed_func_ret = &O->funs->functions[O->funs->num_functions - 1];
+   }
+   else {
+      /* previously defined or declared */
+      /* TODO: check function return type qualifiers and specifiers */
+      if (definition) {
+         if (found_func->body != NULL) {
+            slang_info_log_error(C->L, "%s: function already has a body.",
+                                 slang_atom_pool_id(C->atoms,
+                                                    parsed_func.header.
+                                                    a_name));
+            slang_function_destruct(&parsed_func);
+            return GL_FALSE;
+         }
+
+         /* destroy the existing function declaration and replace it
+          * with the new one, remember to save the fixup table
+          */
+         parsed_func.fixups = found_func->fixups;
+         slang_fixup_table_init(&found_func->fixups);
+         slang_function_destruct(found_func);
+         *found_func = parsed_func;
+      }
+      else {
+         /* another declaration of the same function prototype - ignore it */
+         slang_function_destruct(&parsed_func);
+      }
+
+      /* return the found function */
+      *parsed_func_ret = found_func;
+   }
+
+   /* assemble the parsed function */
+   {
+      slang_assemble_ctx A;
+
+      A.file = O->assembly;
+      A.mach = O->machine;
+      A.atoms = C->atoms;
+      A.space.funcs = O->funs;
+      A.space.structs = O->structs;
+      A.space.vars = O->vars;
+      A.program = O->program;
+#if 0
+      A.codegen = O->codegen;
+#endif
+      A.vartable = O->vartable;
+
+      _slang_reset_error();
+
+#if 0
+      printf("*************** Assemble function %s ****\n", (char *) (*parsed_func_ret)->header.a_name);
+      slang_print_var_scope((*parsed_func_ret)->parameters,
+                            (*parsed_func_ret)->param_count);
+#endif
+
+#if 0
+      if (!_slang_assemble_function(&A, *parsed_func_ret)) {
+         /* propogate the error message back through the info log */
+         C->L->text = _mesa_strdup(_slang_error_text());
+         C->L->dont_free_text = GL_FALSE;
+         return GL_FALSE;
+      }
+#endif
+
+#if 0
+      printf("**************************************\n");
+#endif
+#if 1
+      _slang_codegen_function(&A, *parsed_func_ret);
+#endif
+   }
+   return GL_TRUE;
 }
 
 /* declaration */
 #define DECLARATION_FUNCTION_PROTOTYPE 1
 #define DECLARATION_INIT_DECLARATOR_LIST 2
 
-static int parse_declaration (slang_parse_ctx *C, slang_variable_scope *scope,
-       slang_struct_scope *structs, slang_function_scope *funcs)
+static int
+parse_declaration(slang_parse_ctx * C, slang_output_ctx * O)
 {
-       slang_function *dummy_func;
-
-       switch (*C->I++)
-       {
-       case DECLARATION_INIT_DECLARATOR_LIST:
-               if (!parse_init_declarator_list (C, scope, structs, funcs))
-                       return 0;
-               break;
-       case DECLARATION_FUNCTION_PROTOTYPE:
-               if (!parse_function (C, 0, structs, funcs, scope, &dummy_func))
-                       return 0;
-               break;
-       default:
-               return 0;
-       }
-       return 1;
+   switch (*C->I++) {
+   case DECLARATION_INIT_DECLARATOR_LIST:
+      if (!parse_init_declarator_list(C, O))
+         return 0;
+      break;
+   case DECLARATION_FUNCTION_PROTOTYPE:
+      {
+         slang_function *dummy_func;
+
+         if (!parse_function(C, O, 0, &dummy_func))
+            return 0;
+      }
+      break;
+   default:
+      return 0;
+   }
+   return 1;
 }
 
 /* external declaration */
@@ -2151,219 +1974,363 @@ static int parse_declaration (slang_parse_ctx *C, slang_variable_scope *scope,
 #define EXTERNAL_FUNCTION_DEFINITION 1
 #define EXTERNAL_DECLARATION 2
 
-static int parse_translation_unit (slang_parse_ctx *C, slang_translation_unit *unit)
-{
-       while (*C->I != EXTERNAL_NULL)
-       {
-               slang_function *func;
-
-               switch (*C->I++)
-               {
-               case EXTERNAL_FUNCTION_DEFINITION:
-                       if (!parse_function (C, 1, &unit->structs, &unit->functions, &unit->globals, &func))
-                               return 0;
-                       break;
-               case EXTERNAL_DECLARATION:
-                       if (!parse_declaration (C, &unit->globals, &unit->structs, &unit->functions))
-                               return 0;
-                       break;
-               default:
-                       return 0;
-               }
-       }
-       C->I++;
-       return 1;
-}
+static GLboolean
+parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
+                struct gl_program *program)
+{
+   slang_output_ctx o;
+   GLboolean success;
+
+   /* setup output context */
+   o.funs = &unit->funs;
+   o.structs = &unit->structs;
+   o.vars = &unit->vars;
+   o.assembly = &unit->object->assembly;
+   o.global_pool = &unit->object->varpool;
+   o.machine = &unit->object->machine;
+   o.program = program;
+   o.vartable = _slang_push_var_table(NULL);
+
+   /* parse individual functions and declarations */
+   while (*C->I != EXTERNAL_NULL) {
+      switch (*C->I++) {
+      case EXTERNAL_FUNCTION_DEFINITION:
+         {
+            slang_function *func;
+            success = parse_function(C, &o, 1, &func);
+         }
+         break;
+      case EXTERNAL_DECLARATION:
+         success = parse_declaration(C, &o);
+         break;
+      default:
+         success = GL_FALSE;
+      }
+
+      if (!success) {
+         /* xxx free codegen */
+         _slang_pop_var_table(o.vartable);
+         return GL_FALSE;
+      }
+   }
+   C->I++;
+
+   _slang_pop_var_table(o.vartable);
+   return GL_TRUE;
+}
+
+static GLboolean
+compile_binary(const byte * prod, slang_code_unit * unit,
+               slang_unit_type type, slang_info_log * infolog,
+               slang_code_unit * builtin, slang_code_unit * downlink,
+               struct gl_program *program)
+{
+   slang_parse_ctx C;
+
+   unit->type = type;
+
+   /* setup parse context */
+   C.I = prod;
+   C.L = infolog;
+   C.parsing_builtin = (builtin == NULL);
+   C.global_scope = GL_TRUE;
+   C.atoms = &unit->object->atompool;
+   C.type = type;
+
+   if (!check_revision(&C))
+      return GL_FALSE;
+
+   if (downlink != NULL) {
+      unit->vars.outer_scope = &downlink->vars;
+      unit->funs.outer_scope = &downlink->funs;
+      unit->structs.outer_scope = &downlink->structs;
+   }
+
+   /* parse translation unit */
+   return parse_code_unit(&C, unit, program);
+}
+
+static GLboolean
+compile_with_grammar(grammar id, const char *source, slang_code_unit * unit,
+                     slang_unit_type type, slang_info_log * infolog,
+                     slang_code_unit * builtin,
+                     struct gl_program *program)
+{
+   byte *prod;
+   GLuint size, start, version;
+   slang_string preprocessed;
+
+   /* First retrieve the version number. */
+   if (!_slang_preprocess_version(source, &version, &start, infolog))
+      return GL_FALSE;
+
+   if (version > 110) {
+      slang_info_log_error(infolog,
+                           "language version specified is not supported.");
+      return GL_FALSE;
+   }
+
+   /* Now preprocess the source string. */
+   slang_string_init(&preprocessed);
+   if (!_slang_preprocess_directives(&preprocessed, &source[start], infolog)) {
+      slang_string_free(&preprocessed);
+      slang_info_log_error(infolog, "failed to preprocess the source.");
+      return GL_FALSE;
+   }
+
+   /* Finally check the syntax and generate its binary representation. */
+   if (!grammar_fast_check(id,
+                           (const byte *) (slang_string_cstr(&preprocessed)),
+                           &prod, &size,
+        65536)) {
+      char buf[1024];
+      GLint pos;
+
+      slang_string_free(&preprocessed);
+      grammar_get_last_error((byte *) (buf), sizeof(buf), &pos);
+      slang_info_log_error(infolog, buf);
+      RETURN_ERROR("syntax error (possibly in library code)", 0);
+   }
+   slang_string_free(&preprocessed);
+
+   /* Syntax is okay - translate it to internal representation. */
+   if (!compile_binary(prod, unit, type, infolog, builtin,
+                       &builtin[SLANG_BUILTIN_TOTAL - 1],
+                       program)) {
+      grammar_alloc_free(prod);
+      return GL_FALSE;
+   }
+   grammar_alloc_free(prod);
+   return GL_TRUE;
+}
+
+LONGSTRING static const char *slang_shader_syn =
+#include "library/slang_shader_syn.h"
+   ;
 
-static int compile_binary (const byte *prod, slang_translation_unit *unit, slang_unit_type type,
-       slang_info_log *log, slang_translation_unit *builtins)
-{
-       slang_parse_ctx C;
-
-       /* set-up parse context */
-       C.I = prod;
-       C.L = log;
-       C.parsing_builtin = builtins == NULL;
-
-       if (!check_revision (&C))
-               return 0;
-
-       /* create translation unit object */
-       slang_translation_unit_construct (unit);
-       unit->type = type;
-
-       if (builtins != NULL)
-       {
-               /* link to built-in functions */
-               builtins[1].functions.outer_scope = &builtins[0].functions;
-               builtins[2].functions.outer_scope = &builtins[1].functions;
-               unit->functions.outer_scope = &builtins[2].functions;
-
-               /* link to built-in variables - core unit does not define any */
-               builtins[2].globals.outer_scope = &builtins[1].globals;
-               unit->globals.outer_scope = &builtins[2].globals;
-
-               /* link to built-in structure typedefs - only in common unit */
-               unit->structs.outer_scope = &builtins[1].structs;
-       }
-
-       /* parse translation unit */
-       if (!parse_translation_unit (&C, unit))
-       {
-               slang_translation_unit_destruct (unit);
-               return 0;
-       }
-
-       return 1;
-}
+static const byte slang_core_gc[] = {
+#include "library/slang_core_gc.h"
+};
 
-static int compile_with_grammar (grammar id, const char *source, slang_translation_unit *unit,
-       slang_unit_type type, slang_info_log *log, slang_translation_unit *builtins)
-{
-       byte *prod;
-       unsigned int size, start, version;
-
-       /* retrieve version */
-       if (!_slang_preprocess_version (source, &version, &start, log))
-               return 0;
-
-       /* check the syntax */
-       if (!grammar_fast_check (id, (const byte *) source + start, &prod, &size, 65536))
-       {
-               char buf[1024];
-               unsigned int pos;
-               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
-               slang_info_log_error (log, buf);
-               return 0;
-       }
-
-       if (!compile_binary (prod, unit, type, log, builtins))
-       {
-               grammar_alloc_free (prod);
-               return 0;
-       }
-
-       grammar_alloc_free (prod);
-       return 1;
-}
+static const byte slang_common_builtin_gc[] = {
+#include "library/slang_common_builtin_gc.h"
+};
 
-static const char *slang_shader_syn =
-#include "library/slang_shader_syn.h"
-;
-/*
-static const byte slang_core_gc_bin[] = {
-#include "library/slang_core_gc_bin.h"
-};*/
-static const byte slang_core_gc[] = {\r
-#include "library/slang_core_gc.h"\r
-};\r
-
-static const byte slang_common_builtin_gc_bin[] = {
-#include "library/slang_common_builtin_gc_bin.h"
+static const byte slang_fragment_builtin_gc[] = {
+#include "library/slang_fragment_builtin_gc.h"
 };
 
-static const byte slang_fragment_builtin_gc_bin[] = {
-#include "library/slang_fragment_builtin_gc_bin.h"
+static const byte slang_vertex_builtin_gc[] = {
+#include "library/slang_vertex_builtin_gc.h"
 };
 
-static const byte slang_vertex_builtin_gc_bin[] = {
-#include "library/slang_vertex_builtin_gc_bin.h"
+#if defined(USE_X86_ASM) || defined(SLANG_X86)
+foo
+static const byte slang_builtin_vec4_gc[] = {
+#include "library/slang_builtin_vec4_gc.h"
 };
-\r
-int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit_type type,
-       slang_info_log *log)
-{
-       grammar id;
-       slang_translation_unit builtin_units[3];
-       slang_translation_unit *builtins = NULL;
-
-       /* load slang grammar */
-       id = grammar_load_from_text ((const byte *) slang_shader_syn);
-       if (id == 0)
-       {
-               char buf[1024];
-               unsigned int pos;
-               grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
-               slang_info_log_error (log, buf);
-               return 0;
-       }
-
-       /* set shader type - the syntax is slightly different for different shaders */
-       if (type == slang_unit_fragment_shader || type == slang_unit_fragment_builtin)
-               grammar_set_reg8 (id, (const byte *) "shader_type", 1);
-       else
-               grammar_set_reg8 (id, (const byte *) "shader_type", 2);
-
-       /* enable language extensions */
-       grammar_set_reg8 (id, (const byte *) "parsing_builtin", 1);
-
-       /* if parsing user-specified shader, load built-in library */
-       if (type == slang_unit_fragment_shader || type == slang_unit_vertex_shader)
-       {
-               /*if (!compile_binary (slang_core_gc_bin, builtin_units,
-                       slang_unit_fragment_builtin, log, NULL))*/\r
-               if (!compile_with_grammar (id, slang_core_gc, builtin_units, slang_unit_fragment_builtin,\r
-                       log, NULL))
-               {
-                       grammar_destroy (id);
-                       return 0;
-               }
-               if (!compile_binary (slang_common_builtin_gc_bin, builtin_units + 1,
-                       slang_unit_fragment_builtin, log, NULL))
-               {
-                       slang_translation_unit_destruct (builtin_units);
-                       grammar_destroy (id);
-                       return 0;
-               }
-               if (type == slang_unit_fragment_shader)
-               {
-                       if (!compile_binary (slang_fragment_builtin_gc_bin, builtin_units + 2,
-                               slang_unit_fragment_builtin, log, NULL))\r
-                       {
-                               slang_translation_unit_destruct (builtin_units);
-                               slang_translation_unit_destruct (builtin_units + 1);
-                               grammar_destroy (id);
-                               return 0;
-                       }
-               }
-               else if (type == slang_unit_vertex_shader)
-               {
-                       if (!compile_binary (slang_vertex_builtin_gc_bin, builtin_units + 2,
-                               slang_unit_vertex_builtin, log, NULL))\r
-                       {
-                               slang_translation_unit_destruct (builtin_units);
-                               slang_translation_unit_destruct (builtin_units + 1);
-                               grammar_destroy (id);
-                               return 0;
-                       }
-               }
-
-               /* disable language extensions */
-               grammar_set_reg8 (id, (const byte *) "parsing_builtin", 0);
-               builtins = builtin_units;
-       }
-
-       /* compile the actual shader - pass-in built-in library for external shader */
-       if (!compile_with_grammar (id, source, unit, type, log, builtins))
-       {
-               if (type == slang_unit_fragment_shader || type == slang_unit_vertex_shader)
-               {
-                       slang_translation_unit_destruct (builtin_units);
-                       slang_translation_unit_destruct (builtin_units + 1);
-                       slang_translation_unit_destruct (builtin_units + 2);
-               }
-               grammar_destroy (id);
-               return 0;
-       }
-
-       /* destroy built-in library */
-       if (type == slang_unit_fragment_shader || type == slang_unit_vertex_shader)
-       {
-               slang_translation_unit_destruct (builtin_units);
-               slang_translation_unit_destruct (builtin_units + 1);
-               slang_translation_unit_destruct (builtin_units + 2);
-       }
-       grammar_destroy (id);
-       return 1;
+#endif
+
+static GLboolean
+compile_object(grammar * id, const char *source, slang_code_object * object,
+               slang_unit_type type, slang_info_log * infolog,
+               struct gl_program *program)
+{
+   slang_code_unit *builtins = NULL;
+
+   /* load GLSL grammar */
+   *id = grammar_load_from_text((const byte *) (slang_shader_syn));
+   if (*id == 0) {
+      byte buf[1024];
+      int pos;
+
+      grammar_get_last_error(buf, 1024, &pos);
+      slang_info_log_error(infolog, (const char *) (buf));
+      return GL_FALSE;
+   }
+
+   /* set shader type - the syntax is slightly different for different shaders */
+   if (type == slang_unit_fragment_shader
+       || type == slang_unit_fragment_builtin)
+      grammar_set_reg8(*id, (const byte *) "shader_type", 1);
+   else
+      grammar_set_reg8(*id, (const byte *) "shader_type", 2);
+
+   /* enable language extensions */
+   grammar_set_reg8(*id, (const byte *) "parsing_builtin", 1);
+
+   /* if parsing user-specified shader, load built-in library */
+   if (type == slang_unit_fragment_shader || type == slang_unit_vertex_shader) {
+      /* compile core functionality first */
+      if (!compile_binary(slang_core_gc,
+                          &object->builtin[SLANG_BUILTIN_CORE],
+                          slang_unit_fragment_builtin, infolog,
+                          NULL, NULL, NULL))
+         return GL_FALSE;
+
+      /* compile common functions and variables, link to core */
+      if (!compile_binary(slang_common_builtin_gc,
+                          &object->builtin[SLANG_BUILTIN_COMMON],
+                          slang_unit_fragment_builtin, infolog, NULL,
+                          &object->builtin[SLANG_BUILTIN_CORE], NULL))
+         return GL_FALSE;
+
+      /* compile target-specific functions and variables, link to common */
+      if (type == slang_unit_fragment_shader) {
+         if (!compile_binary(slang_fragment_builtin_gc,
+                             &object->builtin[SLANG_BUILTIN_TARGET],
+                             slang_unit_fragment_builtin, infolog, NULL,
+                             &object->builtin[SLANG_BUILTIN_COMMON], NULL))
+            return GL_FALSE;
+      }
+      else if (type == slang_unit_vertex_shader) {
+         if (!compile_binary(slang_vertex_builtin_gc,
+                             &object->builtin[SLANG_BUILTIN_TARGET],
+                             slang_unit_vertex_builtin, infolog, NULL,
+                             &object->builtin[SLANG_BUILTIN_COMMON], NULL))
+            return GL_FALSE;
+      }
+
+#if defined(USE_X86_ASM) || defined(SLANG_X86)
+      /* compile x86 4-component vector overrides, link to target */
+      if (!compile_binary(slang_builtin_vec4_gc,
+                          &object->builtin[SLANG_BUILTIN_VEC4],
+                          slang_unit_fragment_builtin, infolog, NULL,
+                          &object->builtin[SLANG_BUILTIN_TARGET]))
+         return GL_FALSE;
+#endif
+
+      /* disable language extensions */
+#if NEW_SLANG /* allow-built-ins */
+      grammar_set_reg8(*id, (const byte *) "parsing_builtin", 1);
+#else
+      grammar_set_reg8(*id, (const byte *) "parsing_builtin", 0);
+#endif
+      builtins = object->builtin;
+   }
+
+   /* compile the actual shader - pass-in built-in library for external shader */
+   return compile_with_grammar(*id, source, &object->unit, type, infolog,
+                               builtins, program);
+}
+
+
+#if 0
+static void
+slang_create_uniforms(const slang_export_data_table *exports,
+                      struct gl_program *program)
+{
+   /* XXX only add uniforms that are actually going to get used */
+   GLuint i;
+   for (i = 0; i < exports->count; i++) {
+      if (exports->entries[i].access == slang_exp_uniform) {
+         const char *name = (char *) exports->entries[i].quant.name;
+         GLint j = _mesa_add_uniform(program->Parameters, name, 4);
+         assert(j >= 0);
+      }
+   }
+}
+#endif
+
+
+static GLboolean
+compile_shader(GLcontext *ctx, slang_code_object * object,
+               slang_unit_type type, slang_info_log * infolog,
+               struct gl_shader *shader)
+{
+   struct gl_program *program = shader->Programs[0];
+   GLboolean success;
+   grammar id = 0;
+
+   assert(program);
+
+   _slang_code_object_dtr(object);
+   _slang_code_object_ctr(object);
+
+   success = compile_object(&id, shader->Source, object, type, infolog, program);
+   if (id != 0)
+      grammar_destroy(id);
+   if (!success)
+      return GL_FALSE;
+
+   if (!_slang_build_export_data_table(&object->expdata, &object->unit.vars))
+      return GL_FALSE;
+   if (!_slang_build_export_code_table(&object->expcode, &object->unit.funs,
+                                       &object->unit))
+      return GL_FALSE;
+
+#if NEW_SLANG
+   {
+      slang_create_uniforms(&object->expdata, shader);
+      _mesa_print_program(program);
+      _mesa_print_program_parameters(ctx, program);
+   }
+#endif
+
+   return GL_TRUE;
+}
+
+
+
+GLboolean
+_slang_compile(GLcontext *ctx, struct gl_shader *shader)
+{
+   GLboolean success;
+   slang_info_log info_log;
+   slang_code_object obj;
+   slang_unit_type type;
+
+   if (shader->Type == GL_VERTEX_SHADER) {
+      type = slang_unit_vertex_shader;
+   }
+   else {
+      assert(shader->Type == GL_FRAGMENT_SHADER);
+      type = slang_unit_fragment_shader;
+   }
+
+   /* XXX temporary hack */
+   if (!shader->Programs) {
+      GLenum progTarget;
+      if (shader->Type == GL_VERTEX_SHADER)
+         progTarget = GL_VERTEX_PROGRAM_ARB;
+      else
+         progTarget = GL_FRAGMENT_PROGRAM_ARB;
+      shader->Programs
+         = (struct gl_program **) malloc(sizeof(struct gl_program*));
+      shader->Programs[0] = _mesa_new_program(ctx, progTarget, 1);
+      shader->NumPrograms = 1;
+
+      shader->Programs[0]->Parameters = _mesa_new_parameter_list();
+      shader->Programs[0]->Varying = _mesa_new_parameter_list();
+      shader->Programs[0]->Attributes = _mesa_new_parameter_list();
+   }
+
+   slang_info_log_construct(&info_log);
+   _slang_code_object_ctr(&obj);
+
+   success = compile_shader(ctx, &obj, type, &info_log, shader);
+
+   if (success) {
+#if 0
+      slang_create_uniforms(&object->expdata, shader);
+      _mesa_print_program(program);
+      _mesa_print_program_parameters(ctx, program);
+#endif
+   }
+   else {
+      /* XXX more work on info log needed here */
+      if (info_log.text) {
+         if (shader->InfoLog) {
+            free(shader->InfoLog);
+            shader->InfoLog = NULL;
+         }
+         shader->InfoLog = strdup(info_log.text);
+      }
+   }
+
+   slang_info_log_destruct(&info_log);
+   _slang_code_object_dtr(&obj);
+
+   return success;
 }