X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/774037b15064dcc6e4995c0bba3b24abb1bde35f..4f7cfa972623842e64e3a8468696f1f6f40fd202:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index 783037d..9b63335 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -20,20 +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	PROTECTED	282
-#define	ARGUMENT	283
-#define	VIRTUAL	284
-#define	SIGNAL	285
-#define	OVERRIDE	286
+#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"
 
@@ -43,13 +47,12 @@
 #include <stdio.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;
@@ -62,6 +65,16 @@ static GList *checks = NULL;
 static int has_self = FALSE;
 static int vararg = FALSE;
 
+/* 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
@@ -85,17 +98,17 @@ 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);
@@ -117,17 +130,23 @@ push_variable(char *name, int scope, int line_no, char *postfix)
 
 	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, int method, 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(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
 		type = pop_type();
@@ -142,10 +161,21 @@ push_function(int scope, int method, char *oid, char *id, char *onerror,
 	   g_list_length(gtktypes) != g_list_length(funcargs) &&
 	   !(g_list_length(funcargs) == 1 &&
 	     g_list_length(gtktypes) == 2 &&
-	     strcmp(gtktypes->next->data,"NONE")==0)) {
+	     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);
+				    "don't seem to match"), line_no);
+	}
+	if(g_list_length(gtktypes) > 2) {
+		GList *li;
+		for(li = gtktypes->next; li; li = li->next) {
+			if(strcmp(li->data, "NONE")==0) {
+				print_error(FALSE,
+					    _("NONE can only appear in an "
+					      "argument list by itself"),
+					    line_no);
+			}
+		}
 	}
 	if(cbuf) {
 		char *p;
@@ -157,8 +187,9 @@ push_function(int scope, int method, char *oid, char *id, char *onerror,
 	} else
 		c_cbuf = NULL;
 
-	node = new_method(scope,method,type,oid,gtktypes,id,funcargs,
-			  onerror,c_cbuf,line_no,ccode_line,vararg);
+	node = new_method(scope, method, type, oid, gtktypes, flags,
+			  id, funcargs, onerror, defreturn, c_cbuf, line_no,
+			  ccode_line, vararg);
 
 	if(cbuf)
 		g_string_free(cbuf,
@@ -168,9 +199,28 @@ push_function(int scope, int method, char *oid, char *id, char *onerror,
 	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_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)
 {
@@ -179,7 +229,7 @@ push_funcarg(char *name, char *postfix)
 
 	type->postfix = postfix;
 	
-	node = new_funcarg(type,name,checks);
+	node = new_funcarg(type, name, checks);
 	checks = NULL;
 	
 	funcargs = g_list_append(funcargs, node);
@@ -215,8 +265,50 @@ push_self(char *id)
 	funcargs = g_list_prepend(funcargs, node);
 }
 
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+	GList *li;
+	char *s;
+
+	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;
+	}
+
+	s = g_strdup_printf(_("Variable %s not defined here"), id);
+	print_error(FALSE, s, line);
+
+	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;
+}
+
 
-#line 202 "parse.y"
+#line 290 "parse.y"
 typedef union {
 	char *id;
 	GString *cbuf;
@@ -238,26 +330,26 @@ typedef union {
 
 
 
-#define	YYFINAL		219
+#define	YYFINAL		243
 #define	YYFLAG		-32768
-#define	YYNTBASE	46
+#define	YYNTBASE	50
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 77)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 87)
 
 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,    36,
-    37,    39,     2,    40,    45,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    35,    42,
-    43,    41,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    48,     2,     2,     2,     2,     2,     2,    41,
+    42,    44,     2,    45,    49,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,    39,    47,
+    40,    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,    33,    38,    34,     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,
@@ -273,79 +365,86 @@ 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,    32
+    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,    53,    55,
-    57,    62,    68,    80,    89,    95,    97,   101,   102,   106,
-   108,   110,   113,   115,   118,   121,   124,   126,   129,   132,
-   134,   136,   138,   140,   143,   145,   147,   150,   152,   155,
-   157,   159,   161,   163,   165,   168,   170,   173,   175,   179,
-   183,   186,   188,   193,   197,   199,   202,   204,   214,   225,
-   235,   245,   254,   266,   275,   281,   284,   288,   289,   291,
-   293,   297,   299,   303,   305,   309,   311,   314,   318,   325,
-   333,   336,   338,   340,   343,   346,   350,   354,   358,   362,
-   364,   367
+     0,     4,     7,    10,    12,    14,    16,    18,    20,    22,
+    24,    27,    29,    34,    38,    43,    46,    48,    50,    52,
+    54,    56,    58,    60,    62,    64,    67,    71,    74,    78,
+    81,    84,    86,    88,    89,    95,   102,   114,   123,   129,
+   135,   137,   141,   142,   146,   148,   150,   153,   155,   158,
+   161,   164,   166,   169,   172,   174,   176,   178,   180,   183,
+   185,   187,   190,   192,   195,   197,   199,   201,   203,   205,
+   208,   210,   213,   215,   219,   223,   226,   228,   233,   237,
+   239,   242,   244,   255,   267,   277,   287,   296,   308,   317,
+   323,   326,   331,   332,   334,   337,   339,   341,   345,   347,
+   351,   353,   357,   359,   362,   366,   373,   381,   384,   386,
+   388,   391,   394,   398,   402,   406,   410,   412,   415
 };
 
-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,    33,    50,    34,     0,    49,    33,    34,     0,
-     3,    22,     4,    22,     0,    50,    68,     0,    50,    52,
-     0,    50,    53,     0,    68,     0,    52,     0,    53,     0,
-    26,     0,    27,     0,    28,     0,    51,    57,    20,    35,
-     0,    51,    57,    20,    23,    35,     0,    29,    55,    54,
-    20,    20,    33,    24,    20,    33,    24,    35,     0,    29,
-    55,    54,    20,    20,    33,    24,    35,     0,    20,    36,
-    20,    57,    37,     0,    20,     0,    36,    56,    37,     0,
-     0,    20,    38,    56,     0,    20,     0,    58,     0,     5,
-    58,     0,    59,     0,    59,    62,     0,    12,    60,     0,
-    11,    60,     0,    60,     0,    12,    18,     0,    11,    18,
-     0,    18,     0,    17,     0,    16,     0,    20,     0,    61,
-    20,     0,    22,     0,     6,     0,    13,    15,     0,    13,
+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,
+    55,    38,     0,    54,    37,    38,     0,     3,    21,     4,
+    21,     0,    55,    56,     0,    56,     0,    77,     0,    61,
+     0,    62,     0,    39,     0,    29,     0,    30,     0,    31,
+     0,    32,     0,    19,    19,     0,    19,    37,    23,     0,
+    40,    86,     0,    40,    37,    23,     0,    58,    59,     0,
+    59,    58,     0,    59,     0,    58,     0,     0,    57,    66,
+    19,    60,    39,     0,    57,    66,    19,    22,    60,    39,
+     0,    33,    64,    63,    19,    19,    37,    23,    19,    37,
+    23,    39,     0,    33,    64,    63,    19,    19,    37,    23,
+    39,     0,    33,    64,    63,    19,    19,     0,    19,    41,
+    19,    66,    42,     0,    19,     0,    41,    65,    42,     0,
+     0,    19,    43,    65,     0,    19,     0,    67,     0,     5,
+    67,     0,    68,     0,    68,    71,     0,    12,    69,     0,
+    11,    69,     0,    69,     0,    12,    18,     0,    11,    18,
+     0,    18,     0,    17,     0,    16,     0,    19,     0,    70,
+    19,     0,    21,     0,     6,     0,    13,    15,     0,    13,
      0,    14,    15,     0,    14,     0,    15,     0,     9,     0,
-     8,     0,     7,     0,    39,    62,     0,    39,     0,    20,
-    65,     0,    65,     0,    51,    20,    65,     0,    20,    51,
-    65,     0,    51,    65,     0,    63,     0,    20,    36,    66,
-    37,     0,    66,    40,    20,     0,    20,     0,    33,    24,
-     0,    35,     0,    31,    64,    57,    20,    36,    70,    37,
-    69,    67,     0,    51,    31,    63,    57,    20,    36,    70,
-    37,    69,    67,     0,    30,    51,    57,    20,    36,    70,
-    37,    69,    67,     0,    51,    30,    57,    20,    36,    70,
-    37,    69,    67,     0,    30,    57,    20,    36,    70,    37,
-    69,    67,     0,    32,    36,    22,    37,    57,    20,    36,
-    70,    37,    69,    67,     0,    51,    57,    20,    36,    70,
-    37,    69,    67,     0,    20,    36,    20,    37,    67,     0,
-    19,    76,     0,    19,    33,    24,     0,     0,     6,     0,
-    20,     0,    20,    40,    71,     0,    71,     0,    72,    40,
-    10,     0,    72,     0,    72,    40,    73,     0,    73,     0,
-    57,    20,     0,    57,    20,    23,     0,    57,    20,    36,
-    20,    74,    37,     0,    57,    20,    23,    36,    20,    74,
-    37,     0,    74,    75,     0,    75,     0,    20,     0,    41,
-    76,     0,    42,    76,     0,    41,    43,    76,     0,    42,
-    43,    76,     0,    43,    43,    76,     0,    44,    43,    76,
-     0,    21,     0,    45,    21,     0,    20,     0
+     8,     0,     7,     0,    44,    71,     0,    44,     0,    19,
+    74,     0,    74,     0,    57,    19,    74,     0,    19,    57,
+    74,     0,    57,    74,     0,    72,     0,    19,    41,    75,
+    42,     0,    75,    45,    19,     0,    19,     0,    37,    23,
+     0,    39,     0,    35,    64,    73,    66,    19,    41,    80,
+    42,    78,    76,     0,    57,    35,    64,    72,    66,    19,
+    41,    80,    42,    78,    76,     0,    34,    57,    66,    19,
+    41,    80,    42,    78,    76,     0,    57,    34,    66,    19,
+    41,    80,    42,    78,    76,     0,    34,    66,    19,    41,
+    80,    42,    78,    76,     0,    36,    41,    21,    42,    66,
+    19,    41,    80,    42,    78,    76,     0,    57,    66,    19,
+    41,    80,    42,    78,    76,     0,    19,    41,    19,    42,
+    76,     0,    19,    79,     0,    19,    79,    19,    79,     0,
+     0,    86,     0,    37,    23,     0,     6,     0,    19,     0,
+    19,    45,    81,     0,    81,     0,    82,    45,    10,     0,
+    82,     0,    82,    45,    83,     0,    83,     0,    66,    19,
+     0,    66,    19,    22,     0,    66,    19,    41,    19,    84,
+    42,     0,    66,    19,    22,    41,    19,    84,    42,     0,
+    84,    85,     0,    85,     0,    19,     0,    46,    86,     0,
+    47,    86,     0,    46,    40,    86,     0,    47,    40,    86,
+     0,    40,    40,    86,     0,    48,    40,    86,     0,    20,
+     0,    49,    20,     0,    19,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   221,   222,   223,   224,   227,   233,   238,   244,   251,   256,
-   263,   268,   269,   270,   271,   272,   273,   276,   277,   278,
-   281,   284,   288,   323,   353,   362,   368,   369,   372,   375,
-   381,   382,   390,   394,   401,   404,   407,   410,   413,   416,
-   419,   422,   425,   428,   432,   435,   440,   443,   446,   449,
-   452,   457,   460,   463,   468,   469,   473,   485,   491,   503,
-   515,   518,   524,   529,   532,   537,   538,   542,   552,   562,
-   572,   582,   592,   598,   603,   624,   625,   629,   632,   633,
-   644,   654,   657,   658,   661,   662,   665,   668,   671,   679,
-   689,   690,   693,   706,   710,   714,   718,   722,   726,   732,
-   733,   737
+   308,   309,   310,   311,   314,   320,   326,   332,   338,   344,
+   352,   353,   356,   361,   368,   373,   374,   377,   378,   379,
+   380,   383,   384,   385,   386,   389,   402,   418,   422,   430,
+   431,   432,   433,   434,   440,   443,   447,   482,   510,   580,
+   589,   595,   596,   599,   602,   608,   609,   617,   621,   628,
+   631,   634,   637,   640,   643,   646,   649,   652,   655,   659,
+   662,   667,   670,   673,   676,   679,   684,   687,   690,   695,
+   696,   700,   712,   718,   730,   742,   745,   751,   756,   759,
+   764,   765,   769,   785,   801,   817,   833,   844,   850,   860,
+   881,   892,   911,   917,   918,   924,   925,   936,   946,   949,
+   950,   953,   954,   957,   960,   963,   971,   981,   982,   985,
+   998,  1002,  1006,  1010,  1014,  1018,  1024,  1025,  1029
 };
 #endif
 
@@ -354,179 +453,196 @@ 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","PROTECTED","ARGUMENT","VIRTUAL",
-"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'",
-"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable",
-"argument","argtype","argflags","flaglist","type","type1","type2","integer",
+"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","classcode","thing","scope","destructor","initializer","varoptions",
+"variable","argument","argtype","flags","flaglist","type","type1","type2","integer",
 "tspecifier","stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode",
-"method","onerror","funcargs","arglist","arglist1","arg","checklist","check",
-"numtok", NULL
+"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,
-    52,    52,    53,    53,    54,    54,    55,    55,    56,    56,
-    57,    57,    58,    58,    59,    59,    59,    59,    59,    59,
-    59,    59,    59,    59,    59,    59,    60,    60,    60,    60,
-    60,    61,    61,    61,    62,    62,    63,    63,    64,    64,
-    64,    64,    65,    66,    66,    67,    67,    68,    68,    68,
-    68,    68,    68,    68,    68,    69,    69,    69,    70,    70,
-    70,    70,    71,    71,    72,    72,    73,    73,    73,    73,
-    74,    74,    75,    75,    75,    75,    75,    75,    75,    76,
-    76,    76
+    50,    50,    50,    50,    51,    51,    51,    51,    51,    51,
+    52,    52,    53,    53,    54,    55,    55,    56,    56,    56,
+    56,    57,    57,    57,    57,    58,    58,    59,    59,    60,
+    60,    60,    60,    60,    61,    61,    62,    62,    62,    63,
+    63,    64,    64,    65,    65,    66,    66,    67,    67,    68,
+    68,    68,    68,    68,    68,    68,    68,    68,    68,    68,
+    68,    69,    69,    69,    69,    69,    70,    70,    70,    71,
+    71,    72,    72,    73,    73,    73,    73,    74,    75,    75,
+    76,    76,    77,    77,    77,    77,    77,    77,    77,    77,
+    78,    78,    78,    79,    79,    80,    80,    80,    80,    81,
+    81,    82,    82,    83,    83,    83,    83,    84,    84,    85,
+    85,    85,    85,    85,    85,    85,    86,    86,    86
 };
 
 static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     3,
-     4,     2,     2,     2,     1,     1,     1,     1,     1,     1,
-     4,     5,    11,     8,     5,     1,     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,     2,     1,     3,     3,
-     2,     1,     4,     3,     1,     2,     1,     9,    10,     9,
-     9,     8,    11,     8,     5,     2,     3,     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,     4,     2,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     2,     3,     2,     3,     2,
+     2,     1,     1,     0,     5,     6,    11,     8,     5,     5,
+     1,     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,     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,     3,     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,    18,    19,    20,    28,     0,
-     0,     0,    10,     0,     0,    16,    17,    15,    11,     0,
-     0,     0,     0,    46,    54,    53,    52,     0,     0,    48,
-    50,    51,    42,    41,    40,    43,    45,     0,     0,    31,
-    33,    37,     0,     0,     0,    62,     0,    58,     0,     9,
-    13,    14,    12,     0,     0,     0,     0,    30,     0,    26,
-     0,    32,    39,    36,    38,    35,    47,    49,     0,     0,
-    56,    34,    44,     0,     0,     0,    57,     0,    61,     0,
-     0,     0,     0,     0,     0,     0,     0,    27,     0,     0,
-     0,     0,    55,    65,     0,    60,    59,     0,     0,     0,
-     0,     0,    21,     0,     0,    67,    75,    29,     0,     0,
-     0,    46,    43,     0,     0,    82,    84,    86,    63,     0,
-     0,     0,     0,     0,    22,     0,    66,     0,     0,     0,
-     0,    87,    78,     0,    64,     0,     0,     0,     0,    78,
-    25,     0,    78,    81,    88,     0,     0,     0,    83,    85,
-    78,     0,    78,     0,     0,     0,    24,     0,     0,     0,
-   102,   100,     0,     0,    76,    72,     0,     0,     0,    78,
-    74,     0,    70,     0,    93,     0,     0,     0,     0,     0,
-    92,    77,   101,    68,    78,    71,     0,     0,     0,     0,
-    94,     0,    95,     0,     0,    89,    91,     0,    69,    23,
-    90,    96,    97,    98,    99,    73,     0,     0,     0
+     0,     5,     7,     8,     6,     9,    10,    12,     0,     4,
+     0,     0,    11,     3,     2,     0,     0,     1,     0,    22,
+    23,    24,    25,    43,     0,    43,     0,    14,    21,     0,
+    17,     0,    19,    20,    18,    15,     0,     0,     0,     0,
+    61,    69,    68,    67,     0,     0,    63,    65,    66,    57,
+    56,    55,    58,    60,     0,     0,    46,    48,    52,     0,
+     0,     0,    13,    16,     0,    43,     0,     0,    45,     0,
+    41,     0,    47,    54,    51,    53,    50,    62,    64,     0,
+     0,    71,    49,    59,     0,     0,    77,     0,    73,     0,
+     0,     0,    34,     0,     0,    42,     0,     0,     0,     0,
+    70,     0,     0,     0,    72,     0,    76,     0,     0,     0,
+     0,     0,     0,    34,     0,     0,    33,    32,     0,     0,
+    82,    90,    44,     0,    39,     0,    61,    58,     0,     0,
+    99,   101,   103,    80,     0,    75,    74,     0,     0,     0,
+     0,    26,     0,     0,   119,   117,     0,     0,    28,     0,
+    30,    31,    35,    81,     0,     0,     0,     0,   104,    93,
+     0,    78,     0,     0,     0,     0,     0,    27,    36,    29,
+   118,    93,    40,     0,    93,    98,   105,     0,     0,     0,
+   100,   102,    79,     0,     0,    93,     0,     0,     0,    38,
+     0,     0,     0,     0,    91,    94,    87,    93,     0,     0,
+     0,    89,     0,    85,     0,   110,     0,     0,     0,     0,
+     0,   109,    95,     0,     0,    93,    86,    93,     0,     0,
+     0,     0,   111,     0,   112,     0,   106,   108,    92,    83,
+     0,     0,    37,   107,   115,   113,   114,   116,    88,    84,
+     0,     0,     0
 };
 
-static const short yydefgoto[] = {   217,
-     4,     5,     6,    24,    25,    26,    27,    71,    32,    69,
-   124,    50,    51,    52,    53,    82,    56,    57,    58,   105,
-   117,    28,   158,   125,   126,   127,   128,   190,   191,   175
+static const short yydefgoto[] = {   241,
+     8,     9,    10,    11,    30,    31,    32,   117,   118,   119,
+    33,    34,    72,    39,    70,   129,    57,    58,    59,    60,
+    83,    87,    88,    89,   135,   122,    35,   180,   195,   130,
+   131,   132,   133,   211,   212,   196
 };
 
-static const short yypact[] = {    69,
-   -13,-32768,-32768,    73,    89,   -19,    17,-32768,-32768,    89,
-   125,   216,    11,   125,     6,-32768,-32768,-32768,    46,   115,
-   120,    50,-32768,   229,    53,-32768,-32768,-32768,-32768,    68,
-    76,    81,   206,-32768,-32768,-32768,-32768,   251,   257,    92,
-   110,-32768,-32768,-32768,-32768,-32768,-32768,   171,   131,-32768,
-   114,-32768,   135,   205,   152,-32768,   171,-32768,   159,-32768,
--32768,-32768,-32768,   171,   154,   170,   155,   161,   173,   172,
-   196,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   207,   193,
-   114,-32768,-32768,   194,   214,   215,-32768,   -10,-32768,   217,
-   201,   219,   -10,   171,    56,   101,    76,-32768,   220,   231,
-   218,   189,-32768,-32768,    -5,-32768,-32768,   226,   171,   232,
-   233,   238,-32768,   189,   228,-32768,-32768,-32768,   171,   234,
-   189,   237,    16,   256,   240,-32768,   239,-32768,-32768,   258,
-   189,   260,   189,   245,-32768,   246,-32768,   247,   261,   249,
-   171,    -7,   263,   153,-32768,   250,   252,   253,   189,   263,
--32768,    -8,   263,-32768,   255,   269,    10,   101,-32768,-32768,
-   263,   189,   263,   259,   101,   262,-32768,   101,   272,     4,
--32768,-32768,   270,   276,-32768,-32768,   101,   264,   101,   263,
--32768,   274,-32768,     4,-32768,    57,    60,   265,   266,    67,
--32768,-32768,-32768,-32768,   263,-32768,   101,   267,    75,    18,
--32768,    18,-32768,    18,    18,-32768,-32768,   101,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,   293,   299,-32768
+static const short yypact[] = {   158,
+    13,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   158,   185,
+   -26,    44,-32768,   185,   185,   168,    51,   185,    33,-32768,
+-32768,-32768,-32768,    43,   138,    43,    46,-32768,-32768,   186,
+-32768,   107,-32768,-32768,-32768,-32768,    67,    71,    82,   271,
+-32768,-32768,-32768,-32768,   176,   280,    95,   102,-32768,-32768,
+-32768,-32768,-32768,-32768,   238,   108,-32768,    86,-32768,   112,
+    73,   111,-32768,-32768,   238,    43,   114,    92,   105,    96,
+   121,   144,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   145,
+   131,    86,-32768,-32768,   147,   154,-32768,   238,-32768,   133,
+   161,   177,   152,    41,    71,-32768,   195,   204,   200,   255,
+-32768,   207,   239,   246,-32768,     1,-32768,   256,   238,   240,
+     1,   238,     8,   -10,    -5,   255,   155,   272,   257,   274,
+-32768,-32768,-32768,   238,   262,   255,   258,    20,   282,   260,
+-32768,   259,-32768,-32768,    34,-32768,-32768,   264,   284,   255,
+   287,-32768,   285,   268,-32768,-32768,   286,   290,-32768,   269,
+-32768,-32768,-32768,-32768,   270,   291,   273,   238,    -3,   294,
+   221,-32768,   297,   255,   276,   277,   279,-32768,-32768,-32768,
+-32768,   294,-32768,   -15,   294,-32768,   281,   299,    -2,    41,
+-32768,-32768,-32768,   283,   255,   294,   255,    41,   289,-32768,
+    41,   302,    89,   300,   305,-32768,-32768,   294,   288,    41,
+   292,-32768,   304,-32768,    89,-32768,   293,     3,     9,   295,
+    35,-32768,-32768,    -2,    41,   294,-32768,   294,   298,    49,
+    17,    17,-32768,    17,-32768,    17,-32768,-32768,-32768,-32768,
+    41,    41,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+   328,   329,-32768
 };
 
 static const short yypgoto[] = {-32768,
-    80,   296,-32768,-32768,   -18,   279,   280,-32768,-32768,   208,
-   -20,   273,-32768,   106,-32768,   230,   242,-32768,   -36,-32768,
-  -157,   286,  -146,  -108,   174,-32768,   168,   129,   -84,   -48
+    52,    45,   322,-32768,-32768,   306,   -22,   214,   222,   224,
+-32768,-32768,-32768,   -20,   245,   -24,   301,-32768,    53,-32768,
+   261,   250,-32768,    54,-32768,  -175,-32768,  -165,   130,  -114,
+   187,-32768,   188,   141,  -151,  -115
 };
 
 
-#define	YYLAST		315
-
-
-static const short yytable[] = {    49,
-   176,    48,    55,   165,    66,   136,   168,   181,     7,    84,
-   183,   166,   140,    12,   177,   155,   179,    87,    89,   194,
-    13,   196,   146,   185,   148,    85,   167,    79,   156,   171,
-   172,   129,    29,   197,   130,    86,    90,   171,   172,   209,
-   164,    30,   173,    92,   186,   187,   188,   189,   208,   106,
-   216,   107,   -80,   178,   174,   141,    87,    33,    34,    35,
-    36,    37,   174,    38,    39,    40,    41,    42,    43,    44,
-    45,     1,    46,   111,    47,     1,   171,   172,   112,   171,
-   172,    31,    64,    65,    11,    59,   185,    67,   132,    14,
-   113,   114,     2,     3,   185,    68,     8,     9,   138,   200,
-    70,   174,   202,   206,   174,   207,    77,   186,   187,   188,
-   189,   211,     2,     3,   207,   186,   187,   188,   189,    33,
-    34,    35,    36,    37,    78,    38,    39,    40,    41,    42,
-    43,    44,    45,   115,    46,   116,    47,   201,   203,    54,
-    16,    17,    18,    74,    76,    16,    17,    18,     8,     9,
-    80,   212,    81,   213,    83,   214,   215,    33,    34,    35,
-    36,    37,   159,    38,    39,    40,    41,    42,    43,    44,
-    45,    88,    46,    93,    47,    33,    34,    35,    36,    37,
-    91,    38,    39,    40,    41,    42,    43,    44,    45,    95,
-    46,    96,    47,    33,   122,    35,    36,    37,    97,    38,
-    39,    40,    41,    42,    43,    44,    45,    99,   123,    98,
-    47,    34,    35,    36,    37,   100,    38,    39,    40,    41,
-    42,    43,    44,    45,    84,    46,   101,    47,   102,    85,
-    16,    17,    18,   104,    84,    15,   108,   109,   110,   119,
-    85,    16,    17,    18,    19,    20,    21,    22,    15,    23,
-   120,   137,   134,   121,    16,    17,    18,    19,    20,    21,
-    22,   131,    60,    40,    41,    42,   139,   133,    73,    40,
-    41,    42,   135,   -79,    75,   142,   143,   145,   144,   147,
-   149,   157,   150,   151,   152,   153,   161,   162,   170,   163,
-   169,   184,   218,   192,   182,   180,   193,   198,   219,    10,
-   195,   210,    61,    62,   118,    72,    94,   204,   205,    63,
-   103,   160,   199,     0,   154
+#define	YYLAST		349
+
+
+static const short yytable[] = {   149,
+    56,   150,    55,   189,   197,    61,   188,    67,   113,   191,
+    16,   157,   202,   145,   146,   204,   145,   146,   177,   102,
+   200,   145,   146,   190,   217,   166,   142,   145,   146,   115,
+    80,   147,   215,    12,   194,   145,   146,   178,    86,   230,
+    91,   103,   222,   148,   143,    92,   148,    17,   224,   184,
+   231,   148,   232,   206,    15,   239,   240,   148,    18,   228,
+    13,   -97,   104,   108,   158,   148,    13,   206,   228,    13,
+   199,    36,   201,    37,   207,   162,   227,   120,   163,   121,
+   208,   209,   210,    38,   139,    68,    62,   141,   207,    69,
+   234,    85,   223,   225,   208,   209,   210,    75,    77,   155,
+    71,    20,    21,    22,    23,   235,   236,   206,   237,    78,
+   238,    40,    41,    42,    43,    44,    79,    45,    46,    47,
+    48,    49,    50,    51,    52,    53,    81,    54,   207,    82,
+    84,    90,    93,    94,   208,   209,   210,    96,   105,   107,
+    65,    66,    40,    41,    42,    43,    44,    95,    45,    46,
+    47,    48,    49,    50,    51,    52,    53,   136,    54,   137,
+     1,    97,    98,    99,   105,   102,    20,    21,    22,    23,
+   113,   100,   106,   114,   109,    20,    21,    22,    23,   110,
+     2,     3,     4,     5,     6,     7,    19,   103,    47,    48,
+    49,   115,   116,    74,   115,   111,    20,    21,    22,    23,
+    24,    25,    26,    27,    19,    28,    29,     2,     3,     4,
+     5,     6,     7,   124,    20,    21,    22,    23,    24,    25,
+    26,    27,   125,    63,    29,    40,    41,    42,    43,    44,
+   181,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+   126,    54,    40,    41,    42,    43,    44,   103,    45,    46,
+    47,    48,    49,    50,    51,    52,    53,   134,    54,    40,
+   127,    42,    43,    44,   102,    45,    46,    47,    48,    49,
+    50,    51,    52,   128,   138,    54,    41,    42,    43,    44,
+   140,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+   113,    54,    47,    48,    49,   153,   154,    76,   156,   -96,
+   159,   160,   165,   161,   164,   167,   169,   168,   170,   171,
+   172,   173,   179,   174,   175,   183,   185,   193,   186,   187,
+   205,   192,   213,   214,   198,   203,   219,   242,   243,   216,
+    14,   152,   221,   218,   226,    64,   233,   144,   151,   123,
+    73,   112,   101,   229,   176,   220,     0,     0,   182
 };
 
-static const short yycheck[] = {    20,
-   158,    20,    21,   150,    25,   114,   153,   165,    22,    20,
-   168,    20,   121,    33,   161,    23,   163,    54,    55,   177,
-     4,   179,   131,    20,   133,    36,    35,    48,    36,    20,
-    21,    37,    22,   180,    40,    54,    57,    20,    21,   197,
-   149,    36,    33,    64,    41,    42,    43,    44,   195,    86,
-   208,    88,    37,   162,    45,    40,    93,     5,     6,     7,
-     8,     9,    45,    11,    12,    13,    14,    15,    16,    17,
-    18,     3,    20,    94,    22,     3,    20,    21,    23,    20,
-    21,    36,    30,    31,     5,    36,    20,    20,   109,    10,
-    35,    36,    24,    25,    20,    20,    24,    25,   119,    43,
-    20,    45,    43,    37,    45,   190,    15,    41,    42,    43,
-    44,    37,    24,    25,   199,    41,    42,    43,    44,     5,
-     6,     7,     8,     9,    15,    11,    12,    13,    14,    15,
-    16,    17,    18,    33,    20,    35,    22,   186,   187,    20,
-    26,    27,    28,    38,    39,    26,    27,    28,    24,    25,
-    20,   200,    39,   202,    20,   204,   205,     5,     6,     7,
-     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-    18,    20,    20,    20,    22,     5,     6,     7,     8,     9,
-    22,    11,    12,    13,    14,    15,    16,    17,    18,    20,
-    20,    37,    22,     5,     6,     7,     8,     9,    38,    11,
-    12,    13,    14,    15,    16,    17,    18,    36,    20,    37,
-    22,     6,     7,     8,     9,    20,    11,    12,    13,    14,
-    15,    16,    17,    18,    20,    20,    20,    22,    36,    36,
-    26,    27,    28,    20,    20,    20,    20,    37,    20,    20,
-    36,    26,    27,    28,    29,    30,    31,    32,    20,    34,
-    20,    24,    20,    36,    26,    27,    28,    29,    30,    31,
-    32,    36,    34,    13,    14,    15,    33,    36,    18,    13,
-    14,    15,    35,    37,    18,    20,    37,    20,    40,    20,
-    36,    19,    37,    37,    24,    37,    37,    36,    20,    37,
-    36,    20,     0,    24,    33,    37,    21,    24,     0,     4,
-    37,    35,    24,    24,    97,    33,    65,    43,    43,    24,
-    81,   144,   184,    -1,   141
+static const short yycheck[] = {   115,
+    25,   116,    25,    19,   180,    26,   172,    32,    19,   175,
+    37,   126,   188,    19,    20,   191,    19,    20,    22,    19,
+   186,    19,    20,    39,   200,   140,    19,    19,    20,    40,
+    55,    37,   198,    21,    37,    19,    20,    41,    61,   215,
+    65,    41,    40,    49,    37,    66,    49,     4,    40,   164,
+   216,    49,   218,    19,    10,   231,   232,    49,    14,   211,
+     9,    42,    85,    88,    45,    49,    15,    19,   220,    18,
+   185,    21,   187,    41,    40,    42,    42,    37,    45,    39,
+    46,    47,    48,    41,   109,    19,    41,   112,    40,    19,
+    42,    19,   208,   209,    46,    47,    48,    45,    46,   124,
+    19,    29,    30,    31,    32,   221,   222,    19,   224,    15,
+   226,     5,     6,     7,     8,     9,    15,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    19,    21,    40,    44,
+    19,    21,    19,    42,    46,    47,    48,    42,    85,    86,
+    34,    35,     5,     6,     7,     8,     9,    43,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,   104,    21,   106,
+     3,    41,    19,    19,   111,    19,    29,    30,    31,    32,
+    19,    41,    19,    22,    42,    29,    30,    31,    32,    19,
+    23,    24,    25,    26,    27,    28,    19,    41,    13,    14,
+    15,    40,    41,    18,    40,    19,    29,    30,    31,    32,
+    33,    34,    35,    36,    19,    38,    39,    23,    24,    25,
+    26,    27,    28,    19,    29,    30,    31,    32,    33,    34,
+    35,    36,    19,    38,    39,     5,     6,     7,     8,     9,
+    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    41,    21,     5,     6,     7,     8,     9,    41,    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,    19,    21,     6,     7,     8,     9,
+    41,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    19,    21,    13,    14,    15,    39,    23,    18,    37,    42,
+    19,    42,    19,    45,    41,    19,    39,    23,    23,    20,
+    42,    42,    19,    23,    42,    19,    41,    19,    42,    41,
+    19,    41,    23,    19,    42,    37,    23,     0,     0,    42,
+     9,   118,    40,    42,    40,    30,    39,   114,   117,    95,
+    40,    92,    82,   214,   158,   205,    -1,    -1,   161
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/lib/bison.simple"
@@ -1072,127 +1188,230 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 221 "parse.y"
+#line 308 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 222 "parse.y"
+#line 309 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 223 "parse.y"
+#line 310 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 224 "parse.y"
+#line 311 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 227 "parse.y"
+#line 314 "parse.y"
 {
-			Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+			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 233 "parse.y"
+#line 320 "parse.y"
 {
-			Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,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 238 "parse.y"
+#line 326 "parse.y"
 {
-			Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+			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 244 "parse.y"
+#line 332 "parse.y"
 {
-			Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,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 251 "parse.y"
+#line 338 "parse.y"
+{
+			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 344 "parse.y"
+{
+			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 352 "parse.y"
+{ ; ;
+    break;}
+case 12:
+#line 353 "parse.y"
+{ ; ;
+    break;}
+case 13:
+#line 356 "parse.y"
 {
 			((Class *)class)->nodes = class_nodes;
 			class_nodes = NULL;
 			nodes = g_list_append(nodes,class);
 						;
     break;}
-case 10:
-#line 256 "parse.y"
+case 14:
+#line 361 "parse.y"
 {
 			((Class *)class)->nodes = NULL;
 			class_nodes = NULL;
 			nodes = g_list_append(nodes,class);
 						;
     break;}
-case 11:
-#line 263 "parse.y"
+case 15:
+#line 368 "parse.y"
 {
 			class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
 						;
     break;}
-case 12:
-#line 268 "parse.y"
+case 16:
+#line 373 "parse.y"
 { ; ;
     break;}
-case 13:
-#line 269 "parse.y"
+case 17:
+#line 374 "parse.y"
 { ; ;
     break;}
-case 14:
-#line 270 "parse.y"
+case 18:
+#line 377 "parse.y"
 { ; ;
     break;}
-case 15:
-#line 271 "parse.y"
+case 19:
+#line 378 "parse.y"
 { ; ;
     break;}
-case 16:
-#line 272 "parse.y"
+case 20:
+#line 379 "parse.y"
 { ; ;
     break;}
-case 17:
-#line 273 "parse.y"
+case 21:
+#line 380 "parse.y"
 { ; ;
     break;}
-case 18:
-#line 276 "parse.y"
+case 22:
+#line 383 "parse.y"
 { the_scope = PUBLIC_SCOPE; ;
     break;}
-case 19:
-#line 277 "parse.y"
+case 23:
+#line 384 "parse.y"
 { the_scope = PRIVATE_SCOPE; ;
     break;}
-case 20:
-#line 278 "parse.y"
+case 24:
+#line 385 "parse.y"
 { the_scope = PROTECTED_SCOPE; ;
     break;}
-case 21:
-#line 281 "parse.y"
+case 25:
+#line 386 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
+    break;}
+case 26:
+#line 389 "parse.y"
 {
-			push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,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 27:
+#line 402 "parse.y"
+{
+			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 28:
+#line 418 "parse.y"
+{
+			initializer = yyvsp[0].id;
+			initializer_line = ccode_line;
+				;
+    break;}
+case 29:
+#line 422 "parse.y"
+{
+			initializer = (yyvsp[0].cbuf)->str;
+			initializer_line = ccode_line;
+			g_string_free(yyvsp[0].cbuf, FALSE);
+				;
+    break;}
+case 30:
+#line 430 "parse.y"
+{ ; ;
+    break;}
+case 31:
+#line 431 "parse.y"
+{ ; ;
+    break;}
+case 32:
+#line 432 "parse.y"
+{ destructor = NULL; ;
+    break;}
+case 33:
+#line 433 "parse.y"
+{ initializer = NULL; ;
+    break;}
+case 34:
+#line 434 "parse.y"
+{
+			destructor = NULL;
+			initializer = NULL;
+					;
+    break;}
+case 35:
+#line 440 "parse.y"
+{
+			push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
 						;
     break;}
-case 22:
-#line 284 "parse.y"
+case 36:
+#line 443 "parse.y"
 {
-			push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id);
+			push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
 						;
     break;}
-case 23:
-#line 288 "parse.y"
+case 37:
+#line 447 "parse.y"
 {
 			if(strcmp(yyvsp[-6].id,"get")==0 &&
 			   strcmp(yyvsp[-3].id,"set")==0) {
@@ -1229,8 +1448,8 @@ case 23:
 			}
 						;
     break;}
-case 24:
-#line 323 "parse.y"
+case 38:
+#line 482 "parse.y"
 {
 			if(strcmp(yyvsp[-3].id,"get")==0) {
 				Node *node;
@@ -1260,8 +1479,79 @@ case 24:
 			}
 						;
     break;}
-case 25:
-#line 353 "parse.y"
+case 39:
+#line 510 "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[-2].id);
+				g_free(yyvsp[-1].id);
+				g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+
+			type = pop_type();
+
+			var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line);
+			if(var->scope == PRIVATE_SCOPE)
+				root = "self->_priv";
+			else if(var->scope == CLASS_SCOPE)
+				root = "SELF_CLASS(GTK_OBJECT(self)->klass)";
+			else
+				root = "self";
+
+			if(strcmp(yyvsp[0].id, "link")==0) {
+				set = g_strdup_printf("%s->%s = ARG;",
+						      root, yyvsp[-1].id);
+			} else if(strcmp(yyvsp[0].id, "stringlink")==0) {
+				set = g_strdup_printf("g_free(%s->%s); "
+						      "%s->%s = g_strdup(ARG);",
+						      root, yyvsp[-1].id,
+						      root, yyvsp[-1].id);
+			} else if(strcmp(yyvsp[0].id, "objectlink")==0) {
+				set = g_strdup_printf(
+				  "if(%s->%s) "
+				   "gtk_object_unref(GTK_OBJECT(%s->%s)); "
+				  "%s->%s = ARG; "
+				  "if(%s->%s) "
+				   "gtk_object_ref(GTK_OBJECT(%s->%s));",
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id,
+				  root, yyvsp[-1].id);
+			} else {
+				g_assert_not_reached();
+			}
+
+			/* get is the same for everything */
+			get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id);
+
+			g_free(yyvsp[0].id);
+
+
+			if(!type)
+				type = copy_type(var->vtype);
+
+			node = new_argument(yyvsp[-2].id, type, yyvsp[-3].list,
+					    yyvsp[-1].id, get, yyvsp[-4].line,
+					    set, yyvsp[-4].line, yyvsp[-4].line);
+			class_nodes = g_list_append(class_nodes,node);
+						;
+    break;}
+case 40:
+#line 580 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"type")!=0) {
 				g_free(yyvsp[-4].id);
