]> git.draconx.ca Git - gob-dx.git/blobdiff - src/parse.c
Release 1.0.10
[gob-dx.git] / src / parse.c
index 51a215a7aa061424e29be62fe08270ef309c0171..2d9d349764940ea75ec4f6ff6faf259d4b98c7a2 100644 (file)
 #define        FLOAT   270
 #define        DOUBLE  271
 #define        CHAR    272
-#define        ONERROR 273
-#define        TOKEN   274
-#define        NUMBER  275
-#define        TYPETOKEN       276
+#define        TOKEN   273
+#define        NUMBER  274
+#define        TYPETOKEN       275
+#define        ARRAY_DIM       276
 #define        CCODE   277
-#define        HCODE   278
-#define        PUBLIC  279
-#define        PRIVATE 280
-#define        ARGUMENT        281
-#define        VIRTUAL 282
-#define        SIGNAL  283
-#define        OVERRIDE        284
+#define        HTCODE  278
+#define        PHCODE  279
+#define        HCODE   280
+#define        ACODE   281
+#define        ATCODE  282
+#define        PUBLIC  283
+#define        PRIVATE 284
+#define        PROTECTED       285
+#define        CLASSWIDE       286
+#define        ARGUMENT        287
+#define        VIRTUAL 288
+#define        SIGNAL  289
+#define        OVERRIDE        290
 
 #line 21 "parse.y"
 
 #include "config.h"
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "tree.h"
+#include "treefuncs.h"
 #include "main.h"
+#include "util.h"
 
 #define _(x) (x)
        
-extern char *filename;
-       
 GList *nodes = NULL;
 
 static GList *class_nodes = NULL;
 Node *class = NULL;
 
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
 static GList *typestack = NULL;
-static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
 static int has_self = FALSE;
 static int vararg = FALSE;
+static Method *last_added_method = NULL;
+
+/* destructor and initializer for variables */
+static char *destructor = NULL;
+static int destructor_line = 0;
+static gboolean destructor_simple = TRUE;
+static char *initializer = NULL;
+static int initializer_line = 0;
+
+static char *onerror = NULL;
+static char *defreturn = NULL;
 
 static GList *gtktypes = NULL;
 
+/* this can be a global as we will only do one function at a time
+   anyway */
+static int the_scope = NO_SCOPE;
+
 void free(void *ptr);
 int yylex(void);
 
@@ -79,63 +101,144 @@ yyerror(char *str)
        if(strcmp(yytext,"\n")==0) {
                out=g_strconcat("Error: ",str," before newline",NULL);
        } else if(yytext[0]=='\0') {
-               out=g_strconcat("Error: ",str," at end of input",NULL);
+               out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);
-               while((p=strchr(tmp,'\n')))
+               while((p=strchr(tmp, '\n')))
                        *p='.';
 
-               out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+               out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
                g_free(tmp);
        }
 
-       fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+       fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
        g_free(out);
        
        exit(1);
 }
 
-static void
-push_variable(char *name, int scope, int line_no)
+static Type *
+pop_type(void)
 {
-       Node *var;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+       return type;
+}
+
+static void
+push_variable(char *name, int scope, int line_no, char *postfix)
+{
+       Node *var;
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       var = new_variable(scope,type,name,line_no);
+       var = new_variable(scope, type, name, line_no,
+                          destructor, destructor_line,
+                          destructor_simple,
+                          initializer, initializer_line);
        class_nodes = g_list_append(class_nodes, var);
 }
 
 static void
-push_function(int scope, char *oid, char *id, char *onerror,
-             GString *cbuf,int line_no, int ccode_line, int vararg)
+push_function(int scope, int method, char *oid, char *id,
+             GString *cbuf, int line_no, int ccode_line,
+             gboolean vararg, GList *flags)
 {
        Node *node;
        Type *type;
+       char *c_cbuf;
+
+       g_assert(scope != CLASS_SCOPE);
        
-       if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
-               type = typestack->data;
-               typestack = g_list_remove(typestack,typestack->data);
+       if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+               type = (Type *)new_type(g_strdup("void"), NULL, NULL);
        } else {
-               type = (Type *)new_type(0,g_strdup("void"));
+               type = pop_type();
        }
        
-       node = new_method(scope,type,oid,gtktypes,id,funcargs,
-                         onerror,cbuf,line_no,ccode_line,vararg);
+       /* a complicated and ugly test to figure out if we have
+          the wrong number of types for a signal */
+       if((method == SIGNAL_FIRST_METHOD ||
+           method == SIGNAL_LAST_METHOD) &&
+          g_list_length(gtktypes) != g_list_length(funcargs) &&
+          !(g_list_length(funcargs) == 1 &&
+            g_list_length(gtktypes) == 2 &&
+            strcmp(gtktypes->next->data, "NONE")==0)) {
+               error_print(GOB_WARN, line_no,
+                           _("The number of GTK arguments and "
+                             "function arguments for a signal "
+                             "don't seem to match"));
+       }
+       if(g_list_length(gtktypes) > 2) {
+               GList *li;
+               for(li = gtktypes->next; li; li = li->next) {
+                       if(strcmp(li->data, "NONE")==0) {
+                               error_print(GOB_ERROR, line_no,
+                                           _("NONE can only appear in an "
+                                             "argument list by itself"));
+                       }
+               }
+       }
+       if(cbuf) {
+               char *p;
+               c_cbuf = p = cbuf->str;
+               while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+                       p++;
+               if(!p || !*p)
+                       c_cbuf = NULL;
+       } else
+               c_cbuf = NULL;
+
+       node = new_method(scope, method, type, oid, gtktypes, flags,
+                         id, funcargs, onerror, defreturn, c_cbuf, line_no,
+                         ccode_line, vararg, method_unique_id++,
+                         FALSE);
+
+       last_added_method = (Method *)node;
+
+       if(cbuf)
+               g_string_free(cbuf,
+                             /*only free segment if we haven't passed it
+                               above */
+                             c_cbuf?FALSE:TRUE);
        gtktypes = NULL;
        funcargs = NULL;
 
+       onerror = NULL;
+       defreturn = NULL;
+
        class_nodes = g_list_append(class_nodes, node);
 }
 
 static void
-push_funcarg(char *name)
+free_all_global_state(void)
+{
+       g_free(onerror);
+       onerror = NULL;
+       g_free(defreturn);
+       defreturn = NULL;
+
+       g_free(chunk_size);
+       chunk_size = NULL;
+       
+       g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+       g_list_free(gtktypes);
+       gtktypes = NULL;
+
+       free_node_list(funcargs);
+       funcargs = NULL;
+}
+
+static void
+push_funcarg(char *name, char *postfix)
 {
        Node *node;
-       Type *type = typestack->data;
-       typestack = g_list_remove(typestack,typestack->data);
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       node = new_funcarg(type,name,checks);
+       node = new_funcarg(type, name, checks);
        checks = NULL;
        
        funcargs = g_list_append(funcargs, node);
@@ -153,26 +256,124 @@ push_init_arg(char *name, int is_class)
        else
                tn = g_strdup(((Class *)class)->otype);
 
-       type = new_type(1,tn);
+       type = new_type(tn, g_strdup("*"), NULL);
        node = new_funcarg((Type *)type,name,NULL);
        funcargs = g_list_prepend(funcargs, node);
 }
 
 static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
 {
        Node *node;
        Node *type;
        GList *ch = NULL;
-       type = new_type(1,g_strdup(((Class *)class)->otype));
+       type = new_type(g_strdup(((Class *)class)->otype),
+                       g_strdup(constant ? "const *" : "*"), NULL);
        ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
        ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
        node = new_funcarg((Type *)type,id,ch);
        funcargs = g_list_prepend(funcargs, node);
 }
 
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+       GList *li;
+
+       for(li = class_nodes; li != NULL; li = li->next) {
+               Variable *var;
+               Node *node = li->data;
+               if(node->type != VARIABLE_NODE)
+                       continue;
+               var = li->data;
+               if(strcmp(var->id, id)==0)
+                       return var;
+       }
+
+       error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
+
+       g_assert_not_reached();
+       return NULL;
+}
+
+static gboolean
+set_return_value(char *type, char *val)
+{
+       if(strcmp(type, "onerror")==0) {
+               if(!onerror) {
+                       onerror = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       } else if(strcmp(type, "defreturn")==0) {
+               if(!defreturn) {
+                       defreturn = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       }
+       return FALSE;
+}
+
+static void
+export_accessors (char *var_name,
+                 GString *get_cbuf,
+                 int get_lineno,
+                 GString *set_cbuf,
+                 int set_lineno,
+                 Type *type,
+                 int lineno)
+{      
+       if (get_cbuf) {
+               char *get_id = g_strdup_printf ("get_%s", var_name);
+               GString *get_cbuf_copy = g_string_new (get_cbuf->str);
+               char *tmp;
+               Node *node1 = new_type (type->name, type->pointer, type->postfix);
+               Node *node3 = new_type (class->class.otype, "*", NULL);
+
+               tmp = g_strdup_printf ("\t%s%s ARG;\n", 
+                                      type->name, 
+                                      type->pointer ? type->pointer : "");
+               get_cbuf_copy = g_string_prepend (get_cbuf_copy, tmp);
+               g_free (tmp);
+               
+               tmp = g_strdup_printf ("\n\t\treturn ARG;\n");
+               get_cbuf_copy = g_string_append (get_cbuf_copy, tmp);
+               g_free (tmp);
+               
+               typestack = g_list_prepend (typestack, node1);
+               typestack = g_list_prepend (typestack, node3);
+               
+               push_funcarg ("self", FALSE);
+               
+               push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL,
+                              get_id, get_cbuf_copy, get_lineno,
+                              lineno, FALSE, NULL);
+       }
+       
+       if (set_cbuf) {
+               char *set_id = g_strdup_printf ("set_%s", var_name);
+               GString *set_cbuf_copy = g_string_new (set_cbuf->str);
+               Node *node1 = new_type (type->name, type->pointer, type->postfix);
+               Node *node2 = new_type ("void", NULL, NULL);
+               Node *node3 = new_type (class->class.otype, "*", NULL);
+
+               typestack = g_list_prepend (typestack, node2);
+               typestack = g_list_prepend (typestack, node1);
+               typestack = g_list_prepend (typestack, node3);
+               
+               push_funcarg ("self", FALSE);
+               push_funcarg ("ARG", FALSE);
+       
+               typestack = g_list_prepend (typestack, node2);
+               push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL,
+                              set_id, set_cbuf_copy, set_lineno,
+                              lineno, FALSE, NULL);
+       }
+}
 
