X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6d0fe9d5f8c513045bf064ea256c822beac19037..2753ff6cefbe916211d543f1029879e2a075d111:/src/parse.c?ds=sidebyside

diff --git a/src/parse.c b/src/parse.c
index 1d226c4..2d9d349 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -20,19 +20,24 @@
 #define	FLOAT	270
 #define	DOUBLE	271
 #define	CHAR	272
-#define	ONERROR	273
-#define	TOKEN	274
-#define	NUMBER	275
-#define	TYPETOKEN	276
-#define	ARRAY_DIM	277
-#define	CCODE	278
-#define	HCODE	279
-#define	PUBLIC	280
-#define	PRIVATE	281
-#define	ARGUMENT	282
-#define	VIRTUAL	283
-#define	SIGNAL	284
-#define	OVERRIDE	285
+#define	TOKEN	273
+#define	NUMBER	274
+#define	TYPETOKEN	275
+#define	ARRAY_DIM	276
+#define	CCODE	277
+#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"
 
@@ -40,29 +45,45 @@
 #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);
 
@@ -80,81 +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 Type *
+pop_type(void)
+{
+	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 = typestack->data;
-	typestack = g_list_remove(typestack,typestack->data);
+	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"),NULL);
+		type = pop_type();
 	}
 	
 	/* a complicated and ugly test to figure out if we have
 	   the wrong number of types for a signal */
-	if((scope == SIGNAL_FIRST_METHOD ||
-	    scope == SIGNAL_LAST_METHOD ||
-	    scope == PRIVATE_SIGNAL_FIRST_METHOD ||
-	    scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+	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)) {
-		print_error(TRUE, _("The number of GTK arguments and "
-				    "function arguments for a signal "
-				    "don't seem to match"),line_no);
+	     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"));
 	}
-	node = new_method(scope,type,oid,gtktypes,id,funcargs,
-			  onerror,cbuf,line_no,ccode_line,vararg);
+	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
+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);
@@ -172,26 +256,124 @@ push_init_arg(char *name, int is_class)
 	else
 		tn = g_strdup(((Class *)class)->otype);
 