@@ -1272,39 +1562,39 @@ case 25:
 			yyval.id = yyvsp[-4].id;
 						;
     break;}
-case 26:
-#line 362 "parse.y"
+case 41:
+#line 589 "parse.y"
 {
 			yyval.id = yyvsp[0].id;
 			typestack = g_list_prepend(typestack,NULL);
 						;
     break;}
-case 27:
-#line 368 "parse.y"
+case 42:
+#line 595 "parse.y"
 { yyval.list = yyvsp[-1].list; ;
     break;}
-case 28:
-#line 369 "parse.y"
+case 43:
+#line 596 "parse.y"
 { yyval.list = NULL; ;
     break;}
-case 29:
-#line 372 "parse.y"
+case 44:
+#line 599 "parse.y"
 {
 			yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
 						;
     break;}
-case 30:
-#line 375 "parse.y"
+case 45:
+#line 602 "parse.y"
 {
 			yyval.list = g_list_append(NULL,yyvsp[0].id);
 						;
     break;}
-case 31:
-#line 381 "parse.y"
+case 46:
+#line 608 "parse.y"
 { ; ;
     break;}
-case 32:
-#line 382 "parse.y"
+case 47:
+#line 609 "parse.y"
 {
 			Type *type = typestack->data;
 			char *oldname = type->name;
@@ -1312,156 +1602,156 @@ case 32:
 			g_free(oldname);
 						;
     break;}