-#line 160 "parse.y"
+
+#line 355 "parse.y"
 typedef union {
        char *id;
        GString *cbuf;
@@ -194,26 +395,26 @@ typedef union {
 
 
 
-#define        YYFINAL         198
+#define        YYFINAL         274
 #define        YYFLAG          -32768
-#define        YYNTBASE        45
+#define        YYNTBASE        50
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 89)
 
 static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    43,     2,     2,     2,     2,     2,     2,    34,
-    35,    37,     2,    38,    44,     2,     2,     2,    40,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    33,    42,
-    39,    41,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    48,     2,     2,     2,     2,     2,     2,    39,
+    40,    44,     2,    45,    49,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,    41,    47,
+    42,    46,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    31,    36,    32,     2,     2,     2,     2,     2,
+     2,     2,    37,    43,    38,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -229,73 +430,96 @@ static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
      7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
     17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30
+    27,    28,    29,    30,    31,    32,    33,    34,    35,    36
 };
 
 #if YYDEBUG != 0
 static const short yyprhs[] = {     0,
-     0,     4,     7,    10,    12,    15,    18,    20,    22,    27,
-    32,    35,    38,    41,    43,    45,    47,    52,    57,    69,
-    78,    82,    83,    87,    89,    91,    94,    96,    99,   102,
-   105,   107,   110,   113,   115,   117,   119,   121,   124,   126,
-   128,   131,   133,   136,   138,   140,   142,   144,   146,   149,
-   151,   155,   159,   162,   165,   167,   172,   176,   178,   181,
-   183,   193,   203,   212,   225,   235,   245,   251,   254,   258,
-   261,   262,   264,   266,   270,   272,   276,   278,   282,   284,
-   287,   294,   297,   299,   301,   304,   307,   311,   315,   319,
-   323,   325,   328
+     0,     4,     7,    10,    12,    14,    16,    18,    20,    22,
+    24,    27,    29,    34,    38,    44,    45,    51,    57,    60,
+    62,    64,    67,    69,    71,    73,    75,    77,    79,    81,
+    84,    88,    91,    95,    98,   101,   103,   105,   106,   112,
+   119,   132,   142,   149,   153,   154,   160,   162,   166,   167,
+   171,   173,   176,   178,   180,   182,   185,   188,   191,   195,
+   199,   202,   205,   208,   210,   213,   215,   218,   220,   222,
+   224,   226,   228,   230,   232,   234,   236,   238,   240,   242,
+   244,   247,   250,   254,   257,   259,   263,   267,   270,   272,
+   277,   281,   283,   286,   288,   299,   311,   321,   331,   340,
+   352,   361,   367,   370,   375,   376,   378,   381,   383,   385,
+   388,   391,   395,   400,   405,   407,   411,   413,   417,   419,
+   422,   426,   433,   441,   444,   446,   448,   451,   454,   458,
+   462,   466,   470,   472,   475
 };
 