-	type = new_type(1,tn,NULL);
+	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),NULL);
+	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 178 "parse.y"
+#line 355 "parse.y"
 typedef union {
 	char *id;
 	GString *cbuf;
@@ -213,26 +395,26 @@ typedef union {
 
 
 
-#define	YYFINAL		216
+#define	YYFINAL		274
 #define	YYFLAG		-32768
-#define	YYNTBASE	46
+#define	YYNTBASE	50
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 75)
+#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,    44,     2,     2,     2,     2,     2,     2,    35,
-    36,    38,     2,    39,    45,     2,     2,     2,    41,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    34,    43,
-    40,    42,     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,    32,    37,    33,     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,
@@ -248,80 +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,    31
+    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,
-    31,    36,    39,    42,    45,    47,    49,    51,    56,    62,
-    67,    73,    85,    94,    98,    99,   103,   105,   107,   110,
-   112,   115,   118,   121,   123,   126,   129,   131,   133,   135,
-   137,   140,   142,   144,   147,   149,   152,   154,   156,   158,
-   160,   162,   165,   167,   168,   170,   174,   178,   181,   184,
-   188,   192,   195,   197,   202,   206,   208,   211,   213,   223,
-   233,   243,   256,   266,   276,   282,   285,   289,   292,   293,
-   295,   297,   301,   303,   307,   309,   313,   315,   318,   322,
-   329,   337,   340,   342,   344,   347,   350,   354,   358,   362,
-   366,   368,   371
+     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[] = {    47,
-    48,    47,     0,    48,    47,     0,    47,    48,     0,    48,
-     0,    47,    24,     0,    47,    25,     0,    24,     0,    25,
-     0,    49,    32,    50,    33,     0,    49,    32,    33,     0,
-     3,    22,     4,    22,     0,    50,    66,     0,    50,    51,
-     0,    50,    52,     0,    66,     0,    51,     0,    52,     0,
-    26,    55,    20,    34,     0,    26,    55,    20,    23,    34,
-     0,    27,    55,    20,    34,     0,    27,    55,    20,    23,
-    34,     0,    28,    53,    20,    20,    20,    32,    24,    20,
-    32,    24,    34,     0,    28,    53,    20,    20,    20,    32,
-    24,    34,     0,    35,    54,    36,     0,     0,    20,    37,
-    54,     0,    20,     0,    56,     0,     5,    56,     0,    57,
-     0,    57,    60,     0,    12,    58,     0,    11,    58,     0,
-    58,     0,    12,    18,     0,    11,    18,     0,    18,     0,
-    17,     0,    16,     0,    20,     0,    59,    20,     0,    22,
-     0,     6,     0,    13,    15,     0,    13,     0,    14,    15,
-     0,    14,     0,    15,     0,     9,     0,     8,     0,     7,
-     0,    38,    60,     0,    38,     0,     0,    26,     0,    27,
-    20,    63,     0,    20,    27,    63,     0,    27,    63,     0,
-    20,    63,     0,    26,    20,    63,     0,    20,    26,    63,
-     0,    26,    63,     0,    63,     0,    20,    35,    64,    36,
-     0,    64,    39,    20,     0,    20,     0,    32,    24,     0,
-    34,     0,    30,    62,    55,    20,    35,    68,    36,    67,
-    65,     0,    29,    27,    55,    20,    35,    68,    36,    67,
-    65,     0,    29,    61,    55,    20,    35,    68,    36,    67,
-    65,     0,    31,    35,    22,    36,    55,    20,    35,    68,
-    36,    67,    32,    24,     0,    26,    55,    20,    35,    68,
-    36,    67,    32,    24,     0,    27,    55,    20,    35,    68,
-    36,    67,    32,    24,     0,    20,    35,    20,    36,    65,
-     0,    19,    74,     0,    19,    32,    24,     0,    40,    41,
-     0,     0,     6,     0,    20,     0,    20,    39,    69,     0,
-    69,     0,    70,    39,    10,     0,    70,     0,    70,    39,
-    71,     0,    71,     0,    55,    20,     0,    55,    20,    23,
-     0,    55,    20,    35,    20,    72,    36,     0,    55,    20,
-    23,    35,    20,    72,    36,     0,    72,    73,     0,    73,
-     0,    20,     0,    42,    74,     0,    43,    74,     0,    42,
-    40,    74,     0,    43,    40,    74,     0,    40,    40,    74,
-     0,    44,    40,    74,     0,    21,     0,    45,    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,
-   197,   198,   199,   200,   203,   207,   211,   215,   221,   226,
-   233,   238,   239,   240,   241,   242,   243,   246,   249,   252,
-   255,   259,   288,   314,   315,   318,   321,   327,   328,   336,
-   340,   347,   350,   353,   356,   359,   362,   365,   368,   371,
-   374,   378,   381,   386,   389,   392,   395,   398,   403,   406,
-   409,   414,   415,   418,   419,   422,   434,   446,   449,   461,
-   473,   485,   488,   493,   498,   501,   506,   507,   511,   521,
-   531,   541,   547,   552,   557,   578,   579,   583,   584,   587,
-   588,   599,   609,   612,   613,   616,   617,   620,   623,   626,
-   634,   644,   645,   648,   661,   665,   669,   673,   677,   681,
-   687,   688,   692
+   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
 
@@ -330,170 +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",
-"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL",
-"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'",
-"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable",
-"argument","argflags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","optpublic","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,
-    46,    46,    46,    46,    47,    47,    47,    47,    48,    48,
-    49,    50,    50,    50,    50,    50,    50,    51,    51,    51,
-    51,    52,    52,    53,    53,    54,    54,    55,    55,    56,
-    56,    57,    57,    57,    57,    57,    57,    57,    57,    57,
-    57,    57,    57,    58,    58,    58,    58,    58,    59,    59,
-    59,    60,    60,    61,    61,    62,    62,    62,    62,    62,
-    62,    62,    62,    63,    64,    64,    65,    65,    66,    66,
-    66,    66,    66,    66,    66,    67,    67,    67,    67,    68,
-    68,    68,    68,    69,    69,    70,    70,    71,    71,    71,
-    71,    72,    72,    73,    73,    73,    73,    73,    73,    73,
-    74,    74,    74
+    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,     3,
-     4,     2,     2,     2,     1,     1,     1,     4,     5,     4,
-     5,    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,     0,     1,     3,     3,     2,     2,     3,
-     3,     2,     1,     4,     3,     1,     2,     1,     9,     9,
-     9,    12,     9,     9,     5,     2,     3,     2,     0,     1,
-     1,     3,     1,     3,     1,     3,     1,     2,     3,     6,
-     7,     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,    25,    54,     0,
-     0,    10,     0,    16,    17,    15,    11,     0,     0,    43,
-    51,    50,    49,     0,     0,    45,    47,    48,    39,    38,
-    37,    40,    42,     0,    28,    30,    34,     0,     0,     0,
-     0,    55,     0,     0,     0,     0,     0,     0,    63,     0,
-     9,    13,    14,    12,     0,    29,    36,    33,    35,    32,
-    44,    46,     0,    53,    31,    41,     0,    27,     0,     0,
-     0,     0,     0,     0,     0,     0,    59,     0,    62,     0,
-    58,     0,     0,     0,     0,    18,     0,    52,     0,    20,
-     0,     0,    24,     0,     0,     0,    61,    57,    66,     0,
-    60,    56,     0,     0,     0,    68,    75,    19,    43,    40,
-     0,     0,    83,    85,    87,    21,     0,    26,     0,     0,
-     0,    64,     0,     0,     0,    67,     0,    88,    79,     0,
-    79,     0,     0,     0,    65,     0,     0,    82,    89,     0,
-     0,     0,     0,    84,    86,     0,     0,    79,    79,    79,
-     0,     0,     0,   103,   101,     0,     0,    76,    78,     0,
-     0,     0,    23,     0,     0,     0,     0,     0,    94,     0,
-     0,     0,     0,     0,    93,    77,   102,    73,    74,     0,
-    70,    71,    69,    79,     0,     0,     0,    95,     0,    96,
-     0,    90,    92,     0,     0,    91,    99,    97,    98,   100,
-    22,     0,    72,     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[] = {   214,
-     4,     5,     6,    23,    24,    25,    51,    79,   121,    45,
-    46,    47,    48,    75,    54,    58,    59,   110,   117,    26,
-   153,   122,   123,   124,   125,   184,   185,   168
+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[] = {    43,
-     1,-32768,-32768,    56,    28,    39,    72,-32768,-32768,    28,
-   177,   152,    69,   177,    61,   118,   118,    68,   181,    66,
-    84,-32768,   164,-32768,-32768,-32768,-32768,    81,   153,-32768,
--32768,-32768,-32768,   185,   191,   106,   113,-32768,-32768,-32768,
--32768,-32768,-32768,   117,-32768,   101,-32768,   126,   135,   137,
-   143,-32768,   118,   118,    62,   156,   169,   118,-32768,   174,
--32768,-32768,-32768,-32768,   178,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,    13,   101,-32768,-32768,    60,   175,   179,   193,
-   196,   197,   183,   199,   199,   200,-32768,    34,-32768,    34,
--32768,   201,   186,    26,   189,-32768,   136,-32768,   190,-32768,
-   136,   137,-32768,   205,   192,   194,-32768,-32768,-32768,    51,
--32768,-32768,   195,   118,   202,-32768,-32768,-32768,   198,   138,
-   208,   203,-32768,   204,-32768,-32768,   206,-32768,   209,   136,
-   136,-32768,   211,   136,   212,-32768,   118,   -19,    -6,   100,
-    -6,   213,   210,   214,-32768,   215,   217,-32768,   218,   216,
-   -15,   207,   222,-32768,-32768,   223,    -5,    -6,    -6,    -6,
-   136,   220,    35,-32768,-32768,   221,   226,-32768,-32768,   225,
-   232,   227,-32768,    26,    26,    26,   224,    35,-32768,   228,
-   -12,     4,   229,    21,-32768,-32768,-32768,-32768,-32768,   233,
--32768,-32768,-32768,    -6,    30,     6,     6,-32768,     6,-32768,
-     6,-32768,-32768,   230,   231,-32768,-32768,-32768,-32768,-32768,
--32768,   234,-32768,   235,   238,-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,
-     9,   240,-32768,-32768,   239,   242,-32768,   131,   -16,   237,
--32768,   176,-32768,   187,-32768,-32768,   -45,-32768,    12,   244,
-  -138,   -99,   133,-32768,   132,    93,  -177,   -97
+    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		272
-
-
-static const short yytable[] = {    44,
-    49,   127,   156,   149,   164,   165,   203,   164,   165,    87,
-    89,    91,   151,    11,   172,   150,   166,   203,    14,   174,
-   175,   176,     7,   164,   165,   164,   165,   197,   173,   167,
-   143,   144,   167,   152,   146,    95,    81,    82,   107,   108,
-   179,    92,   111,   199,   112,     1,    96,    97,   167,   179,
-   167,     2,     3,    83,   179,   205,   202,   115,     1,   116,
-   180,   177,   181,   182,   183,   206,     2,     3,    86,   180,
-    12,   181,   182,   183,   180,    13,   181,   182,   183,     8,
-     9,    83,    99,   198,   200,    55,   132,    84,    85,   133,
-    27,    56,    57,   100,   101,    28,    86,   135,   207,   208,
-    65,   209,    50,   210,    29,    30,    31,    32,    33,   154,
-    34,    35,    36,    37,    38,    39,    40,    41,    60,    42,
-    71,    43,    29,    30,    31,    32,    33,    72,    34,    35,
-    36,    37,    38,    39,    40,    41,    73,    42,    74,    43,
-    29,   119,    31,    32,    33,    76,    34,    35,    36,    37,
-    38,    39,    40,    41,    77,   120,    78,    43,    30,    31,
-    32,    33,    80,    34,    35,    36,    37,    38,    39,    40,
-    41,    15,    42,   -81,    43,    88,   137,    16,    17,    18,
-    19,    20,    21,    15,    22,   191,   192,   193,    90,    16,
-    17,    18,    19,    20,    21,    93,    61,    36,    37,    38,
-     8,     9,    67,    36,    37,    38,    52,    53,    69,    68,
-    70,   102,   104,    94,   103,   105,   106,    86,    83,   109,
-   113,   114,   118,   126,   129,   136,   130,   138,   131,   134,
-   145,   147,   128,   -80,   215,   163,   157,   216,   139,   178,
-   142,   141,   140,    10,   186,   158,   187,   169,   188,   159,
-   160,   161,   162,   170,   171,   189,   204,   213,   190,   194,
-    98,    62,   212,   211,    63,    66,    64,   196,   201,   148,
-   195,   155
+#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,   101,   141,    23,    20,    21,   184,    20,    21,    55,
-    56,    57,    19,     5,    20,    35,    32,   195,    10,   158,
-   159,   160,    22,    20,    21,    20,    21,    40,    34,    45,
-   130,   131,    45,    40,   134,    23,    53,    54,    84,    85,
-    20,    58,    88,    40,    90,     3,    34,    35,    45,    20,
-    45,    24,    25,    20,    20,   194,    36,    32,     3,    34,
-    40,   161,    42,    43,    44,    36,    24,    25,    35,    40,
-    32,    42,    43,    44,    40,     4,    42,    43,    44,    24,
-    25,    20,    23,   181,   182,    20,    36,    26,    27,    39,
-    22,    26,    27,    34,    35,    35,    35,   114,   196,   197,
-    20,   199,    35,   201,     5,     6,     7,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    18,    35,    20,
-    15,    22,     5,     6,     7,     8,     9,    15,    11,    12,
-    13,    14,    15,    16,    17,    18,    20,    20,    38,    22,
-     5,     6,     7,     8,     9,    20,    11,    12,    13,    14,
-    15,    16,    17,    18,    20,    20,    20,    22,     6,     7,
-     8,     9,    20,    11,    12,    13,    14,    15,    16,    17,
-    18,    20,    20,    36,    22,    20,    39,    26,    27,    28,
-    29,    30,    31,    20,    33,   174,   175,   176,    20,    26,
-    27,    28,    29,    30,    31,    22,    33,    13,    14,    15,
-    24,    25,    18,    13,    14,    15,    26,    27,    18,    34,
-    35,    37,    20,    36,    36,    20,    20,    35,    20,    20,
-    20,    36,    34,    34,    20,    24,    35,    20,    35,    35,
-    20,    20,   102,    36,     0,    20,    24,     0,    36,    20,
-    32,    36,    39,     4,    24,    36,    21,    41,    24,    36,
-    36,    35,    35,    32,    32,    24,    24,    24,    32,    36,
-    74,    23,    32,    34,    23,    29,    23,    40,    40,   137,
-   178,   140
+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"
@@ -1039,405 +1289,699 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 197 "parse.y"
+#line 373 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 198 "parse.y"
+#line 374 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 199 "parse.y"
+#line 375 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 200 "parse.y"
+#line 376 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 203 "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 207 "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 211 "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 215 "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 221 "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 226 "parse.y"
+#line 409 "parse.y"
 {
-			((Class *)class)->nodes = NULL;
-			class_nodes = NULL;
-			nodes = g_list_append(nodes,class);
-						;
+			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 233 "parse.y"
-{
-			class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
-						;
+#line 417 "parse.y"
+{ ; ;
     break;}
 case 12:
-#line 238 "parse.y"
+#line 418 "parse.y"
 { ; ;
     break;}
 case 13:
-#line 239 "parse.y"
-{ ; ;
+#line 421 "parse.y"
+{
+			((Class *)class)->nodes = class_nodes;
+			class_nodes = NULL;
+			nodes = g_list_append(nodes,class);
+						;
     break;}
 case 14:
-#line 240 "parse.y"
-{ ; ;
+#line 426 "parse.y"
+{
+			((Class *)class)->nodes = NULL;
+			class_nodes = NULL;
+			nodes = g_list_append(nodes,class);
+						;
     break;}
 case 15:
-#line 241 "parse.y"
-{ ; ;
-    break;}
-case 16:
-#line 242 "parse.y"
-{ ; ;
+#line 433 "parse.y"
+{
+			class = new_class (yyvsp[-3].id, yyvsp[-1].id,
+					   bonobo_x_class, chunk_size, NULL);
+						;
     break;}
 case 17:
-#line 243 "parse.y"
-{ ; ;
+#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 {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+		;
     break;}
 case 18:
-#line 246 "parse.y"
-{
-			push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL);
-						;
+#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 {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+		;
     break;}
 case 19:
-#line 249 "parse.y"
-{
-			push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
-						;
+#line 466 "parse.y"
+{ ; ;
     break;}
 case 20:
-#line 252 "parse.y"
-{
-			push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL);
-						;
+#line 467 "parse.y"
+{ ; ;
     break;}
 case 21:
-#line 255 "parse.y"
-{
-			push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
-						 ;
+#line 470 "parse.y"
+{ ; ;
     break;}
 case 22:
-#line 259 "parse.y"
+#line 471 "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);
-			} 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);
+			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 288 "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);
-			} 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;
-			}
-						;
+#line 479 "parse.y"
+{ ; ;
     break;}
 case 24:
-#line 314 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
+#line 480 "parse.y"
+{ ; ;
     break;}
 case 25:
-#line 315 "parse.y"
-{ yyval.list = NULL; ;
+#line 481 "parse.y"
+{ ; ;
     break;}
 case 26:
-#line 318 "parse.y"
-{
-			yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
-						;
+#line 484 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
     break;}
 case 27:
-#line 321 "parse.y"
-{
-			yyval.list = g_list_append(NULL,yyvsp[0].id);
-						;
+#line 485 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
     break;}
 case 28:
-#line 327 "parse.y"
-{ ; ;
+#line 486 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
     break;}
 case 29:
-#line 328 "parse.y"
-{
-			Type *type = typestack->data;
-			char *oldname = type->name;
-			type->name = g_strconcat("const ",oldname,NULL);
-			g_free(oldname);
-						;
+#line 487 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
     break;}
 case 30:
-#line 336 "parse.y"
+#line 490 "parse.y"
 {
-			Node *node = new_type(0,yyvsp[0].id,NULL);
-			typestack = g_list_prepend(typestack,node);
-						;
+			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 340 "parse.y"
+#line 503 "parse.y"
 {
-			Node *node = new_type(stars,yyvsp[-1].id,NULL);
-			stars = 0;
-			typestack = g_list_prepend(typestack,node);
-						;
+			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 347 "parse.y"
+#line 519 "parse.y"
 {
-			yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
-						;
+			initializer = yyvsp[0].id;
+			initializer_line = ccode_line;
+				;
     break;}
 case 33:
-#line 350 "parse.y"
+#line 523 "parse.y"
 {
-			yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
-						;
+			initializer = (yyvsp[0].cbuf)->str;
+			initializer_line = ccode_line;
+			g_string_free(yyvsp[0].cbuf, FALSE);
+				;
     break;}
 case 34:
-#line 353 "parse.y"
-{
-			yyval.id = g_strdup(yyvsp[0].id);
-						;
+#line 531 "parse.y"
+{ ; ;
     break;}
 case 35:
-#line 356 "parse.y"
-{
-			yyval.id = g_strdup("unsigned char");
-						;
+#line 532 "parse.y"
+{ ; ;
     break;}
 case 36:
-#line 359 "parse.y"
-{
-			yyval.id = g_strdup("signed char");
-						;
+#line 533 "parse.y"
+{ destructor = NULL; ;
     break;}
 case 37:
-#line 362 "parse.y"
-{
-			yyval.id = g_strdup("char");
-						;
+#line 534 "parse.y"
+{ initializer = NULL; ;
     break;}
 case 38:
-#line 365 "parse.y"
+#line 535 "parse.y"
 {
-			yyval.id = g_strdup("double");
-						;
+			destructor = NULL;
+			initializer = NULL;
+					;
     break;}
 case 39:
-#line 368 "parse.y"
+#line 541 "parse.y"
 {
-			yyval.id = g_strdup("float");
+			push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
 						;
     break;}
 case 40:
-#line 371 "parse.y"
+#line 544 "parse.y"
 {
-			yyval.id = yyvsp[0].id;
+			push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
 						;
     break;}
 case 41:
-#line 374 "parse.y"
+#line 549 "parse.y"
 {
-			yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
-			g_free(yyvsp[0].id);
+			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 378 "parse.y"
+#line 600 "parse.y"
 {
-			yyval.id = yyvsp[0].id;
+			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 381 "parse.y"
+#line 648 "parse.y"
 {
-			yyval.id = g_strdup("void");
+			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 386 "parse.y"
+#line 731 "parse.y"
 {
-			yyval.id = "long int";
-						;
+ 	                                          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 389 "parse.y"
-{
-			yyval.id = "long";
-						;
+#line 739 "parse.y"
+{ yyval.id = NULL; ;
     break;}
 case 46:
-#line 392 "parse.y"
+#line 741 "parse.y"
 {
-			yyval.id = "short int";
+			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 395 "parse.y"
+#line 750 "parse.y"
 {
-			yyval.id = "short";
+			yyval.id = yyvsp[0].id;
+			typestack = g_list_prepend(typestack,NULL);
 						;
     break;}
 case 48:
-#line 398 "parse.y"
-{
-			yyval.id = "int";
-						;
+#line 756 "parse.y"
+{ yyval.list = yyvsp[-1].list; ;
     break;}
 case 49:
-#line 403 "parse.y"
-{
-			yyval.id = "enum ";
-						;
+#line 757 "parse.y"
+{ yyval.list = NULL; ;
     break;}
 case 50:
-#line 406 "parse.y"
+#line 760 "parse.y"
 {
-			yyval.id = "union ";
+			yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
 						;
     break;}
 case 51:
-#line 409 "parse.y"
+#line 763 "parse.y"
 {
-			yyval.id = "struct ";
+			yyval.list = g_list_append(NULL,yyvsp[0].id);
 						;
     break;}
 case 52:
-#line 414 "parse.y"
-{ stars++; ;
+#line 769 "parse.y"
+{
+			Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
+			typestack = g_list_prepend(typestack,node);
+							;
     break;}
 case 53:
-#line 415 "parse.y"
-{ stars++; ;
+#line 773 "parse.y"
+{
+			Node *node = new_type(yyvsp[0].id, NULL, NULL);
+			typestack = g_list_prepend(typestack,node);
+							;
     break;}
 case 54:
-#line 418 "parse.y"
-{ ; ;
+#line 780 "parse.y"
+{
+			yyval.id = yyvsp[0].id;
+							;
     break;}
 case 55:
-#line 419 "parse.y"
-{ ; ;
+#line 783 "parse.y"
+{
+			yyval.id = yyvsp[0].id;
+							;
     break;}
 case 56:
-#line 422 "parse.y"
+#line 786 "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.id = g_strconcat("const ", yyvsp[0].id, NULL);
+			g_free(yyvsp[0].id);
+							;
     break;}
 case 57:
-#line 434 "parse.y"
+#line 790 "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);
-					;
+			yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+			g_free(yyvsp[-1].id);
+							;
     break;}
 case 58:
-#line 446 "parse.y"
+#line 794 "parse.y"
 {
-			yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-					;
+			yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+			g_free(yyvsp[0].id);
+							;
     break;}
 case 59:
-#line 449 "parse.y"
+#line 798 "parse.y"
 {
-			if(strcmp(yyvsp[-1].id,"first")==0)
+			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)
+			else if(strcmp(yyvsp[-1].id, "last")==0)
 				yyval.sigtype = SIGNAL_LAST_METHOD;
 			else {
 				yyerror(_("signal must be 'first' or 'last'"));
@@ -1447,8 +1991,14 @@ case 59:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 60:
-#line 461 "parse.y"
+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;
@@ -1462,8 +2012,8 @@ case 60:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 61:
-#line 473 "parse.y"
+case 87:
+#line 898 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"first")==0)
 				yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1477,160 +2027,274 @@ case 61:
 			g_free(yyvsp[-2].id);
 					;
     break;}
-case 62:
-#line 485 "parse.y"
+case 88:
+#line 910 "parse.y"
 {
 			yyval.sigtype = SIGNAL_LAST_METHOD;
 					;
     break;}
-case 63:
-#line 488 "parse.y"
+case 89:
+#line 913 "parse.y"
 {
-			yyval.sigtype = SIGNAL_LAST_METHOD;
+			/* the_scope was default thus public */
+			the_scope = PUBLIC_SCOPE;
 					;
     break;}
-case 64:
-#line 493 "parse.y"
+case 90:
+#line 919 "parse.y"
 {
-			gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+			gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
 						;
     break;}
-case 65:
-#line 498 "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 66:
-#line 501 "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 67:
-#line 506 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 93:
+#line 932 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
     break;}
-case 68:
-#line 507 "parse.y"
+case 94:
+#line 933 "parse.y"
 { yyval.cbuf = NULL; ;
     break;}
-case 69:
-#line 511 "parse.y"
+case 95:
+#line 937 "parse.y"
 {
 			if(!has_self) {
 				yyerror(_("signal without 'self' as "
 					  "first parameter"));
+				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);
+			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 70:
-#line 521 "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;
 			}
-			push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-				      yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].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[-8].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 71:
-#line 531 "parse.y"
+case 98:
+#line 985 "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(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[-7].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 72:
-#line 541 "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 73:
-#line 547 "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 74:
-#line 552 "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 75:
-#line 557 "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 76:
-#line 578 "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 77:
-#line 579 "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 78:
-#line 583 "parse.y"
-{ ; ;
+case 108:
+#line 1094 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
     break;}
-case 79:
-#line 584 "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 80:
-#line 587 "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 81:
-#line 588 "parse.y"
+case 111:
+#line 1117 "parse.y"
 {
 			vararg = FALSE;
 			has_self = TRUE;
 			if(strcmp(yyvsp[0].id,"self")==0)
-				push_self(yyvsp[0].id);
+				push_self(yyvsp[0].id, TRUE);
 			else {
 				g_free(yyvsp[0].id);
 				yyerror(_("parse error"));
@@ -1638,12 +2302,12 @@ case 81:
 			}
        					;
     break;}
-case 82:
-#line 599 "parse.y"
+case 112:
+#line 1128 "parse.y"
 {
 			has_self = TRUE;
 			if(strcmp(yyvsp[-2].id,"self")==0)
-				push_self(yyvsp[-2].id);
+				push_self(yyvsp[-2].id, FALSE);
 			else {
 				g_free(yyvsp[-2].id);
 				yyerror(_("parse error"));
@@ -1651,40 +2315,66 @@ case 82:
 			}
 					;
     break;}
-case 83:
-#line 609 "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 84:
-#line 612 "parse.y"
+case 116:
+#line 1161 "parse.y"
 { vararg = TRUE; ;
     break;}
-case 85:
-#line 613 "parse.y"
+case 117:
+#line 1162 "parse.y"
 { vararg = FALSE; ;
     break;}
-case 86:
-#line 616 "parse.y"
+case 118:
+#line 1165 "parse.y"
 { ; ;
     break;}
-case 87:
-#line 617 "parse.y"
+case 119:
+#line 1166 "parse.y"
 { ; ;
     break;}
-case 88:
-#line 620 "parse.y"
+case 120:
+#line 1169 "parse.y"
 {
 			push_funcarg(yyvsp[0].id,NULL);
 								;
     break;}
-case 89:
-#line 623 "parse.y"
+case 121:
+#line 1172 "parse.y"
 {
 			push_funcarg(yyvsp[-1].id,yyvsp[0].id);
 								;
     break;}
-case 90:
-#line 626 "parse.y"
+case 122:
+#line 1175 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1694,8 +2384,8 @@ case 90:
 			push_funcarg(yyvsp[-4].id,NULL);
 								;
     break;}
-case 91:
-#line 634 "parse.y"
+case 123:
+#line 1183 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1705,16 +2395,16 @@ case 91:
 			push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
 								;
     break;}
-case 92:
-#line 644 "parse.y"
+case 124:
+#line 1193 "parse.y"
 { ; ;
     break;}
-case 93:
-#line 645 "parse.y"
+case 125:
+#line 1194 "parse.y"
 { ; ;
     break;}
-case 94:
-#line 648 "parse.y"
+case 126:
+#line 1197 "parse.y"
 {
 			if(strcmp(yyvsp[0].id,"type")==0) {
 				Node *node = new_check(TYPE_CHECK,NULL);
@@ -1729,61 +2419,61 @@ case 94:
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 95:
-#line 661 "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 96:
-#line 665 "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 97:
-#line 669 "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 98:
-#line 673 "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 99:
-#line 677 "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 100:
-#line 681 "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 101:
-#line 687 "parse.y"
+case 133:
+#line 1236 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 102:
-#line 688 "parse.y"
+case 134:
+#line 1237 "parse.y"
 {
 			yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 103:
-#line 692 "parse.y"
+case 135:
+#line 1241 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -2008,5 +2698,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 695 "parse.y"
+#line 1244 "parse.y"