-case 33:
-#line 390 "parse.y"
+case 48:
+#line 617 "parse.y"
 {
 			Node *node = new_type(0,yyvsp[0].id,NULL);
 			typestack = g_list_prepend(typestack,node);
 						;
     break;}
-case 34:
-#line 394 "parse.y"
+case 49:
+#line 621 "parse.y"
 {
 			Node *node = new_type(stars,yyvsp[-1].id,NULL);
 			stars = 0;
 			typestack = g_list_prepend(typestack,node);
 						;
     break;}
-case 35:
-#line 401 "parse.y"
+case 50:
+#line 628 "parse.y"
 {
 			yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
 						;
     break;}
-case 36:
-#line 404 "parse.y"
+case 51:
+#line 631 "parse.y"
 {
 			yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
 						;
     break;}
-case 37:
-#line 407 "parse.y"
+case 52:
+#line 634 "parse.y"
 {
 			yyval.id = g_strdup(yyvsp[0].id);
 						;
     break;}
-case 38:
-#line 410 "parse.y"
+case 53:
+#line 637 "parse.y"
 {
 			yyval.id = g_strdup("unsigned char");
 						;
     break;}
-case 39:
-#line 413 "parse.y"
+case 54:
+#line 640 "parse.y"
 {
 			yyval.id = g_strdup("signed char");
 						;
     break;}