-static const short yyrhs[] = {    46,
-    47,    46,     0,    47,    46,     0,    46,    47,     0,    47,
-     0,    46,    23,     0,    46,    24,     0,    23,     0,    24,
-     0,    48,    31,    49,    32,     0,     3,    22,     4,    22,
-     0,    49,    64,     0,    49,    50,     0,    49,    51,     0,
-    64,     0,    50,     0,    51,     0,    25,    54,    20,    33,
-     0,    26,    54,    20,    33,     0,    27,    52,    20,    20,
-    20,    31,    23,    20,    31,    23,    33,     0,    27,    52,
-    20,    20,    20,    31,    23,    33,     0,    34,    53,    35,
-     0,     0,    20,    36,    53,     0,    20,     0,    55,     0,
-     5,    55,     0,    56,     0,    56,    59,     0,    12,    57,
-     0,    11,    57,     0,    57,     0,    12,    18,     0,    11,
-    18,     0,    18,     0,    17,     0,    16,     0,    20,     0,
-    58,    20,     0,    22,     0,     6,     0,    13,    15,     0,
-    13,     0,    14,    15,     0,    14,     0,    15,     0,     9,
-     0,     8,     0,     7,     0,    37,    59,     0,    37,     0,
-    26,    20,    61,     0,    20,    26,    61,     0,    26,    61,
-     0,    20,    61,     0,    61,     0,    20,    34,    62,    35,
-     0,    62,    38,    20,     0,    20,     0,    31,    23,     0,
-    33,     0,    29,    60,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    26,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    54,    20,    34,    66,    35,    65,    63,
-     0,    30,    34,    22,    35,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    25,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    26,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    20,    34,    20,    35,    63,     0,
-    19,    72,     0,    19,    31,    23,     0,    39,    40,     0,
-     0,     6,     0,    20,     0,    20,    38,    67,     0,    67,
-     0,    68,    38,    10,     0,    68,     0,    68,    38,    69,
-     0,    69,     0,    54,    20,     0,    54,    20,    34,    20,
-    70,    35,     0,    70,    71,     0,    71,     0,    20,     0,
-    41,    72,     0,    42,    72,     0,    41,    39,    72,     0,
-    42,    39,    72,     0,    39,    39,    72,     0,    43,    39,
-    72,     0,    21,     0,    44,    21,     0,    20,     0
+static const short yyrhs[] = {    52,
+    53,    52,     0,    53,    52,     0,    52,    53,     0,    53,
+     0,    23,     0,    26,     0,    24,     0,    25,     0,    27,
+     0,    28,     0,    52,    51,     0,    51,     0,    54,    37,
+    56,    38,     0,    54,    37,    38,     0,     3,    21,     4,
+    21,    55,     0,     0,    39,    19,    19,    40,    55,     0,
+    39,    19,    20,    40,    55,     0,    56,    57,     0,    57,
+     0,    79,     0,    19,    79,     0,    62,     0,    63,     0,
+    41,     0,    29,     0,    30,     0,    31,     0,    32,     0,
+    19,    19,     0,    19,    37,    23,     0,    42,    88,     0,
+    42,    37,    23,     0,    59,    60,     0,    60,    59,     0,
+    60,     0,    59,     0,     0,    58,    68,    19,    61,    41,
+     0,    58,    68,    19,    22,    61,    41,     0,    33,    66,
+    65,    19,    64,    19,    37,    23,    19,    37,    23,    41,
+     0,    33,    66,    65,    19,    64,    19,    37,    23,    41,
+     0,    33,    66,    65,    19,    64,    19,     0,    39,    19,
+    40,     0,     0,    19,    39,    19,    68,    40,     0,    19,
+     0,    39,    67,    40,     0,     0,    19,    43,    67,     0,
+    19,     0,    69,    73,     0,    69,     0,    70,     0,    19,
+     0,     5,    19,     0,    19,     5,     0,    72,    19,     0,
+     5,    72,    19,     0,    72,    19,     5,     0,    71,    70,
+     0,    21,    70,     0,     5,    70,     0,    21,     0,    21,
+     5,     0,    71,     0,    71,     5,     0,     6,     0,    18,
+     0,    14,     0,    15,     0,    13,     0,    16,     0,    17,
+     0,    11,     0,    12,     0,     7,     0,     8,     0,     9,
+     0,    44,     0,    44,     5,     0,    44,    73,     0,    44,
+     5,    73,     0,    19,    76,     0,    76,     0,    58,    19,
+    76,     0,    19,    58,    76,     0,    58,    76,     0,    74,
+     0,    19,    39,    77,    40,     0,    77,    45,    19,     0,
+    19,     0,    37,    23,     0,    41,     0,    35,    66,    75,
+    68,    19,    39,    82,    40,    80,    78,     0,    58,    35,
+    66,    74,    68,    19,    39,    82,    40,    80,    78,     0,
+    34,    58,    68,    19,    39,    82,    40,    80,    78,     0,
+    58,    34,    68,    19,    39,    82,    40,    80,    78,     0,
+    34,    68,    19,    39,    82,    40,    80,    78,     0,    36,
+    39,    21,    40,    68,    19,    39,    82,    40,    80,    78,
+     0,    58,    68,    19,    39,    82,    40,    80,    78,     0,
+    19,    39,    19,    40,    78,     0,    19,    81,     0,    19,
+    81,    19,    81,     0,     0,    88,     0,    37,    23,     0,
+     6,     0,    19,     0,    19,     5,     0,     5,    19,     0,
+    19,    45,    83,     0,    19,     5,    45,    83,     0,     5,
+    19,    45,    83,     0,    83,     0,    84,    45,    10,     0,
+    84,     0,    84,    45,    85,     0,    85,     0,    68,    19,
+     0,    68,    19,    22,     0,    68,    19,    39,    19,    86,
+    40,     0,    68,    19,    22,    39,    19,    86,    40,     0,
+    86,    87,     0,    87,     0,    19,     0,    46,    88,     0,
+    47,    88,     0,    46,    42,    88,     0,    47,    42,    88,
+     0,    42,    42,    88,     0,    48,    42,    88,     0,    20,
+     0,    49,    20,     0,    19,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   179,   180,   181,   182,   185,   189,   193,   197,   203,   210,
-   215,   216,   217,   218,   219,   220,   223,   226,   230,   259,
-   285,   286,   289,   292,   298,   299,   307,   311,   318,   321,
-   324,   327,   330,   333,   336,   339,   342,   345,   349,   352,
-   357,   360,   363,   366,   369,   374,   377,   380,   385,   386,
-   389,   401,   413,   416,   428,   433,   438,   441,   446,   447,
-   451,   461,   471,   481,   487,   492,   497,   518,   519,   523,
-   524,   527,   528,   544,   559,   562,   563,   566,   567,   570,
-   573,   583,   584,   587,   600,   604,   608,   612,   616,   620,
-   626,   627,   631
+   373,   374,   375,   376,   379,   385,   391,   397,   403,   409,
+   417,   418,   421,   426,   433,   439,   440,   452,   466,   467,
+   470,   471,   479,   480,   481,   484,   485,   486,   487,   490,
+   503,   519,   523,   531,   532,   533,   534,   535,   541,   544,
+   549,   600,   648,   731,   739,   741,   750,   756,   757,   760,
+   763,   769,   773,   780,   783,   786,   790,   794,   798,   803,
+   811,   815,   820,   824,   827,   831,   834,   839,   840,   841,
+   842,   843,   844,   845,   846,   847,   850,   851,   852,   855,
+   856,   857,   861,   868,   880,   886,   898,   910,   913,   919,
+   924,   927,   932,   933,   937,   953,   969,   985,  1001,  1012,
+  1018,  1028,  1051,  1062,  1081,  1087,  1088,  1094,  1095,  1106,
+  1117,  1128,  1138,  1148,  1158,  1161,  1162,  1165,  1166,  1169,
+  1172,  1175,  1183,  1193,  1194,  1197,  1210,  1214,  1218,  1222,
+  1226,  1230,  1236,  1237,  1241
 };
 #endif
 
@@ -304,162 +528,222 @@ static const short yyrline[] = { 0,
 
 static const char * const yytname[] = {   "$","error","$undefined.","CLASS",
 "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
-"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
-"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
-"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
-"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype",
-"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
-"arg","checklist","check","numtok", NULL
+"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM",
+"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED",
+"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'",
+"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes",
+"class","classdec","classflags","classcode","thing","scope","destructor","initializer",
+"varoptions","variable","argument","export","argtype","flags","flaglist","type",
+"specifier_list","spec_list","specifier","strunionenum","pointer","simplesigtype",
+"fullsigtype","sigtype","tokenlist","codenocode","method","returnvals","retcode",
+"funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL
 };
 #endif
 
 static const short yyr1[] = {     0,
-    45,    45,    45,    45,    46,    46,    46,    46,    47,    48,
-    49,    49,    49,    49,    49,    49,    50,    50,    51,    51,
-    52,    52,    53,    53,    54,    54,    55,    55,    56,    56,
-    56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
-    57,    57,    57,    57,    57,    58,    58,    58,    59,    59,
-    60,    60,    60,    60,    60,    61,    62,    62,    63,    63,
-    64,    64,    64,    64,    64,    64,    64,    65,    65,    65,
-    65,    66,    66,    66,    66,    67,    67,    68,    68,    69,
-    69,    70,    70,    71,    71,    71,    71,    71,    71,    71,
-    72,    72,    72
+    50,    50,    50,    50,    51,    51,    51,    51,    51,    51,
+    52,    52,    53,    53,    54,    55,    55,    55,    56,    56,
+    57,    57,    57,    57,    57,    58,    58,    58,    58,    59,
+    59,    60,    60,    61,    61,    61,    61,    61,    62,    62,
+    63,    63,    63,    64,    64,    65,    65,    66,    66,    67,
+    67,    68,    68,    69,    69,    69,    69,    69,    69,    69,
+    70,    70,    70,    70,    70,    70,    70,    71,    71,    71,
+    71,    71,    71,    71,    71,    71,    72,    72,    72,    73,
+    73,    73,    73,    74,    74,    75,    75,    75,    75,    76,
+    77,    77,    78,    78,    79,    79,    79,    79,    79,    79,
+    79,    79,    80,    80,    80,    81,    81,    82,    82,    82,
+    82,    82,    82,    82,    82,    83,    83,    84,    84,    85,
+    85,    85,    85,    86,    86,    87,    87,    87,    87,    87,
+    87,    87,    88,    88,    88
 };
 
 static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     4,
-     2,     2,     2,     1,     1,     1,     4,     4,    11,     8,
-     3,     0,     3,     1,     1,     2,     1,     2,     2,     2,
-     1,     2,     2,     1,     1,     1,     1,     2,     1,     1,
-     2,     1,     2,     1,     1,     1,     1,     1,     2,     1,
-     3,     3,     2,     2,     1,     4,     3,     1,     2,     1,
-     9,     9,     8,    12,     9,     9,     5,     2,     3,     2,
-     0,     1,     1,     3,     1,     3,     1,     3,     1,     2,
-     6,     2,     1,     1,     2,     2,     3,     3,     3,     3,
-     1,     2,     1
+     3,     2,     2,     1,     1,     1,     1,     1,     1,     1,
+     2,     1,     4,     3,     5,     0,     5,     5,     2,     1,
+     1,     2,     1,     1,     1,     1,     1,     1,     1,     2,
+     3,     2,     3,     2,     2,     1,     1,     0,     5,     6,
+    12,     9,     6,     3,     0,     5,     1,     3,     0,     3,
+     1,     2,     1,     1,     1,     2,     2,     2,     3,     3,
+     2,     2,     2,     1,     2,     1,     2,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     2,     2,     3,     2,     1,     3,     3,     2,     1,     4,
+     3,     1,     2,     1,    10,    11,     9,     9,     8,    11,
+     8,     5,     2,     4,     0,     1,     2,     1,     1,     2,
+     2,     3,     4,     4,     1,     3,     1,     3,     1,     2,
+     3,     6,     7,     2,     1,     1,     2,     2,     3,     3,
+     3,     3,     1,     2,     1
 };
 
 static const short yydefact[] = {     0,
-     0,     7,     8,     0,     4,     0,     0,     5,     6,     3,
-     2,     0,     0,     1,     0,     0,     0,    22,     0,     0,
-     0,     0,    15,    16,    14,    10,     0,     0,    40,    48,
-    47,    46,     0,     0,    42,    44,    45,    36,    35,    34,
-    37,    39,     0,    25,    27,    31,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    55,     0,     9,    12,    13,
-    11,     0,    26,    33,    30,    32,    29,    41,    43,     0,
-    50,    28,    38,     0,    24,     0,     0,     0,     0,     0,
-     0,     0,    54,     0,    53,     0,     0,     0,    17,     0,
-    49,    18,     0,     0,    21,     0,     0,     0,    52,    58,
-     0,    51,     0,     0,     0,    60,    67,    40,    37,     0,
-     0,    75,    77,    79,     0,    23,     0,     0,     0,    56,
-     0,     0,     0,    59,     0,    80,    71,     0,    71,     0,
-     0,    71,    57,     0,     0,    74,     0,     0,     0,     0,
-    76,    78,     0,     0,    71,     0,    71,     0,     0,    93,
-    91,     0,     0,    68,    70,     0,     0,     0,    20,     0,
-    63,     0,     0,    84,     0,     0,     0,     0,     0,    83,
-    69,    92,    65,    66,     0,    62,    61,    71,     0,     0,
-    85,     0,    86,     0,    81,    82,     0,     0,    89,    87,
-    88,    90,    19,     0,    64,     0,     0,     0
+     0,     5,     7,     8,     6,     9,    10,    12,     0,     4,
+     0,     0,    11,     3,     2,     0,     0,     1,     0,    26,
+    27,    28,    29,    49,     0,    49,     0,    14,    25,     0,
+    20,     0,    23,    24,    21,    16,     0,     0,     0,    22,
+     0,     0,     0,    68,    77,    78,    79,    75,    76,    72,
+    70,    71,    73,    74,    69,    55,    64,     0,     0,    53,
+    54,    66,     0,     0,     0,    13,    19,     0,    49,     0,
+     0,    15,     0,     0,    51,     0,    47,     0,     0,    56,
+    63,     0,    57,    65,    62,     0,     0,    80,    52,    67,
+    61,    58,     0,     0,    89,     0,    85,     0,     0,     0,
+    38,     0,     0,     0,     0,    48,     0,    45,    59,     0,
+     0,    81,    82,    60,     0,     0,     0,    84,     0,    88,
+     0,     0,     0,     0,     0,     0,    38,     0,     0,    37,
+    36,     0,     0,     0,     0,    94,   102,    50,     0,     0,
+     0,     0,     0,    68,    55,     0,     0,   115,   117,   119,
+    83,    92,     0,    87,    86,     0,     0,     0,     0,    30,
+     0,     0,     0,   135,   133,     0,     0,    32,    34,    35,
+    39,    16,    16,    93,     0,     0,    43,     0,    56,    57,
+     0,   120,   105,     0,    90,     0,     0,     0,     0,     0,
+    31,    40,   105,    33,   134,    17,    18,    46,    44,     0,
+   105,     0,     0,   112,   121,     0,     0,     0,   116,   118,
+    91,     0,     0,   105,     0,     0,     0,     0,   114,   113,
+     0,     0,     0,   103,   106,    99,   105,     0,     0,     0,
+   101,     0,    42,    97,     0,   126,     0,     0,     0,     0,
+     0,   125,   107,     0,     0,   105,    98,   105,     0,     0,
+     0,     0,   127,     0,   128,     0,   122,   124,   104,    95,
+     0,     0,     0,   123,   131,   129,   130,   132,   100,    96,
+    41,     0,     0,     0
 };
 
-static const short yydefgoto[] = {   196,
-     4,     5,     6,    22,    23,    24,    50,    76,   110,    44,
-    45,    46,    47,    72,    55,    56,   101,   107,    25,   140,
-   111,   112,   113,   114,   169,   170,   154
+static const short yydefgoto[] = {   272,
+     8,     9,    10,    11,    72,    30,    31,    32,   130,   131,
+   132,    33,    34,   141,    78,    42,    76,   146,    60,    61,
+    62,    63,    89,    95,    96,    97,   153,   137,    35,   208,
+   224,   147,   148,   149,   150,   241,   242,   225
 };
 
-static const short yypact[] = {    21,
-   -18,-32768,-32768,    68,    66,    20,    54,-32768,-32768,    66,
-   155,   171,     0,   155,    48,   116,   116,    52,    61,   -14,
-    59,   160,-32768,-32768,-32768,-32768,    29,   151,-32768,-32768,
--32768,-32768,    81,   189,   111,   120,-32768,-32768,-32768,-32768,
--32768,-32768,   117,-32768,    64,-32768,   124,   133,   135,   152,
-   116,   154,   150,   163,   116,-32768,   186,-32768,-32768,-32768,
--32768,   158,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   148,
-    64,-32768,-32768,   161,   173,   175,   191,   192,   179,   180,
-   195,   196,-32768,    28,-32768,   197,   183,    86,-32768,   134,
--32768,-32768,   134,   135,-32768,   199,   187,   134,-32768,-32768,
-   -22,-32768,   188,   116,   200,-32768,-32768,   185,    18,   204,
-   190,-32768,   193,-32768,   194,-32768,   201,   134,   198,-32768,
-   206,   134,   207,-32768,   116,   202,    41,    98,    41,   205,
-   203,    41,-32768,   208,   210,-32768,   214,    -6,   209,   211,
--32768,-32768,   215,    26,    41,    86,    41,   134,    22,-32768,
--32768,   212,   216,-32768,-32768,   217,   218,   219,-32768,    86,
--32768,    86,   213,-32768,   220,    -3,     8,   221,    -9,-32768,
--32768,-32768,-32768,-32768,   222,-32768,-32768,    41,    -1,    -1,
--32768,    -1,-32768,    -1,-32768,-32768,   223,   224,-32768,-32768,
--32768,-32768,-32768,   228,-32768,   230,   239,-32768
+static const short yypact[] = {   175,
+    34,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   175,   236,
+    47,   104,-32768,   236,   236,   176,    96,   236,   212,-32768,
+-32768,-32768,-32768,   107,   158,   107,   109,-32768,-32768,   194,
+-32768,   123,-32768,-32768,-32768,   110,   111,   124,   123,-32768,
+   135,   136,   278,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,   154,   346,   295,   149,   138,
+-32768,   360,   161,   162,   163,-32768,-32768,   295,   107,   164,
+   166,-32768,   146,   177,   172,   157,   165,   197,   374,-32768,
+-32768,   199,-32768,   374,-32768,   200,   181,     2,-32768,   374,
+-32768,   216,   226,   203,-32768,   295,-32768,   193,   215,   217,
+    57,    74,    37,   198,   135,-32768,   219,   201,-32768,   210,
+   312,   138,-32768,-32768,   211,   220,   233,-32768,    -2,-32768,
+   234,   295,   242,    -2,   295,    -8,    -6,   312,    38,   246,
+   235,   257,   265,   275,   299,-32768,-32768,-32768,   295,   313,
+   320,   312,   329,   309,     5,   334,   314,-32768,   310,-32768,
+-32768,-32768,   -20,-32768,-32768,   317,   349,   312,   350,-32768,
+   347,   341,   343,-32768,-32768,   361,   373,-32768,-32768,-32768,
+-32768,   110,   110,-32768,   354,   356,   362,   357,   -18,    81,
+   295,    61,   379,   261,-32768,   381,   312,   363,   364,   366,
+-32768,-32768,   379,-32768,-32768,-32768,-32768,-32768,-32768,   378,
+   379,   295,   295,-32768,   367,   384,    40,    37,-32768,-32768,
+-32768,   368,   312,   379,   312,    37,    29,    37,-32768,-32768,
+   388,   114,   386,   391,-32768,-32768,   379,   371,    37,   372,
+-32768,   376,-32768,-32768,   114,-32768,   375,    46,    62,   377,
+    72,-32768,-32768,    40,    37,   379,-32768,   379,   392,   105,
+    48,    48,-32768,    48,-32768,    48,-32768,-32768,-32768,-32768,
+    37,    37,   380,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   414,   416,-32768
 };
 
 static const short yypgoto[] = {-32768,
-    45,   243,-32768,-32768,   231,   232,-32768,   164,   -16,   229,
--32768,   172,-32768,   181,-32768,   -44,-32768,    15,   240,  -124,
-   -91,   136,-32768,   137,-32768,    94,   -82
+    98,    14,   409,-32768,   -67,-32768,   390,   -13,   291,   293,
+   297,-32768,-32768,-32768,-32768,   -22,   321,   -24,-32768,   -41,
+-32768,   -40,   -79,   325,-32768,   -63,-32768,  -176,   408,  -175,
+   184,  -123,  -140,-32768,   245,   195,  -227,  -129
 };
 
 
-#define        YYLAST          265
-
-
-static const short yytable[] = {    43,
-    48,   115,    52,     7,   143,    53,   119,   146,    83,    85,
-   164,    54,   120,   150,   151,   121,   150,   151,   150,   151,
-   160,    26,   162,     1,   152,   185,   131,   150,   151,   165,
-   134,   166,   167,   168,    78,   180,    99,   153,    86,   102,
-   153,   164,   153,     2,     3,   158,   182,    80,    62,    11,
-    12,   153,   -73,   188,    14,   125,   163,    13,   159,   138,
-   165,    82,   166,   167,   168,    28,    29,    30,    31,    32,
-     1,    33,    34,    35,    36,    37,    38,    39,    40,   139,
-    41,    27,    42,   181,   183,    49,    51,   123,     2,     3,
-     8,     9,    57,    35,    36,    37,   189,   190,    64,   191,
-    71,   192,    28,    29,    30,    31,    32,   141,    33,    34,
-    35,    36,    37,    38,    39,    40,   105,    41,   106,    42,
-    28,    29,    30,    31,    32,    68,    33,    34,    35,    36,
-    37,    38,    39,    40,    69,    41,    70,    42,    28,   108,
-    30,    31,    32,    73,    33,    34,    35,    36,    37,    38,
-    39,    40,    74,   109,    75,    42,    29,    30,    31,    32,
-   161,    33,    34,    35,    36,    37,    38,    39,    40,    80,
-    41,    77,    42,    79,   176,    81,   177,     8,     9,    15,
-    89,    90,    84,    82,    16,    17,    18,    19,    20,    21,
-    15,    58,    88,    92,    93,    16,    17,    18,    19,    20,
-    21,    35,    36,    37,    65,    67,    66,    87,    94,    95,
-    96,    97,    98,    82,    80,   100,   103,   104,   117,   -72,
-   118,   122,   124,   126,   127,   133,   135,   144,   129,   197,
-   128,   130,   132,   149,   171,   137,   172,   145,   198,   173,
-   174,   156,   147,   148,   187,   157,    10,   178,   155,   175,
-   195,    91,    59,    60,   194,   193,    63,   116,   179,   184,
-   136,    61,   186,     0,   142
+#define        YYLAST          430
+
+
+static const short yytable[] = {   168,
+    59,    81,    82,    64,   163,    39,   112,    70,   113,   180,
+   160,    58,   126,   258,    74,    85,   115,   216,   178,   185,
+    91,  -111,   258,    15,   186,   218,   202,    18,   161,   118,
+   120,   226,   151,    86,   189,   129,   116,    81,   229,   231,
+   204,   234,    81,    99,  -109,    88,   100,   232,    81,   181,
+    94,   245,   247,   154,    12,   155,   164,   165,   164,   165,
+   118,   219,   220,   212,   164,   165,   164,   165,   260,   233,
+   261,   121,   262,   135,   166,   126,   223,   136,   127,   117,
+   164,   165,   205,    16,   269,   270,   167,   252,   167,   228,
+   236,   230,   133,   134,   167,   128,   167,   157,   129,   206,
+   159,    81,    82,   254,   196,   197,    13,    17,   253,   255,
+   167,   257,    13,   237,   175,    13,    36,   238,   239,   240,
+  -110,   265,   266,   236,   267,   203,   268,    43,    44,    45,
+    46,    47,   236,    48,    49,    50,    51,    52,    53,    54,
+    55,    56,    73,    57,   264,    41,   237,    65,    71,    38,
+   238,   239,   240,    75,    77,   237,    68,    69,    83,   238,
+   239,   240,    43,    44,    45,    46,    47,    87,    48,    49,
+    50,    51,    52,    53,    54,    55,    56,     1,    57,    92,
+    93,    88,   101,    98,   102,   103,    20,    21,    22,    23,
+    20,    21,    22,    23,    19,   104,   106,     2,     3,     4,
+     5,     6,     7,   107,    20,    21,    22,    23,    24,    25,
+    26,    27,    19,    28,   105,   108,    29,   109,   110,   111,
+   114,   119,    20,    21,    22,    23,    24,    25,    26,    27,
+    37,    66,   122,   123,    29,   124,   128,   139,   152,   140,
+    20,    21,    22,    23,   115,    25,    26,    27,   142,   116,
+    38,   115,   156,   126,    20,    21,    22,    23,     2,     3,
+     4,     5,     6,     7,   116,    43,    44,    45,    46,    47,
+   209,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+   158,    57,    79,    44,    45,    46,    47,   129,    48,    49,
+    50,    51,    52,    53,    54,    55,    80,   171,    57,    43,
+    44,    45,    46,    47,   172,    48,    49,    50,    51,    52,
+    53,    54,    55,    56,   173,    57,   143,   144,    45,    46,
+    47,   174,    48,    49,    50,    51,    52,    53,    54,    55,
+   145,   176,    57,    79,    44,    45,    46,    47,   177,    48,
+    49,    50,    51,    52,    53,    54,    55,   179,  -108,    57,
+    84,    44,   182,   183,   184,   187,    48,    49,    50,    51,
+    52,    53,    54,    55,    90,    44,    57,   188,   190,   191,
+    48,    49,    50,    51,    52,    53,    54,    55,    79,    44,
+    57,   192,   193,   194,    48,    49,    50,    51,    52,    53,
+    54,    55,   195,   198,    57,   199,   201,   207,   200,   211,
+   217,   213,   222,   214,   215,   221,   235,   227,   243,   244,
+   246,   248,   249,   273,   263,   274,   251,    14,   256,    67,
+   271,   170,   169,   162,   125,   138,    40,   259,   210,   250
 };
 
-static const short yycheck[] = {    16,
-    17,    93,    19,    22,   129,    20,    98,   132,    53,    54,
-    20,    26,    35,    20,    21,    38,    20,    21,    20,    21,
-   145,    22,   147,     3,    31,    35,   118,    20,    21,    39,
-   122,    41,    42,    43,    51,    39,    81,    44,    55,    84,
-    44,    20,    44,    23,    24,    20,    39,    20,    20,     5,
-    31,    44,    35,   178,    10,    38,   148,     4,    33,    19,
-    39,    34,    41,    42,    43,     5,     6,     7,     8,     9,
-     3,    11,    12,    13,    14,    15,    16,    17,    18,    39,
-    20,    34,    22,   166,   167,    34,    26,   104,    23,    24,
-    23,    24,    34,    13,    14,    15,   179,   180,    18,   182,
-    37,   184,     5,     6,     7,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    31,    20,    33,    22,
-     5,     6,     7,     8,     9,    15,    11,    12,    13,    14,
-    15,    16,    17,    18,    15,    20,    20,    22,     5,     6,
-     7,     8,     9,    20,    11,    12,    13,    14,    15,    16,
-    17,    18,    20,    20,    20,    22,     6,     7,     8,     9,
-   146,    11,    12,    13,    14,    15,    16,    17,    18,    20,
-    20,    20,    22,    20,   160,    26,   162,    23,    24,    20,
-    33,    34,    20,    34,    25,    26,    27,    28,    29,    30,
-    20,    32,    35,    33,    34,    25,    26,    27,    28,    29,
-    30,    13,    14,    15,    33,    34,    18,    22,    36,    35,
-    20,    20,    34,    34,    20,    20,    20,    35,    20,    35,
-    34,    34,    23,    20,    35,    20,    20,    23,    35,     0,
-    38,    31,    35,    20,    23,    34,    21,    35,     0,    23,
-    23,    31,    35,    34,    23,    31,     4,    35,    40,    31,
-    23,    71,    22,    22,    31,    33,    28,    94,    39,    39,
-   125,    22,   169,    -1,   128
+static const short yycheck[] = {   129,
+    25,    43,    43,    26,   128,    19,     5,    32,    88,     5,
+    19,    25,    19,   241,    39,    57,    19,   193,   142,    40,
+    62,    40,   250,    10,    45,   201,    45,    14,    37,    93,
+    94,   208,   112,    58,   158,    42,    39,    79,   214,   216,
+   181,   218,    84,    68,    40,    44,    69,    19,    90,    45,
+    64,   227,   229,   117,    21,   119,    19,    20,    19,    20,
+   124,   202,   203,   187,    19,    20,    19,    20,   245,    41,
+   246,    96,   248,    37,    37,    19,    37,    41,    22,    93,
+    19,    20,    22,    37,   261,   262,    49,    42,    49,   213,
+    19,   215,    19,    20,    49,    39,    49,   122,    42,    39,
+   125,   143,   143,    42,   172,   173,     9,     4,   238,   239,
+    49,    40,    15,    42,   139,    18,    21,    46,    47,    48,
+    40,   251,   252,    19,   254,    45,   256,     5,     6,     7,
+     8,     9,    19,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    19,    21,    40,    39,    42,    39,    39,    39,
+    46,    47,    48,    19,    19,    42,    34,    35,     5,    46,
+    47,    48,     5,     6,     7,     8,     9,    19,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,     3,    21,    19,
+    19,    44,    19,    21,    19,    40,    29,    30,    31,    32,
+    29,    30,    31,    32,    19,    19,    40,    23,    24,    25,
+    26,    27,    28,    39,    29,    30,    31,    32,    33,    34,
+    35,    36,    19,    38,    43,    19,    41,    19,    19,    39,
+     5,    19,    29,    30,    31,    32,    33,    34,    35,    36,
+    19,    38,    40,    19,    41,    19,    39,    19,    19,    39,
+    29,    30,    31,    32,    19,    34,    35,    36,    39,    39,
+    39,    19,    19,    19,    29,    30,    31,    32,    23,    24,
+    25,    26,    27,    28,    39,     5,     6,     7,     8,     9,
+    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    39,    21,     5,     6,     7,     8,     9,    42,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    41,    21,     5,
+     6,     7,     8,     9,    40,    11,    12,    13,    14,    15,
+    16,    17,    18,    19,    40,    21,     5,     6,     7,     8,
+     9,    23,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    19,    21,     5,     6,     7,     8,     9,    19,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    40,    21,
+     5,     6,    19,    40,    45,    39,    11,    12,    13,    14,
+    15,    16,    17,    18,     5,     6,    21,    19,    19,    23,
+    11,    12,    13,    14,    15,    16,    17,    18,     5,     6,
+    21,    41,    40,    23,    11,    12,    13,    14,    15,    16,
+    17,    18,    20,    40,    21,    40,    40,    19,    37,    19,
+    23,    39,    19,    40,    39,    39,    19,    40,    23,    19,
+    40,    40,    37,     0,    23,     0,    42,     9,    42,    30,
+    41,   131,   130,   127,   100,   105,    19,   244,   184,   235
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/lib/bison.simple"
@@ -1005,373 +1289,716 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 179 "parse.y"
+#line 373 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 180 "parse.y"
+#line 374 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 181 "parse.y"
+#line 375 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 182 "parse.y"
+#line 376 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 185 "parse.y"
+#line 379 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 6:
-#line 189 "parse.y"
+#line 385 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 7:
-#line 193 "parse.y"
+#line 391 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 8:
-#line 197 "parse.y"
+#line 397 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 9:
-#line 203 "parse.y"
+#line 403 "parse.y"
 {
-                       ((Class *)class)->nodes = class_nodes;
-                       class_nodes = NULL;
-                       nodes = g_list_append(nodes,class);
-                                               ;
+                       Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
+                       nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       ;
     break;}
 case 10:
-#line 210 "parse.y"
+#line 409 "parse.y"
 {
-                       class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
-                                               ;
+                       Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
+                       nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       ;
     break;}
 case 11:
-#line 215 "parse.y"
+#line 417 "parse.y"
 { ; ;
     break;}
 case 12:
-#line 216 "parse.y"
+#line 418 "parse.y"
 { ; ;
     break;}
 case 13:
-#line 217 "parse.y"
-{ ; ;
+#line 421 "parse.y"
+{
+                       ((Class *)class)->nodes = class_nodes;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
+                                               ;
     break;}
 case 14:
-#line 218 "parse.y"
-{ ; ;
-    break;}
-case 15:
-#line 219 "parse.y"
-{ ; ;
-    break;}
-case 16:
-#line 220 "parse.y"
-{ ; ;
-    break;}
-case 17:
-#line 223 "parse.y"
+#line 426 "parse.y"
 {
-                       push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line);
+                       ((Class *)class)->nodes = NULL;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
                                                ;
     break;}
-case 18:
-#line 226 "parse.y"
+case 15:
+#line 433 "parse.y"
 {
-                       push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line);
+                       class = new_class (yyvsp[-3].id, yyvsp[-1].id,
+                                          bonobo_x_class, chunk_size, NULL);
                                                ;
     break;}
-case 19:
-#line 230 "parse.y"
-{
-                       if(strcmp(yyvsp[-6].id,"get")==0 &&
-                          strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-10].line);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-6].id,"set")==0 &&
-                               strcmp(yyvsp[-3].id,"get")==0) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line,
-                                                   yyvsp[-10].line);
-                               class_nodes = g_list_append(class_nodes,node);
+case 17:
+#line 440 "parse.y"
+{
+                       if(strcmp(yyvsp[-3].id,"chunks") == 0) {
+                               g_free (chunk_size);
+                               chunk_size = g_strdup(yyvsp[-2].id);
+                       } else if(strcmp(yyvsp[-3].id,"BonoboX") == 0) {
+                               g_free (bonobo_x_class);
+                               bonobo_x_class = g_strdup(yyvsp[-2].id);
                        } else {
-                               g_free(yyvsp[-8].id); g_free(yyvsp[-7].id);
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
-                               g_string_free(yyvsp[-4].cbuf,TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
-                                               ;
+               ;
     break;}
-case 20:
-#line 259 "parse.y"
-{
-                       if(strcmp(yyvsp[-3].id,"get")==0) {
-                               Node *node;
-                               g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0,
-                                                   yyvsp[-7].line);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
-                               g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-7].line);
-                               class_nodes = g_list_append(class_nodes,node);
+case 18:
+#line 452 "parse.y"
+{
+                       if(strcmp(yyvsp[-3].id,"chunks") == 0) {
+                               g_free (chunk_size);
+                               if(atoi(yyvsp[-2].id) != 0)
+                                       chunk_size = g_strdup(yyvsp[-2].id);
+                               else
+                                       chunk_size = NULL;
                        } else {
-                               g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
-                               g_free(yyvsp[-4].id);
-                               g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
-                                               ;
+               ;
+    break;}
+case 19:
+#line 466 "parse.y"
+{ ; ;
+    break;}
+case 20:
+#line 467 "parse.y"
+{ ; ;
     break;}
 case 21:
-#line 285 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
+#line 470 "parse.y"
+{ ; ;
     break;}
 case 22:
-#line 286 "parse.y"
-{ yyval.list = NULL; ;
-    break;}
-case 23:
-#line 289 "parse.y"
+#line 471 "parse.y"
 {
-                       yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
+                       if (strcmp (yyvsp[-1].id, "BonoboX") != 0) {
+                               g_free(yyvsp[-1].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       last_added_method->bonobo_x_func = TRUE;
                                                ;
     break;}
+case 23:
+#line 479 "parse.y"
+{ ; ;
+    break;}
 case 24:
-#line 292 "parse.y"
-{
-                       yyval.list = g_list_append(NULL,yyvsp[0].id);
-                                               ;
+#line 480 "parse.y"
+{ ; ;
     break;}
 case 25:
-#line 298 "parse.y"
+#line 481 "parse.y"
 { ; ;
     break;}
 case 26:
-#line 299 "parse.y"
-{
-                       Type *type = typestack->data;
-                       char *oldname = type->name;
-                       type->name = g_strconcat("const ",oldname,NULL);
-                       g_free(oldname);
-                                               ;
+#line 484 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
     break;}
 case 27:
-#line 307 "parse.y"
-{
-                       Node *node = new_type(0,yyvsp[0].id);
-                       typestack = g_list_prepend(typestack,node);
-                                               ;
+#line 485 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
     break;}
 case 28:
-#line 311 "parse.y"
-{
-                       Node *node = new_type(stars,yyvsp[-1].id);
-                       stars = 0;
-                       typestack = g_list_prepend(typestack,node);
-                                               ;
+#line 486 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
     break;}
 case 29:
-#line 318 "parse.y"
-{
-                       yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
-                                               ;
+#line 487 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
     break;}
 case 30:
-#line 321 "parse.y"
+#line 490 "parse.y"
 {
-                       yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
-                                               ;
+                       if(strcmp(yyvsp[-1].id, "destroywith")==0) {
+                               g_free(yyvsp[-1].id);
+                               destructor = yyvsp[0].id;
+                               destructor_line = line_no;
+                               destructor_simple = TRUE;
+                       } else {
+                               g_free(yyvsp[-1].id);
+                               g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                               ;
     break;}
 case 31:
-#line 324 "parse.y"
+#line 503 "parse.y"
 {
-                       yyval.id = g_strdup(yyvsp[0].id);
-                                               ;
+                       if(strcmp(yyvsp[-2].id, "destroy")==0) {
+                               g_free(yyvsp[-2].id);
+                               destructor = (yyvsp[0].cbuf)->str;
+                               g_string_free(yyvsp[0].cbuf, FALSE);
+                               destructor_line = ccode_line;
+                               destructor_simple = FALSE;
+                       } else {
+                               g_free(yyvsp[-2].id);
+                               g_string_free(yyvsp[0].cbuf, TRUE);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       ;
     break;}
 case 32:
-#line 327 "parse.y"
+#line 519 "parse.y"
 {
-                       yyval.id = g_strdup("unsigned char");
-                                               ;
+                       initializer = yyvsp[0].id;
+                       initializer_line = ccode_line;
+                               ;
     break;}
 case 33:
-#line 330 "parse.y"
+#line 523 "parse.y"
 {
-                       yyval.id = g_strdup("signed char");
-                                               ;
+                       initializer = (yyvsp[0].cbuf)->str;
+                       initializer_line = ccode_line;
+                       g_string_free(yyvsp[0].cbuf, FALSE);
+                               ;
     break;}
 case 34:
-#line 333 "parse.y"
-{
-                       yyval.id = g_strdup("char");
-                                               ;
+#line 531 "parse.y"
+{ ; ;
     break;}
 case 35:
-#line 336 "parse.y"
-{
-                       yyval.id = g_strdup("double");
-                                               ;
+#line 532 "parse.y"
+{ ; ;
     break;}
 case 36:
-#line 339 "parse.y"
-{
-                       yyval.id = g_strdup("float");
-                                               ;
+#line 533 "parse.y"
+{ destructor = NULL; ;
     break;}
 case 37:
-#line 342 "parse.y"
-{
-                       yyval.id = yyvsp[0].id;
-                                               ;
+#line 534 "parse.y"
+{ initializer = NULL; ;
     break;}
 case 38:
-#line 345 "parse.y"
+#line 535 "parse.y"
 {
-                       yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
-                       g_free(yyvsp[0].id);
-                                               ;
+                       destructor = NULL;
+                       initializer = NULL;
+                                       ;
     break;}
 case 39:
-#line 349 "parse.y"
+#line 541 "parse.y"
 {
-                       yyval.id = yyvsp[0].id;
+                       push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
                                                ;
     break;}
 case 40:
-#line 352 "parse.y"
+#line 544 "parse.y"
 {
-                       yyval.id = g_strdup("void");
+                       push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
                                                ;
     break;}
 case 41:
-#line 357 "parse.y"
+#line 549 "parse.y"
 {
-                       yyval.id = "long int";
+                       if(strcmp(yyvsp[-6].id,"get")==0 &&
+                          strcmp(yyvsp[-3].id,"set")==0) {
+                               Node *node;
+                               Type *type = pop_type();
+                               g_free (yyvsp[-6].id); 
+                               g_free (yyvsp[-3].id);
+                               node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id,
+                                                    (yyvsp[-4].cbuf)->str, yyvsp[-5].line,
+                                                    (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+                                                    yyvsp[-11].line);
+
+                               class_nodes = g_list_append(class_nodes,node);
+
+                               if (yyvsp[-7].id) {
+                                       export_accessors (yyvsp[-8].id, 
+                                                         yyvsp[-4].cbuf, yyvsp[-5].line,
+                                                         yyvsp[-1].cbuf, yyvsp[-2].line,
+                                                         type,
+                                                         yyvsp[-11].line);
+                               } 
+
+                               g_string_free (yyvsp[-4].cbuf, FALSE);
+                               g_string_free (yyvsp[-1].cbuf, FALSE);
+
+                       } else if(strcmp(yyvsp[-6].id,"set")==0 &&
+                               strcmp(yyvsp[-3].id,"get")==0) {
+                               Node *node;
+                               Type *type = pop_type();
+                               g_free (yyvsp[-6].id); 
+                               g_free (yyvsp[-3].id);
+                               node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id,
+                                                    (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+                                                    (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
+                                                    yyvsp[-11].line);
+                               g_string_free (yyvsp[-1].cbuf, FALSE);
+                               g_string_free (yyvsp[-4].cbuf, FALSE);
+                               class_nodes = g_list_append(class_nodes,node);
+                       } else {
+                               g_free (yyvsp[-9].id); 
+                               g_free (yyvsp[-8].id);
+                               g_free (yyvsp[-6].id); 
+                               g_free (yyvsp[-3].id);
+                               g_list_foreach (yyvsp[-10].list, (GFunc)g_free, NULL);
+                               g_list_free (yyvsp[-10].list);
+                               g_string_free (yyvsp[-1].cbuf, TRUE);
+                               g_string_free (yyvsp[-4].cbuf, TRUE);
+                               yyerror (_("parse error"));
+                               YYERROR;
+                       }
                                                ;
     break;}
 case 42:
-#line 360 "parse.y"
+#line 600 "parse.y"
 {
-                       yyval.id = "long";
+                       if(strcmp(yyvsp[-3].id, "get") == 0) {
+                               Node *node;
+                               Type *type = pop_type();
+                               g_free (yyvsp[-3].id);
+                               node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id,
+                                                    (yyvsp[-1].cbuf)->str, yyvsp[-2].line,
+                                                    NULL, 0, 
+                                                    yyvsp[-8].line);
+                               if (yyvsp[-4].id) {
+                                       export_accessors (yyvsp[-5].id, 
+                                                         yyvsp[-1].cbuf, yyvsp[-2].line,
+                                                         NULL, 0,
+                                                         type,
+                                                         yyvsp[-8].line);
+                               } 
+
+                               g_string_free (yyvsp[-1].cbuf, FALSE);
+                               class_nodes = g_list_append(class_nodes, node);
+                       } else if(strcmp(yyvsp[-3].id, "set") == 0) {
+                               Node *node;
+                               Type *type = pop_type();
+                               g_free (yyvsp[-3].id);
+                               node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id,
+                                                    NULL, 0, 
+                                                    (yyvsp[-1].cbuf)->str, yyvsp[-2].line, 
+                                                    yyvsp[-8].line);
+                               if (yyvsp[-4].id) {
+                                       export_accessors (yyvsp[-5].id, 
+                                                         NULL, 0,
+                                                         yyvsp[-1].cbuf, yyvsp[-2].line,
+                                                         type,
+                                                         yyvsp[-8].line);
+                               } 
+
+                               g_string_free (yyvsp[-1].cbuf, FALSE);
+                               class_nodes = g_list_append (class_nodes, node);
+                       } else {
+                               g_free (yyvsp[-3].id); 
+                               g_free (yyvsp[-6].id);
+                               g_free (yyvsp[-5].id);
+                               g_list_foreach (yyvsp[-7].list, (GFunc)g_free, NULL);
+                               g_list_free (yyvsp[-7].list);
+                               g_string_free (yyvsp[-1].cbuf, TRUE);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
                                                ;
     break;}
 case 43:
-#line 363 "parse.y"
-{
-                       yyval.id = "short int";
+#line 648 "parse.y"
+{
+                       Node *node;
+                       char *get, *set = NULL;
+                       Variable *var;
+                       Type *type;
+                       char *root;
+                       
+                       if(strcmp(yyvsp[0].id, "link")!=0 &&
+                          strcmp(yyvsp[0].id, "stringlink")!=0 && 
+                          strcmp(yyvsp[0].id, "objectlink")!=0) {
+                               g_free(yyvsp[0].id); 
+                               g_free(yyvsp[-3].id);
+                               g_free(yyvsp[-2].id);
+                               g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL);
+                               g_list_free(yyvsp[-4].list);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+
+                       type = pop_type();
+
+                       var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].line);
+                       if(var->scope == PRIVATE_SCOPE)
+                               root = "self->_priv";
+                       else if(var->scope == CLASS_SCOPE) {
+                               root = "SELF_GET_CLASS(self)";
+                               if(no_self_alias)
+                                       error_print(GOB_ERROR, yyvsp[-5].line,
+                                                   _("Self aliases needed when autolinking to a classwide member"));
+                       } else
+                               root = "self";
+
+                       if(strcmp(yyvsp[0].id, "link")==0) {
+                               set = g_strdup_printf("%s->%s = ARG;",
+                                                     root, yyvsp[-2].id);
+                       } else if(strcmp (yyvsp[0].id, "stringlink")==0) {
+                               set = g_strdup_printf("g_free(%s->%s); "
+                                                     "%s->%s = g_strdup(ARG);",
+                                                     root, yyvsp[-2].id,
+                                                     root, yyvsp[-2].id);
+                       } else if(strcmp (yyvsp[0].id, "objectlink")==0) {
+                               set = g_strdup_printf(
+                                 "if (ARG != NULL) "
+                                  "gtk_object_ref (GTK_OBJECT (ARG)); "
+                                 "if (%s->%s != NULL) "
+                                  "gtk_object_unref (GTK_OBJECT (%s->%s)); "
+                                 "%s->%s = ARG;",
+                                 root, yyvsp[-2].id,
+                                 root, yyvsp[-2].id,
+                                 root, yyvsp[-2].id);
+                       } else {
+                               g_assert_not_reached();
+                       }
+
+                       if(strcmp (yyvsp[0].id, "stringlink")==0) {
+                               get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, yyvsp[-2].id);
+                       } else
+                               /* For everything else, get is just straight assignment */
+                               get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-2].id);
+
+                       g_free (yyvsp[0].id);
+
+
+                       if(!type)
+                               type = copy_type(var->vtype);
+
+                       node = new_argument (yyvsp[-3].id, type, yyvsp[-4].list,
+                                            yyvsp[-2].id, 
+                                            get, yyvsp[-5].line,
+                                            set, yyvsp[-5].line, 
+                                            yyvsp[-5].line);
+                       if (yyvsp[-1].id) {
+                               export_accessors (yyvsp[-2].id, 
+                                                 g_string_new (get), yyvsp[-5].line,
+                                                 g_string_new (set), yyvsp[-5].line,
+                                                 type,
+                                                 yyvsp[-5].line);
+                       } 
+
+                       class_nodes = g_list_append(class_nodes,node);
                                                ;
     break;}
 case 44:
-#line 366 "parse.y"
+#line 731 "parse.y"
 {
-                       yyval.id = "short";
-                                               ;
+                                                 if (strcmp (yyvsp[-1].id, "export")!=0) {
+                                                         g_free (yyvsp[-1].id); 
+                                                         yyerror (_("parse error"));
+                                                         YYERROR;
+                                                 }
+                                                 yyval.id = yyvsp[-1].id;
+                                                ;
     break;}
 case 45:
-#line 369 "parse.y"
-{
-                       yyval.id = "int";
-                                               ;
+#line 739 "parse.y"
+{ yyval.id = NULL; ;
     break;}
 case 46:
-#line 374 "parse.y"
+#line 741 "parse.y"
 {
-                       yyval.id = "enum ";
+                       if(strcmp(yyvsp[-2].id,"type")!=0) {
+                               g_free(yyvsp[-4].id);
+                               g_free(yyvsp[-2].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       yyval.id = yyvsp[-4].id;
                                                ;
     break;}
 case 47:
-#line 377 "parse.y"
+#line 750 "parse.y"
 {
-                       yyval.id = "union ";
+                       yyval.id = yyvsp[0].id;
+                       typestack = g_list_prepend(typestack,NULL);
                                                ;
     break;}
 case 48:
-#line 380 "parse.y"
-{
-                       yyval.id = "struct ";
-                                               ;
+#line 756 "parse.y"
+{ yyval.list = yyvsp[-1].list; ;
     break;}
 case 49:
-#line 385 "parse.y"
-{ stars++; ;
+#line 757 "parse.y"
+{ yyval.list = NULL; ;
     break;}
 case 50:
-#line 386 "parse.y"
-{ stars++; ;
+#line 760 "parse.y"
+{
+                       yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
+                                               ;
     break;}
 case 51:
-#line 389 "parse.y"
+#line 763 "parse.y"
 {
-                       if(strcmp(yyvsp[-1].id,"first")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-1].id,"last")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-                       else {
-                               yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-1].id);
-                               YYERROR;
-                       }
-                       g_free(yyvsp[-1].id);
-                                       ;
+                       yyval.list = g_list_append(NULL,yyvsp[0].id);
+                                               ;
     break;}
 case 52:
-#line 401 "parse.y"
+#line 769 "parse.y"
 {
-                       if(strcmp(yyvsp[-2].id,"first")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-2].id,"last")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-                       else {
-                               yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-2].id);
-                               YYERROR;
-                       }
-                       g_free(yyvsp[-2].id);
-                                       ;
+                       Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
+                       typestack = g_list_prepend(typestack,node);
+                                                       ;
     break;}
 case 53:
-#line 413 "parse.y"
+#line 773 "parse.y"
 {
-                       yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-                                       ;
+                       Node *node = new_type(yyvsp[0].id, NULL, NULL);
+                       typestack = g_list_prepend(typestack,node);
+                                                       ;
     break;}
 case 54:
-#line 416 "parse.y"
+#line 780 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 55:
+#line 783 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 56:
+#line 786 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 57:
+#line 790 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 58:
+#line 794 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 59:
+#line 798 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+                                            yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 60:
+#line 803 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-2].id, " ",
+                                            yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 61:
+#line 811 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 62:
+#line 815 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[-1].id);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 63:
+#line 820 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 64:
+#line 824 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 65:
+#line 827 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 66:
+#line 831 "parse.y"
+{
+                       yyval.id = g_strdup(yyvsp[0].id);
+                                                       ;
+    break;}
+case 67:
+#line 834 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                                                       ;
+    break;}
+case 68:
+#line 839 "parse.y"
+{ yyval.id = "void"; ;
+    break;}
+case 69:
+#line 840 "parse.y"
+{ yyval.id = "char"; ;
+    break;}
+case 70:
+#line 841 "parse.y"
+{ yyval.id = "short"; ;
+    break;}
+case 71:
+#line 842 "parse.y"
+{ yyval.id = "int"; ;
+    break;}
+case 72:
+#line 843 "parse.y"
+{ yyval.id = "long"; ;
+    break;}
+case 73:
+#line 844 "parse.y"
+{ yyval.id = "float"; ;
+    break;}
+case 74:
+#line 845 "parse.y"
+{ yyval.id = "double"; ;
+    break;}
+case 75:
+#line 846 "parse.y"
+{ yyval.id = "signed"; ;
+    break;}
+case 76:
+#line 847 "parse.y"
+{ yyval.id = "unsigned"; ;
+    break;}
+case 77:
+#line 850 "parse.y"
+{ yyval.id = "struct"; ;
+    break;}
+case 78:
+#line 851 "parse.y"
+{ yyval.id = "union"; ;
+    break;}
+case 79:
+#line 852 "parse.y"
+{ yyval.id = "enum"; ;
+    break;}
+case 80:
+#line 855 "parse.y"
+{ yyval.id = g_strdup("*"); ;
+    break;}
+case 81:
+#line 856 "parse.y"
+{ yyval.id = g_strdup("* const"); ;
+    break;}
+case 82:
+#line 857 "parse.y"
+{
+                               yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       ;
+    break;}
+case 83:
+#line 861 "parse.y"
+{
+                               yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       ;
+    break;}
+case 84:
+#line 868 "parse.y"
+{
+                       if(strcmp(yyvsp[-1].id, "first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-1].id, "last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free(yyvsp[-1].id);
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-1].id);
+                                       ;
+    break;}
+case 85:
+#line 880 "parse.y"
+{
+                       yyval.sigtype = SIGNAL_LAST_METHOD;
+                                       ;
+    break;}
+case 86:
+#line 886 "parse.y"
 {
                        if(strcmp(yyvsp[-1].id,"first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1385,159 +2012,289 @@ case 54:
                        g_free(yyvsp[-1].id);
                                        ;
     break;}
-case 55:
-#line 428 "parse.y"
+case 87:
+#line 898 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-2].id,"last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free(yyvsp[-2].id);
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-2].id);
+                                       ;
+    break;}
+case 88:
+#line 910 "parse.y"
 {
                        yyval.sigtype = SIGNAL_LAST_METHOD;
                                        ;
     break;}
-case 56:
-#line 433 "parse.y"
+case 89:
+#line 913 "parse.y"
 {
-                       gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+                       /* the_scope was default thus public */
+                       the_scope = PUBLIC_SCOPE;
+                                       ;
+    break;}
+case 90:
+#line 919 "parse.y"
+{
+                       gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
                                                ;
     break;}
-case 57:
-#line 438 "parse.y"
+case 91:
+#line 924 "parse.y"
 {
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+                       gtktypes = g_list_append(gtktypes, yyvsp[0].id);
                                                ;
     break;}
-case 58:
-#line 441 "parse.y"
+case 92:
+#line 927 "parse.y"
 { 
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+                       gtktypes = g_list_append(gtktypes, yyvsp[0].id);
                                                        ;
     break;}
-case 59:
-#line 446 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 93:
+#line 932 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
     break;}
-case 60:
-#line 447 "parse.y"
+case 94:
+#line 933 "parse.y"
 { yyval.cbuf = NULL; ;
     break;}
-case 61:
-#line 451 "parse.y"
+case 95:
+#line 937 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(yyvsp[-7].sigtype,NULL,
-                                     yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
+                       push_function(the_scope, yyvsp[-7].sigtype,NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line,
+                                     ccode_line, vararg, yyvsp[-8].list);
                                                                        ;
     break;}
-case 62:
-#line 461 "parse.y"
+case 96:
+#line 953 "parse.y"
+{
+                       if(!has_self) {
+                               yyerror(_("signal without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, yyvsp[-7].sigtype, NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line,
+                                     ccode_line, vararg, yyvsp[-8].list);
+                                                                       ;
+    break;}
+case 97:
+#line 969 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-8].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 63:
-#line 471 "parse.y"
+case 98:
+#line 985 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
-                                     ccode_line,vararg);
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 64:
-#line 481 "parse.y"
+case 99:
+#line 1001 "parse.y"
 {
-                       push_function(OVERRIDE_METHOD, yyvsp[-9].id,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,
-                                     yyvsp[-11].line,yyvsp[-1].line,
-                                     vararg);
+                       if(!has_self) {
+                               yyerror(_("virtual method without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 65:
-#line 487 "parse.y"
+case 100:
+#line 1012 "parse.y"
 {
-                       push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
-                                                               ;
+                       push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,
+                                     yyvsp[-10].line, ccode_line,
+                                     vararg, NULL);
+                                                                       ;
     break;}
-case 66:
-#line 492 "parse.y"
+case 101:
+#line 1018 "parse.y"
 {
-                       push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+                                     vararg, NULL);
                                                                ;
     break;}
-case 67:
-#line 497 "parse.y"
+case 102:
+#line 1028 "parse.y"
 {
-                       if(strcmp(yyvsp[-4].id,"init")==0) {
+                       if(strcmp(yyvsp[-4].id, "init")==0) {
                                push_init_arg(yyvsp[-2].id,FALSE);
-                               push_function(INIT_METHOD, NULL,
-                                             yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-                                             ccode_line,FALSE);
-                       } else if(strcmp(yyvsp[-4].id,"class_init")==0) {
+                               push_function(NO_SCOPE, INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
+                       } else if(strcmp(yyvsp[-4].id, "class_init")==0) {
                                push_init_arg(yyvsp[-2].id,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL, 
-                                             yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-                                             ccode_line,FALSE);
+                               push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
                        } else {
                                g_free(yyvsp[-4].id);
                                g_free(yyvsp[-2].id);
-                               g_string_free(yyvsp[-2].cbuf,TRUE);
+                               g_string_free(yyvsp[0].cbuf,TRUE);
+                               yyerror(_("parse error "
+                                         "(untyped blocks must be init or "
+                                         "class_init)"));
+                               YYERROR;
+                       }
+                                               ;
+    break;}
+case 103:
+#line 1051 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                       if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) {
+                               g_free(yyvsp[-1].id);
+                               g_free(yyvsp[0].id);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
+                       g_free(yyvsp[-1].id);
+                                       ;
+    break;}
+case 104:
+#line 1062 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                       if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) {
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) {
+                               onerror = defreturn = NULL;
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-3].id);
+                       g_free(yyvsp[-1].id);
                                                ;
     break;}
-case 68:
-#line 518 "parse.y"
+case 105:
+#line 1081 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                                       ;
+    break;}
+case 106:
+#line 1087 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 69:
-#line 519 "parse.y"
+case 107:
+#line 1088 "parse.y"
 {
-                       yyval.id = (yyvsp[0].cbuf)->str;
-                       g_string_free(yyvsp[0].cbuf,FALSE);
+                       yyval.id = (yyvsp[1].cbuf)->str;
+                       g_string_free(yyvsp[1].cbuf, FALSE);
                                        ;
     break;}
-case 70:
-#line 523 "parse.y"
-{ ; ;
+case 108:
+#line 1094 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
     break;}
-case 71:
-#line 524 "parse.y"
-{ yyval.id = NULL; ;
+case 109:
+#line 1095 "parse.y"
+{
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[0].id,"self")==0)
+                               push_self(yyvsp[0].id, FALSE);
+                       else {
+                               g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               ;
     break;}
-case 72:
-#line 527 "parse.y"
-{ vararg = FALSE; has_self = FALSE; ;
+case 110:
+#line 1106 "parse.y"
+{
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-1].id,"self")==0)
+                               push_self(yyvsp[-1].id, TRUE);
+                       else {
+                               g_free(yyvsp[-1].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               ;
     break;}
-case 73:
-#line 528 "parse.y"
+case 111:
+#line 1117 "parse.y"
 {
                        vararg = FALSE;
                        has_self = TRUE;
-                       if(strcmp(yyvsp[0].id,"this")==0) {
-                               push_self(yyvsp[0].id);
-                               print_error(TRUE,_("Use of 'this' is "
-                                                  "depreciated, use 'self' "
-                                                  "instead"),line_no);
-                       } else if(strcmp(yyvsp[0].id,"self")==0)
-                               push_self(yyvsp[0].id);
+                       if(strcmp(yyvsp[0].id,"self")==0)
+                               push_self(yyvsp[0].id, TRUE);
                        else {
                                g_free(yyvsp[0].id);
                                yyerror(_("parse error"));
@@ -1545,17 +2302,12 @@ case 73:
                        }
                                                ;
     break;}
-case 74:
-#line 544 "parse.y"
+case 112:
+#line 1128 "parse.y"
 {
                        has_self = TRUE;
-                       if(strcmp(yyvsp[-2].id,"this")==0) {
-                               push_self(yyvsp[-2].id);
-                               print_error(TRUE,_("Use of 'this' is "
-                                                  "depreciated, use 'self' "
-                                                  "instead"),line_no);
-                       } else if(strcmp(yyvsp[-2].id,"self")==0)
-                               push_self(yyvsp[-2].id);
+                       if(strcmp(yyvsp[-2].id,"self")==0)
+                               push_self(yyvsp[-2].id, FALSE);
                        else {
                                g_free(yyvsp[-2].id);
                                yyerror(_("parse error"));
@@ -1563,53 +2315,96 @@ case 74:
                        }
                                        ;
     break;}
-case 75:
-#line 559 "parse.y"
+case 113:
+#line 1138 "parse.y"
+{
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-3].id,"self")==0)
+                               push_self(yyvsp[-3].id, TRUE);
+                       else {
+                               g_free(yyvsp[-3].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       ;
+    break;}
+case 114:
+#line 1148 "parse.y"
+{
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-2].id,"self")==0)
+                               push_self(yyvsp[-2].id, TRUE);
+                       else {
+                               g_free(yyvsp[-2].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       ;
+    break;}
+case 115:
+#line 1158 "parse.y"
 { has_self = FALSE; ;
     break;}
-case 76:
-#line 562 "parse.y"
+case 116:
+#line 1161 "parse.y"
 { vararg = TRUE; ;
     break;}
-case 77:
-#line 563 "parse.y"
+case 117:
+#line 1162 "parse.y"
 { vararg = FALSE; ;
     break;}
-case 78:
-#line 566 "parse.y"
+case 118:
+#line 1165 "parse.y"
 { ; ;
     break;}
-case 79:
-#line 567 "parse.y"
+case 119:
+#line 1166 "parse.y"
 { ; ;
     break;}
-case 80:
-#line 570 "parse.y"
+case 120:
+#line 1169 "parse.y"
 {
-                       push_funcarg(yyvsp[0].id);
+                       push_funcarg(yyvsp[0].id,NULL);
                                                                ;
     break;}
-case 81:
-#line 573 "parse.y"
+case 121:
+#line 1172 "parse.y"
+{
+                       push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+                                                               ;
+    break;}
+case 122:
+#line 1175 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                        g_free(yyvsp[-2].id);
-                       push_funcarg(yyvsp[-4].id);
+                       push_funcarg(yyvsp[-4].id,NULL);
                                                                ;
     break;}
-case 82:
-#line 583 "parse.y"
+case 123:
+#line 1183 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"check")!=0) {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-2].id);
+                       push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+                                                               ;
+    break;}
+case 124:
+#line 1193 "parse.y"
 { ; ;
     break;}