-case 40:
-#line 416 "parse.y"
+case 55:
+#line 643 "parse.y"
 {
 			yyval.id = g_strdup("char");
 						;
     break;}
-case 41:
-#line 419 "parse.y"
+case 56:
+#line 646 "parse.y"
 {
 			yyval.id = g_strdup("double");
 						;
     break;}
-case 42:
-#line 422 "parse.y"
+case 57:
+#line 649 "parse.y"
 {
 			yyval.id = g_strdup("float");
 						;
     break;}
-case 43:
-#line 425 "parse.y"
+case 58:
+#line 652 "parse.y"
 {
 			yyval.id = yyvsp[0].id;
 						;
     break;}
-case 44:
-#line 428 "parse.y"
+case 59:
+#line 655 "parse.y"
 {
 			yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 						;
     break;}
-case 45:
-#line 432 "parse.y"
+case 60:
+#line 659 "parse.y"
 {
 			yyval.id = yyvsp[0].id;
 						;
     break;}
-case 46:
-#line 435 "parse.y"
+case 61:
+#line 662 "parse.y"
 {
 			yyval.id = g_strdup("void");
 						;
     break;}
-case 47:
-#line 440 "parse.y"
+case 62:
+#line 667 "parse.y"
 {
 			yyval.id = "long int";
 						;
     break;}
-case 48:
-#line 443 "parse.y"
+case 63:
+#line 670 "parse.y"
 {
 			yyval.id = "long";
 						;
     break;}
-case 49:
-#line 446 "parse.y"
+case 64:
+#line 673 "parse.y"
 {
 			yyval.id = "short int";
 						;
     break;}
-case 50:
-#line 449 "parse.y"
+case 65:
+#line 676 "parse.y"
 {
 			yyval.id = "short";
 						;
     break;}
-case 51:
-#line 452 "parse.y"
+case 66:
+#line 679 "parse.y"
 {
 			yyval.id = "int";
 						;
     break;}
-case 52:
-#line 457 "parse.y"
+case 67:
+#line 684 "parse.y"
 {
 			yyval.id = "enum ";
 						;
     break;}
-case 53:
-#line 460 "parse.y"
+case 68:
+#line 687 "parse.y"
 {
 			yyval.id = "union ";
 						;
     break;}
-case 54:
-#line 463 "parse.y"
+case 69:
+#line 690 "parse.y"
 {
 			yyval.id = "struct ";
 						;
     break;}
-case 55:
-#line 468 "parse.y"
+case 70:
+#line 695 "parse.y"
 { stars++; ;
     break;}
-case 56:
-#line 469 "parse.y"
+case 71:
+#line 696 "parse.y"
 { stars++; ;
     break;}