-case 83:
-#line 584 "parse.y"
+case 125:
+#line 1194 "parse.y"
 { ; ;
     break;}
-case 84:
-#line 587 "parse.y"
+case 126:
+#line 1197 "parse.y"
 {
                        if(strcmp(yyvsp[0].id,"type")==0) {
                                Node *node = new_check(TYPE_CHECK,NULL);
@@ -1624,61 +2419,61 @@ case 84:
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 85:
-#line 600 "parse.y"
+case 127:
+#line 1210 "parse.y"
 {
                        Node *node = new_check(GT_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 86:
-#line 604 "parse.y"
+case 128:
+#line 1214 "parse.y"
 {
                        Node *node = new_check(LT_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 87:
-#line 608 "parse.y"
+case 129:
+#line 1218 "parse.y"
 {
                        Node *node = new_check(GE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 88:
-#line 612 "parse.y"
+case 130:
+#line 1222 "parse.y"
 {
                        Node *node = new_check(LE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 89:
-#line 616 "parse.y"
+case 131:
+#line 1226 "parse.y"
 {
                        Node *node = new_check(EQ_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 90:
-#line 620 "parse.y"
+case 132:
+#line 1230 "parse.y"
 {
                        Node *node = new_check(NE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 91:
-#line 626 "parse.y"
+case 133:
+#line 1236 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 92:
-#line 627 "parse.y"
+case 134:
+#line 1237 "parse.y"
 {
                        yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 93:
-#line 631 "parse.y"
+case 135:
+#line 1241 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -1903,5 +2698,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 634 "parse.y"
+#line 1244 "parse.y"