-case 57:
-#line 473 "parse.y"
+case 72:
+#line 700 "parse.y"
 {
-			if(strcmp(yyvsp[-1].id,"first")==0)
+			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'"));
@@ -1471,14 +1761,14 @@ case 57:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 58:
-#line 485 "parse.y"
+case 73:
+#line 712 "parse.y"
 {
 			yyval.sigtype = SIGNAL_LAST_METHOD;
 					;
     break;}
-case 59:
-#line 491 "parse.y"
+case 74:
+#line 718 "parse.y"
 {
 			if(strcmp(yyvsp[-1].id,"first")==0)
 				yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1492,8 +1782,8 @@ case 59:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 60:
-#line 503 "parse.y"
+case 75:
+#line 730 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"first")==0)
 				yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1507,140 +1797,170 @@ case 60:
 			g_free(yyvsp[-2].id);
 					;
     break;}
-case 61:
-#line 515 "parse.y"
+case 76:
+#line 742 "parse.y"
 {
 			yyval.sigtype = SIGNAL_LAST_METHOD;
 					;
     break;}
-case 62:
-#line 518 "parse.y"
+case 77:
+#line 745 "parse.y"
 {
 			/* the_scope was default thus public */
 			the_scope = PUBLIC_SCOPE;
 					;
     break;}
-case 63:
-#line 524 "parse.y"
+case 78:
+#line 751 "parse.y"
 {
-			gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+			gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
 						;
     break;}
-case 64:
-#line 529 "parse.y"
+case 79:
+#line 756 "parse.y"
 {
-			gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+			gtktypes = g_list_append(gtktypes, yyvsp[0].id);
 						;
     break;}
-case 65:
-#line 532 "parse.y"
+case 80:
+#line 759 "parse.y"
 { 
-			gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+			gtktypes = g_list_append(gtktypes, yyvsp[0].id);
        						;
     break;}
-case 66:
-#line 537 "parse.y"
+case 81:
+#line 764 "parse.y"
 { yyval.cbuf = yyvsp[0].cbuf; ;
     break;}
-case 67:
-#line 538 "parse.y"
+case 82:
+#line 765 "parse.y"
 { yyval.cbuf = NULL; ;
     break;}
-case 68:
-#line 542 "parse.y"
+case 83:
+#line 769 "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[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-				      ccode_line,vararg);
+				      yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line,
+				      ccode_line, vararg, yyvsp[-8].list);
 									;
     break;}
-case 69:
-#line 552 "parse.y"
+case 84:
+#line 785 "parse.y"
 {
 			if(!has_self) {
 				yyerror(_("signal without 'self' as "
 					  "first parameter"));
+				free_all_global_state();
 				YYERROR;
 			}
-			push_function(the_scope, 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 562 "parse.y"
+case 85:
+#line 801 "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(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-				      yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-				      ccode_line,vararg);
+				      yyvsp[0].cbuf, yyvsp[-8].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 71:
-#line 572 "parse.y"
+case 86:
+#line 817 "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(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-				      yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
-				      ccode_line,vararg);
+				      yyvsp[0].cbuf, yyvsp[-7].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 72:
-#line 582 "parse.y"
+case 87:
+#line 833 "parse.y"
 {
 			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[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
-				      ccode_line,vararg);
+				      yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 73:
-#line 592 "parse.y"
+case 88:
+#line 844 "parse.y"
 {
 			push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
-				      yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,
-				      yyvsp[-10].line,ccode_line,
-				      vararg);
+				      yyvsp[-5].id, yyvsp[0].cbuf,
+				      yyvsp[-10].line, ccode_line,
+				      vararg, NULL);
 									;
     break;}
-case 74:
-#line 598 "parse.y"
+case 89:
+#line 850 "parse.y"
 {
+			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[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line,
-				      vararg);
+				      yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+				      vararg, NULL);
 								;
     break;}
-case 75:
-#line 603 "parse.y"
+case 90:
+#line 860 "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(NO_SCOPE, 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) {
+					      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(NO_SCOPE, CLASS_INIT_METHOD, NULL,
-					      yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-					      ccode_line,FALSE);
+					      yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+					      ccode_line, FALSE, NULL);
 			} else {
 				g_free(yyvsp[-4].id);
 				g_free(yyvsp[-2].id);
@@ -1650,27 +1970,66 @@ case 75:
 			}
 						;
     break;}
-case 76:
-#line 624 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
+case 91:
+#line 881 "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 77:
-#line 625 "parse.y"
+case 92:
+#line 892 "parse.y"
 {
-			yyval.id = (yyvsp[0].cbuf)->str;
-			g_string_free(yyvsp[0].cbuf,FALSE);
+			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 93:
+#line 911 "parse.y"
+{
+			g_free(onerror); onerror = NULL;
+			g_free(defreturn); defreturn = NULL;
 					;
     break;}
-case 78:
-#line 629 "parse.y"
-{ yyval.id = NULL; ;
+case 94:
+#line 917 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
     break;}
-case 79:
-#line 632 "parse.y"
+case 95:
+#line 918 "parse.y"
+{
+			yyval.id = (yyvsp[1].cbuf)->str;
+			g_string_free(yyvsp[1].cbuf, FALSE);
+					;
+    break;}
+case 96:
+#line 924 "parse.y"
 { vararg = FALSE; has_self = FALSE; ;
     break;}
-case 80:
-#line 633 "parse.y"
+case 97:
+#line 925 "parse.y"
 {
 			vararg = FALSE;
 			has_self = TRUE;
@@ -1683,8 +2042,8 @@ case 80:
 			}
        					;
     break;}
-case 81:
-#line 644 "parse.y"
+case 98:
+#line 936 "parse.y"
 {
 			has_self = TRUE;
 			if(strcmp(yyvsp[-2].id,"self")==0)
@@ -1696,40 +2055,40 @@ case 81:
 			}
 					;
     break;}
-case 82:
-#line 654 "parse.y"
+case 99:
+#line 946 "parse.y"
 { has_self = FALSE; ;
     break;}
-case 83:
-#line 657 "parse.y"
+case 100:
+#line 949 "parse.y"
 { vararg = TRUE; ;
     break;}
-case 84:
-#line 658 "parse.y"
+case 101:
+#line 950 "parse.y"
 { vararg = FALSE; ;
     break;}
-case 85:
-#line 661 "parse.y"
+case 102:
+#line 953 "parse.y"
 { ; ;
     break;}
-case 86:
-#line 662 "parse.y"
+case 103:
+#line 954 "parse.y"
 { ; ;
     break;}
-case 87:
-#line 665 "parse.y"
+case 104:
+#line 957 "parse.y"
 {
 			push_funcarg(yyvsp[0].id,NULL);
 								;
     break;}
-case 88:
-#line 668 "parse.y"
+case 105:
+#line 960 "parse.y"
 {
 			push_funcarg(yyvsp[-1].id,yyvsp[0].id);
 								;
     break;}
-case 89:
-#line 671 "parse.y"
+case 106:
+#line 963 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1739,8 +2098,8 @@ case 89:
 			push_funcarg(yyvsp[-4].id,NULL);
 								;
     break;}
-case 90:
-#line 679 "parse.y"
+case 107:
+#line 971 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1750,16 +2109,16 @@ case 90:
 			push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
 								;
     break;}
-case 91:
-#line 689 "parse.y"
+case 108:
+#line 981 "parse.y"
 { ; ;
     break;}
-case 92:
-#line 690 "parse.y"
+case 109:
+#line 982 "parse.y"
 { ; ;
     break;}
-case 93:
-#line 693 "parse.y"
+case 110:
+#line 985 "parse.y"
 {
 			if(strcmp(yyvsp[0].id,"type")==0) {
 				Node *node = new_check(TYPE_CHECK,NULL);
@@ -1774,61 +2133,61 @@ case 93:
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 94:
-#line 706 "parse.y"
+case 111:
+#line 998 "parse.y"
 {
 			Node *node = new_check(GT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 95:
-#line 710 "parse.y"
+case 112:
+#line 1002 "parse.y"
 {
 			Node *node = new_check(LT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 96:
-#line 714 "parse.y"
+case 113:
+#line 1006 "parse.y"
 {
 			Node *node = new_check(GE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 97:
-#line 718 "parse.y"
+case 114:
+#line 1010 "parse.y"
 {
 			Node *node = new_check(LE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 98:
-#line 722 "parse.y"
+case 115:
+#line 1014 "parse.y"
 {
 			Node *node = new_check(EQ_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 99:
-#line 726 "parse.y"
+case 116:
+#line 1018 "parse.y"
 {
 			Node *node = new_check(NE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 100:
-#line 732 "parse.y"
+case 117:
+#line 1024 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 101:
-#line 733 "parse.y"
+case 118:
+#line 1025 "parse.y"
 {
 			yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 102:
-#line 737 "parse.y"
+case 119:
+#line 1029 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -2053,5 +2412,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 740 "parse.y"
+#line 1032 "parse.y"