X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/f31590988781d77ff5249987801d03a986368ca2..dd11885aadcfaafae2d6268c381b0aac94cbc149:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index f8593b9..7b6e9eb 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -20,19 +20,23 @@
 #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	ARGUMENT	286
+#define	VIRTUAL	287
+#define	SIGNAL	288
+#define	OVERRIDE	289
 
 #line 21 "parse.y"
 
@@ -42,13 +46,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;
@@ -61,8 +64,22 @@ 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
+   anyway */
+static int the_scope = NO_SCOPE;
+
 void free(void *ptr);
 int yylex(void);
 
@@ -80,81 +97,136 @@ 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;
        
-	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 = pop_type();
 	} else {
 		type = (Type *)new_type(0,g_strdup("void"),NULL);
 	}
 	
 	/* 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)) {
+	     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);
 	}
-	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) {
+				print_error(FALSE,
+					    _("NONE can only appear in an "
+					      "argument list by itself"),
+					    line_no);
+			}
+		}
+	}
+	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);
+
+	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_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);
@@ -190,8 +262,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);
 
-#line 178 "parse.y"
+	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 288 "parse.y"
 typedef union {
 	char *id;
 	GString *cbuf;
@@ -213,26 +327,26 @@ typedef union {
 
 
 
-#define	YYFINAL		207
+#define	YYFINAL		242
 #define	YYFLAG		-32768
-#define	YYNTBASE	46
+#define	YYNTBASE	49
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86)
 
 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,    47,     2,     2,     2,     2,     2,     2,    40,
+    41,    43,     2,    44,    48,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,    38,    46,
+    39,    45,     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,    36,    42,    37,     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,76 +362,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
+    27,    28,    29,    30,    31,    32,    33,    34,    35
 };
 
 #if YYDEBUG != 0
 static const short yyprhs[] = {     0,
-     0,     4,     7,    10,    12,    15,    18,    20,    22,    27,
-    32,    35,    38,    41,    43,    45,    47,    52,    58,    63,
-    69,    81,    90,    94,    95,    99,   101,   103,   106,   108,
-   111,   114,   117,   119,   122,   125,   127,   129,   131,   133,
-   136,   138,   140,   143,   145,   148,   150,   152,   154,   156,
-   158,   161,   163,   167,   171,   174,   177,   179,   184,   188,
-   190,   193,   195,   205,   215,   224,   237,   247,   257,   263,
-   266,   270,   273,   274,   276,   278,   282,   284,   288,   290,
-   294,   296,   299,   303,   310,   318,   321,   323,   325,   328,
-   331,   335,   339,   343,   347,   349,   352
+     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,    65,    69,    72,    76,    79,
+    82,    84,    86,    87,    93,   100,   112,   121,   127,   133,
+   135,   139,   140,   144,   146,   148,   151,   153,   156,   159,
+   162,   164,   167,   170,   172,   174,   176,   178,   181,   183,
+   185,   188,   190,   193,   195,   197,   199,   201,   203,   206,
+   208,   211,   213,   217,   221,   224,   226,   231,   235,   237,
+   240,   242,   253,   265,   275,   285,   294,   306,   315,   321,
+   324,   329,   330,   332,   335,   337,   339,   343,   345,   349,
+   351,   355,   357,   360,   364,   371,   379,   382,   384,   386,
+   389,   392,   396,   400,   404,   408,   410,   413
 };
 
-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,     3,    22,     4,    22,
-     0,    50,    65,     0,    50,    51,     0,    50,    52,     0,
-    65,     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,    27,    20,    62,     0,    20,    27,    62,     0,
-    27,    62,     0,    20,    62,     0,    62,     0,    20,    35,
-    63,    36,     0,    63,    39,    20,     0,    20,     0,    32,
-    24,     0,    34,     0,    30,    61,    55,    20,    35,    67,
-    36,    66,    64,     0,    29,    27,    55,    20,    35,    67,
-    36,    66,    64,     0,    29,    55,    20,    35,    67,    36,
-    66,    64,     0,    31,    35,    22,    36,    55,    20,    35,
-    67,    36,    66,    32,    24,     0,    26,    55,    20,    35,
-    67,    36,    66,    32,    24,     0,    27,    55,    20,    35,
-    67,    36,    66,    32,    24,     0,    20,    35,    20,    36,
-    64,     0,    19,    73,     0,    19,    32,    24,     0,    40,
-    41,     0,     0,     6,     0,    20,     0,    20,    39,    68,
-     0,    68,     0,    69,    39,    10,     0,    69,     0,    69,
-    39,    70,     0,    70,     0,    55,    20,     0,    55,    20,
-    23,     0,    55,    20,    35,    20,    71,    36,     0,    55,
-    20,    23,    35,    20,    71,    36,     0,    71,    72,     0,
-    72,     0,    20,     0,    42,    73,     0,    43,    73,     0,
-    42,    40,    73,     0,    43,    40,    73,     0,    40,    40,
-    73,     0,    44,    40,    73,     0,    21,     0,    45,    21,
-     0,    20,     0
+static const short yyrhs[] = {    51,
+    52,    51,     0,    52,    51,     0,    51,    52,     0,    52,
+     0,    23,     0,    26,     0,    24,     0,    25,     0,    27,
+     0,    28,     0,    51,    50,     0,    50,     0,    53,    36,
+    54,    37,     0,    53,    36,    37,     0,     3,    21,     4,
+    21,     0,    54,    55,     0,    55,     0,    76,     0,    60,
+     0,    61,     0,    38,     0,    29,     0,    30,     0,    31,
+     0,    19,    19,     0,    19,    36,    23,     0,    39,    85,
+     0,    39,    36,    23,     0,    57,    58,     0,    58,    57,
+     0,    58,     0,    57,     0,     0,    56,    65,    19,    59,
+    38,     0,    56,    65,    19,    22,    59,    38,     0,    32,
+    63,    62,    19,    19,    36,    23,    19,    36,    23,    38,
+     0,    32,    63,    62,    19,    19,    36,    23,    38,     0,
+    32,    63,    62,    19,    19,     0,    19,    40,    19,    65,
+    41,     0,    19,     0,    40,    64,    41,     0,     0,    19,
+    42,    64,     0,    19,     0,    66,     0,     5,    66,     0,
+    67,     0,    67,    70,     0,    12,    68,     0,    11,    68,
+     0,    68,     0,    12,    18,     0,    11,    18,     0,    18,
+     0,    17,     0,    16,     0,    19,     0,    69,    19,     0,
+    21,     0,     6,     0,    13,    15,     0,    13,     0,    14,
+    15,     0,    14,     0,    15,     0,     9,     0,     8,     0,
+     7,     0,    43,    70,     0,    43,     0,    19,    73,     0,
+    73,     0,    56,    19,    73,     0,    19,    56,    73,     0,
+    56,    73,     0,    71,     0,    19,    40,    74,    41,     0,
+    74,    44,    19,     0,    19,     0,    36,    23,     0,    38,
+     0,    34,    63,    72,    65,    19,    40,    79,    41,    77,
+    75,     0,    56,    34,    63,    71,    65,    19,    40,    79,
+    41,    77,    75,     0,    33,    56,    65,    19,    40,    79,
+    41,    77,    75,     0,    56,    33,    65,    19,    40,    79,
+    41,    77,    75,     0,    33,    65,    19,    40,    79,    41,
+    77,    75,     0,    35,    40,    21,    41,    65,    19,    40,
+    79,    41,    77,    75,     0,    56,    65,    19,    40,    79,
+    41,    77,    75,     0,    19,    40,    19,    41,    75,     0,
+    19,    78,     0,    19,    78,    19,    78,     0,     0,    85,
+     0,    36,    23,     0,     6,     0,    19,     0,    19,    44,
+    80,     0,    80,     0,    81,    44,    10,     0,    81,     0,
+    81,    44,    82,     0,    82,     0,    65,    19,     0,    65,
+    19,    22,     0,    65,    19,    40,    19,    83,    41,     0,
+    65,    19,    22,    40,    19,    83,    41,     0,    83,    84,
+     0,    84,     0,    19,     0,    45,    85,     0,    46,    85,
+     0,    45,    39,    85,     0,    46,    39,    85,     0,    39,
+    39,    85,     0,    47,    39,    85,     0,    20,     0,    48,
+    20,     0,    19,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   197,   198,   199,   200,   203,   207,   211,   215,   221,   228,
-   233,   234,   235,   236,   237,   238,   241,   244,   247,   250,
-   254,   283,   309,   310,   313,   316,   322,   323,   331,   335,
-   342,   345,   348,   351,   354,   357,   360,   363,   366,   369,
-   373,   376,   381,   384,   387,   390,   393,   398,   401,   404,
-   409,   410,   413,   425,   437,   440,   452,   457,   462,   465,
-   470,   471,   475,   485,   495,   505,   511,   516,   521,   542,
-   543,   547,   548,   551,   552,   563,   573,   576,   577,   580,
-   581,   584,   587,   590,   598,   608,   609,   612,   625,   629,
-   633,   637,   641,   645,   651,   652,   656
+   306,   307,   308,   309,   312,   318,   324,   330,   336,   342,
+   350,   351,   354,   359,   366,   371,   372,   375,   376,   377,
+   378,   381,   382,   383,   386,   399,   415,   419,   427,   428,
+   429,   430,   431,   437,   440,   444,   479,   507,   572,   581,
+   587,   588,   591,   594,   600,   601,   609,   613,   620,   623,
+   626,   629,   632,   635,   638,   641,   644,   647,   651,   654,
+   659,   662,   665,   668,   671,   676,   679,   682,   687,   688,
+   692,   704,   710,   722,   734,   737,   743,   748,   751,   756,
+   757,   761,   772,   783,   794,   805,   816,   822,   827,   848,
+   859,   878,   884,   885,   891,   892,   903,   913,   916,   917,
+   920,   921,   924,   927,   930,   938,   948,   949,   952,   965,
+   969,   973,   977,   981,   985,   991,   992,   996
 };
 #endif
 
@@ -326,166 +450,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","ARGUMENT","VIRTUAL","SIGNAL",
-"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'",
-"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable",
-"argument","argflags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","fullsigtype","sigtype","tokenlist","codenocode","method","onerror",
-"funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL
+"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM",
+"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED",
+"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",
+"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,    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,    61,    61,    61,    62,    63,    63,
-    64,    64,    65,    65,    65,    65,    65,    65,    65,    66,
-    66,    66,    66,    67,    67,    67,    67,    68,    68,    69,
-    69,    70,    70,    70,    70,    71,    71,    72,    72,    72,
-    72,    72,    72,    72,    73,    73,    73
+    49,    49,    49,    49,    50,    50,    50,    50,    50,    50,
+    51,    51,    52,    52,    53,    54,    54,    55,    55,    55,
+    55,    56,    56,    56,    57,    57,    58,    58,    59,    59,
+    59,    59,    59,    60,    60,    61,    61,    61,    62,    62,
+    63,    63,    64,    64,    65,    65,    66,    66,    67,    67,
+    67,    67,    67,    67,    67,    67,    67,    67,    67,    67,
+    68,    68,    68,    68,    68,    69,    69,    69,    70,    70,
+    71,    71,    72,    72,    72,    72,    73,    74,    74,    75,
+    75,    76,    76,    76,    76,    76,    76,    76,    76,    77,
+    77,    77,    78,    78,    79,    79,    79,    79,    80,    80,
+    81,    81,    82,    82,    82,    82,    83,    83,    84,    84,
+    84,    84,    84,    84,    84,    85,    85,    85
 };
 
 static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     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,     3,     3,     2,     2,     1,     4,     3,     1,
-     2,     1,     9,     9,     8,    12,     9,     9,     5,     2,
-     3,     2,     0,     1,     1,     3,     1,     3,     1,     3,
-     1,     2,     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,     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,     0,     0,    24,     0,     0,
-     0,     0,    15,    16,    14,    10,     0,     0,    42,    50,
-    49,    48,     0,     0,    44,    46,    47,    38,    37,    36,
-    39,    41,     0,    27,    29,    33,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    57,     0,     9,    12,    13,
-    11,     0,    28,    35,    32,    34,    31,    43,    45,     0,
-    52,    30,    40,     0,    26,     0,     0,     0,     0,     0,
-     0,     0,    56,     0,    55,     0,     0,     0,     0,    17,
-     0,    51,     0,    19,     0,     0,    23,     0,     0,     0,
-    54,    60,     0,    53,     0,     0,     0,    62,    69,    18,
-    42,    39,     0,     0,    77,    79,    81,    20,     0,    25,
-     0,     0,     0,    58,     0,     0,     0,    61,     0,    82,
-    73,     0,    73,     0,     0,    73,    59,     0,     0,    76,
-    83,     0,     0,     0,     0,    78,    80,     0,     0,    73,
-     0,    73,     0,     0,     0,    97,    95,     0,     0,    70,
-    72,     0,     0,     0,    22,     0,    65,     0,     0,     0,
-    88,     0,     0,     0,     0,     0,    87,    71,    96,    67,
-    68,     0,    64,    63,    73,     0,     0,     0,    89,     0,
-    90,     0,    84,    86,     0,     0,    85,    93,    91,    92,
-    94,    21,     0,    66,     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,    42,     0,    42,     0,    14,    21,     0,    17,
+     0,    19,    20,    18,    15,     0,     0,     0,     0,    60,
+    68,    67,    66,     0,     0,    62,    64,    65,    56,    55,
+    54,    57,    59,     0,     0,    45,    47,    51,     0,     0,
+     0,    13,    16,     0,    42,     0,     0,    44,     0,    40,
+     0,    46,    53,    50,    52,    49,    61,    63,     0,     0,
+    70,    48,    58,     0,     0,    76,     0,    72,     0,     0,
+     0,    33,     0,     0,    41,     0,     0,     0,     0,    69,
+     0,     0,     0,    71,     0,    75,     0,     0,     0,     0,
+     0,     0,    33,     0,     0,    32,    31,     0,     0,    81,
+    89,    43,     0,    38,     0,    60,    57,     0,     0,    98,
+   100,   102,    79,     0,    74,    73,     0,     0,     0,     0,
+    25,     0,     0,   118,   116,     0,     0,    27,     0,    29,
+    30,    34,    80,     0,     0,     0,     0,   103,    92,     0,
+    77,     0,     0,     0,     0,     0,    26,    35,    28,   117,
+    92,    39,     0,    92,    97,   104,     0,     0,     0,    99,
+   101,    78,     0,     0,    92,     0,     0,     0,    37,     0,
+     0,     0,     0,    90,    93,    86,    92,     0,     0,     0,
+    88,     0,    84,     0,   109,     0,     0,     0,     0,     0,
+   108,    94,     0,     0,    92,    85,    92,     0,     0,     0,
+     0,   110,     0,   111,     0,   105,   107,    91,    82,     0,
+     0,    36,   106,   114,   112,   113,   115,    87,    83,     0,
+     0,     0
 };
 
-static const short yydefgoto[] = {   205,
-     4,     5,     6,    22,    23,    24,    50,    76,   113,    44,
-    45,    46,    47,    72,    55,    56,   103,   109,    25,   145,
-   114,   115,   116,   117,   176,   177,   160
+static const short yydefgoto[] = {   240,
+     8,     9,    10,    11,    29,    30,    31,   116,   117,   118,
+    32,    33,    71,    38,    69,   128,    56,    57,    58,    59,
+    82,    86,    87,    88,   134,   121,    34,   179,   194,   129,
+   130,   131,   132,   210,   211,   195
 };
 
-static const short yypact[] = {     3,
-    47,-32768,-32768,    70,   169,    94,    75,-32768,-32768,   169,
-   182,   171,    79,   182,   100,   125,   125,   109,    69,    77,
-   111,   159,-32768,-32768,-32768,-32768,   108,   160,-32768,-32768,
--32768,-32768,   190,   196,   138,   147,-32768,-32768,-32768,-32768,
--32768,-32768,   144,-32768,   132,-32768,   163,   193,   197,   198,
-   125,   199,    32,   200,   125,-32768,   194,-32768,-32768,-32768,
--32768,   145,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    65,
-   132,-32768,-32768,   161,   184,   186,   203,   204,   191,   192,
-   205,   208,-32768,    26,-32768,   209,   195,    76,   201,-32768,
-   143,-32768,   202,-32768,   143,   197,-32768,   210,   206,   143,
--32768,-32768,    66,-32768,   207,   125,   213,-32768,-32768,-32768,
-   211,   176,   212,   214,-32768,   215,-32768,-32768,   216,-32768,
-   217,   143,   219,-32768,   218,   143,   220,-32768,   125,    21,
-    -6,   107,    -6,   221,   222,    -6,-32768,   223,   225,-32768,
-   226,   224,    -9,   227,   230,-32768,-32768,   231,    29,    -6,
-    76,    -6,   143,   228,    28,-32768,-32768,   229,   235,-32768,
--32768,   233,   240,   234,-32768,    76,-32768,    76,   236,    28,
--32768,   237,    -2,     5,   238,    11,-32768,-32768,-32768,-32768,
--32768,   241,-32768,-32768,    -6,    22,    -4,    -4,-32768,    -4,
--32768,    -4,-32768,-32768,   239,   242,-32768,-32768,-32768,-32768,
--32768,-32768,   243,-32768,   246,   251,-32768
+static const short yypact[] = {   136,
+   -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   136,   167,
+   -16,    13,-32768,   167,   167,   150,    15,   167,    19,-32768,
+-32768,-32768,    27,   137,    27,    37,-32768,-32768,   170,-32768,
+   107,-32768,-32768,-32768,-32768,    25,    61,    98,   254,-32768,
+-32768,-32768,-32768,   263,   269,   114,   118,-32768,-32768,-32768,
+-32768,-32768,-32768,   221,   116,-32768,   104,-32768,   138,    73,
+   151,-32768,-32768,   221,    27,   154,   133,   155,   157,   156,
+   159,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   187,   184,
+   104,-32768,-32768,   146,   212,-32768,   221,-32768,   200,   229,
+   239,    43,    96,    61,-32768,   245,   255,   240,   238,-32768,
+   246,   260,   266,-32768,    -8,-32768,   270,   221,   248,    -8,
+   221,    36,     3,    -1,   238,   251,   272,   256,   273,-32768,
+-32768,-32768,   221,   257,   238,   258,    57,   276,   259,-32768,
+   253,-32768,-32768,    64,-32768,-32768,   252,   279,   238,   282,
+-32768,   280,   264,-32768,-32768,   281,   285,-32768,   265,-32768,
+-32768,-32768,-32768,   267,   284,   268,   221,     5,   291,   204,
+-32768,   292,   238,   274,   271,   275,-32768,-32768,-32768,-32768,
+   291,-32768,   -10,   291,-32768,   277,   294,    18,    96,-32768,
+-32768,-32768,   278,   238,   291,   238,    96,   286,-32768,    96,
+   297,    91,   295,   301,-32768,-32768,   291,   283,    96,   287,
+-32768,   298,-32768,    91,-32768,   288,    -5,    10,   290,    29,
+-32768,-32768,    18,    96,   291,-32768,   291,   293,    50,     4,
+     4,-32768,     4,-32768,     4,-32768,-32768,-32768,-32768,    96,
+    96,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   323,
+   325,-32768
 };
 
 static const short yypgoto[] = {-32768,
-    93,   265,-32768,-32768,   248,   249,-32768,   137,   -16,   247,
--32768,   -13,-32768,   168,-32768,   -44,-32768,  -136,   254,  -128,
-   -93,   105,-32768,   148,    73,  -172,   -81
+    69,   117,   317,-32768,-32768,   303,   -21,   213,   217,   222,
+-32768,-32768,-32768,   -19,   242,   -23,   299,-32768,   126,-32768,
+   261,   243,-32768,   -24,-32768,  -174,-32768,  -164,   124,  -113,
+   182,-32768,   180,   139,  -120,  -114
 };
 
 
-#define	YYLAST		280
-
-
-static const short yytable[] = {    43,
-    48,   119,    52,   194,   148,     1,   123,   151,    83,    85,
-   156,   157,   143,   194,   167,   156,   157,   156,   157,    65,
-    67,   166,   158,   168,   156,   157,     2,     3,   135,   183,
-   171,   184,   138,   144,    78,   159,   101,   188,    86,   104,
-   159,   171,   159,   141,   190,    80,   193,   171,   164,   159,
-   172,    80,   173,   174,   175,   142,   196,   197,    81,   169,
-    82,   172,   165,   173,   174,   175,    82,   172,     7,   173,
-   174,   175,     1,    28,    29,    30,    31,    32,    13,    33,
-    34,    35,    36,    37,    38,    39,    40,    89,    41,   127,
-    42,   189,   191,     8,     9,    51,    53,    11,    90,    91,
-    26,   124,    14,    54,   125,   198,   199,   107,   200,   108,
-   201,    28,    29,    30,    31,    32,   146,    33,    34,    35,
-    36,    37,    38,    39,    40,    12,    41,    62,    42,    28,
-    29,    30,    31,    32,    27,    33,    34,    35,    36,    37,
-    38,    39,    40,    49,    41,    57,    42,    28,   111,    30,
-    31,    32,    68,    33,    34,    35,    36,    37,    38,    39,
-    40,    69,   112,    70,    42,    29,    30,    31,    32,    71,
-    33,    34,    35,    36,    37,    38,    39,    40,    15,    41,
-    88,    42,    73,    93,    16,    17,    18,    19,    20,    21,
-    15,    58,     2,     3,    94,    95,    16,    17,    18,    19,
-    20,    21,    35,    36,    37,     8,     9,    64,    35,    36,
-    37,   -75,    74,    66,   129,    87,    75,    77,    79,    84,
-    96,    97,    98,    99,    80,   100,    82,   102,   105,   121,
-   106,   130,   120,   140,   110,   118,   128,   137,    92,   139,
-   122,   126,   186,   155,   149,   206,   -74,   170,   134,   131,
-   207,   133,   178,   132,   136,   179,   180,   150,   152,   153,
-   154,   162,   163,   181,   195,   182,   204,   161,    10,    59,
-    60,   185,   202,   203,    63,    61,   187,   192,     0,   147
+#define	YYLAST		343
+
+
+static const short yytable[] = {   148,
+    55,   149,    54,    12,   196,    60,   187,    66,   188,   190,
+   101,   156,   201,   144,   145,   203,    17,   144,   145,    16,
+   199,   112,   144,   145,   216,   165,   176,   189,   144,   145,
+    79,   102,   214,   221,   146,    35,   144,   145,    85,   229,
+    90,   114,   147,    67,   177,    91,   147,   205,   223,   183,
+   230,   147,   231,   193,   141,   238,   239,   147,    36,   104,
+   106,   112,   103,   107,   113,   147,    37,   206,   205,   226,
+   198,   142,   200,   207,   208,   209,    61,    13,   135,    68,
+   136,   114,   115,    13,   138,   104,    13,   140,   206,   227,
+   233,    84,   222,   224,   207,   208,   209,   -96,   227,   154,
+   157,    20,    21,    22,   161,   234,   235,   162,   236,   205,
+   237,    39,    40,    41,    42,    43,    70,    44,    45,    46,
+    47,    48,    49,    50,    51,    52,    15,    53,    77,   206,
+    18,   119,    78,   120,    80,   207,   208,   209,     1,    64,
+    65,    39,    40,    41,    42,    43,    81,    44,    45,    46,
+    47,    48,    49,    50,    51,    52,    83,    53,     2,     3,
+     4,     5,     6,     7,   101,    20,    21,    22,    19,    74,
+    76,    89,    92,    93,    20,    21,    22,    97,    20,    21,
+    22,    23,    24,    25,    26,   102,    27,    28,    19,     2,
+     3,     4,     5,     6,     7,    96,    94,    95,    20,    21,
+    22,    23,    24,    25,    26,    98,    62,    28,    39,    40,
+    41,    42,    43,   180,    44,    45,    46,    47,    48,    49,
+    50,    51,    52,    99,    53,    39,    40,    41,    42,    43,
+   105,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+   108,    53,    39,   126,    41,    42,    43,   109,    44,    45,
+    46,    47,    48,    49,    50,    51,   127,   110,    53,    40,
+    41,    42,    43,   123,    44,    45,    46,    47,    48,    49,
+    50,    51,    52,   124,    53,    46,    47,    48,   133,   125,
+    73,    46,    47,    48,   101,   102,    75,   139,   137,   114,
+   112,   163,   155,   152,   158,   153,   160,   164,   -95,   159,
+   166,   168,   167,   169,   170,   171,   173,   172,   174,   178,
+   182,   185,   192,   184,   186,   204,   191,   212,   197,   213,
+   218,   202,   241,   215,   242,    14,   220,   217,   225,   151,
+   232,    63,   150,   111,   143,   122,   228,    72,   175,   181,
+     0,   100,   219
 };
 
-static const short yycheck[] = {    16,
-    17,    95,    19,   176,   133,     3,   100,   136,    53,    54,
-    20,    21,    19,   186,   151,    20,    21,    20,    21,    33,
-    34,   150,    32,   152,    20,    21,    24,    25,   122,   166,
-    20,   168,   126,    40,    51,    45,    81,    40,    55,    84,
-    45,    20,    45,    23,    40,    20,    36,    20,    20,    45,
-    40,    20,    42,    43,    44,    35,   185,    36,    27,   153,
-    35,    40,    34,    42,    43,    44,    35,    40,    22,    42,
-    43,    44,     3,     5,     6,     7,     8,     9,     4,    11,
-    12,    13,    14,    15,    16,    17,    18,    23,    20,   106,
-    22,   173,   174,    24,    25,    27,    20,     5,    34,    35,
-    22,    36,    10,    27,    39,   187,   188,    32,   190,    34,
-   192,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    32,    20,    20,    22,     5,
-     6,     7,     8,     9,    35,    11,    12,    13,    14,    15,
-    16,    17,    18,    35,    20,    35,    22,     5,     6,     7,
-     8,     9,    15,    11,    12,    13,    14,    15,    16,    17,
-    18,    15,    20,    20,    22,     6,     7,     8,     9,    38,
-    11,    12,    13,    14,    15,    16,    17,    18,    20,    20,
-    36,    22,    20,    23,    26,    27,    28,    29,    30,    31,
-    20,    33,    24,    25,    34,    35,    26,    27,    28,    29,
-    30,    31,    13,    14,    15,    24,    25,    18,    13,    14,
-    15,    36,    20,    18,    39,    22,    20,    20,    20,    20,
-    37,    36,    20,    20,    20,    35,    35,    20,    20,    20,
-    36,    20,    96,   129,    34,    34,    24,    20,    71,    20,
-    35,    35,   170,    20,    24,     0,    36,    20,    32,    36,
-     0,    36,    24,    39,    36,    21,    24,    36,    36,    35,
-    35,    32,    32,    24,    24,    32,    24,    41,     4,    22,
-    22,    36,    34,    32,    28,    22,    40,    40,    -1,   132
+static const short yycheck[] = {   114,
+    24,   115,    24,    21,   179,    25,   171,    31,    19,   174,
+    19,   125,   187,    19,    20,   190,     4,    19,    20,    36,
+   185,    19,    19,    20,   199,   139,    22,    38,    19,    20,
+    54,    40,   197,    39,    36,    21,    19,    20,    60,   214,
+    64,    39,    48,    19,    40,    65,    48,    19,    39,   163,
+   215,    48,   217,    36,    19,   230,   231,    48,    40,    84,
+    85,    19,    84,    87,    22,    48,    40,    39,    19,    41,
+   184,    36,   186,    45,    46,    47,    40,     9,   103,    19,
+   105,    39,    40,    15,   108,   110,    18,   111,    39,   210,
+    41,    19,   207,   208,    45,    46,    47,    41,   219,   123,
+    44,    29,    30,    31,    41,   220,   221,    44,   223,    19,
+   225,     5,     6,     7,     8,     9,    19,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    10,    21,    15,    39,
+    14,    36,    15,    38,    19,    45,    46,    47,     3,    33,
+    34,     5,     6,     7,     8,     9,    43,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    19,    21,    23,    24,
+    25,    26,    27,    28,    19,    29,    30,    31,    19,    44,
+    45,    21,    19,    41,    29,    30,    31,    19,    29,    30,
+    31,    32,    33,    34,    35,    40,    37,    38,    19,    23,
+    24,    25,    26,    27,    28,    40,    42,    41,    29,    30,
+    31,    32,    33,    34,    35,    19,    37,    38,     5,     6,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    40,    21,     5,     6,     7,     8,     9,
+    19,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    41,    21,     5,     6,     7,     8,     9,    19,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    19,    21,     6,
+     7,     8,     9,    19,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    19,    21,    13,    14,    15,    19,    40,
+    18,    13,    14,    15,    19,    40,    18,    40,    19,    39,
+    19,    40,    36,    38,    19,    23,    44,    19,    41,    41,
+    19,    38,    23,    23,    20,    41,    23,    41,    41,    19,
+    19,    41,    19,    40,    40,    19,    40,    23,    41,    19,
+    23,    36,     0,    41,     0,     9,    39,    41,    39,   117,
+    38,    29,   116,    91,   113,    94,   213,    39,   157,   160,
+    -1,    81,   204
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/lib/bison.simple"
@@ -1031,131 +1185,250 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 197 "parse.y"
+#line 306 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 198 "parse.y"
+#line 307 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 199 "parse.y"
+#line 308 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 200 "parse.y"
+#line 309 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 203 "parse.y"
+#line 312 "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 318 "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 324 "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 330 "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 336 "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 342 "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 350 "parse.y"
+{ ; ;
+    break;}
+case 12:
+#line 351 "parse.y"
+{ ; ;
+    break;}
+case 13:
+#line 354 "parse.y"
 {
 			((Class *)class)->nodes = class_nodes;
 			class_nodes = NULL;
 			nodes = g_list_append(nodes,class);
 						;
     break;}
-case 10:
-#line 228 "parse.y"
+case 14:
+#line 359 "parse.y"
+{
+			((Class *)class)->nodes = NULL;
+			class_nodes = NULL;
+			nodes = g_list_append(nodes,class);
+						;
+    break;}
+case 15:
+#line 366 "parse.y"
 {
 			class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
 						;
     break;}
-case 11:
-#line 233 "parse.y"
+case 16:
+#line 371 "parse.y"
 { ; ;
     break;}
-case 12:
-#line 234 "parse.y"
+case 17:
+#line 372 "parse.y"
 { ; ;
     break;}
-case 13:
-#line 235 "parse.y"
+case 18:
+#line 375 "parse.y"
 { ; ;
     break;}
-case 14:
-#line 236 "parse.y"
+case 19:
+#line 376 "parse.y"
 { ; ;
     break;}
-case 15:
-#line 237 "parse.y"
+case 20:
+#line 377 "parse.y"
 { ; ;
     break;}
-case 16:
-#line 238 "parse.y"
+case 21:
+#line 378 "parse.y"
 { ; ;
     break;}
-case 17:
-#line 241 "parse.y"
+case 22:
+#line 381 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+    break;}
+case 23:
+#line 382 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+    break;}
+case 24:
+#line 383 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+    break;}
+case 25:
+#line 386 "parse.y"
 {
-			push_variable(yyvsp[-1].id,PUBLIC_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 18:
-#line 244 "parse.y"
+case 26:
+#line 399 "parse.y"
 {
-			push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
-						;
+			if(strcmp(yyvsp[-2].id, "destroy")==0) {
+				g_free(yyvsp[-2].id);
+				destructor = (yyvsp[0].cbuf)->str;
+				g_string_free(yyvsp[0].cbuf, FALSE);
+				destructor_line = ccode_line;
+				destructor_simple = FALSE;
+			} else {
+				g_free(yyvsp[-2].id);
+				g_string_free(yyvsp[0].cbuf, TRUE);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+					;
     break;}
-case 19:
-#line 247 "parse.y"
+case 27:
+#line 415 "parse.y"
+{
+			initializer = yyvsp[0].id;
+			initializer_line = ccode_line;
+				;
+    break;}
+case 28:
+#line 419 "parse.y"
+{
+			initializer = (yyvsp[0].cbuf)->str;
+			initializer_line = ccode_line;
+			g_string_free(yyvsp[0].cbuf, FALSE);
+				;
+    break;}
+case 29:
+#line 427 "parse.y"
+{ ; ;
+    break;}
+case 30:
+#line 428 "parse.y"
+{ ; ;
+    break;}
+case 31:
+#line 429 "parse.y"
+{ destructor = NULL; ;
+    break;}
+case 32:
+#line 430 "parse.y"
+{ initializer = NULL; ;
+    break;}
+case 33:
+#line 431 "parse.y"
 {
-			push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL);
+			destructor = NULL;
+			initializer = NULL;
+					;
+    break;}
+case 34:
+#line 437 "parse.y"
+{
+			push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
 						;
     break;}
-case 20:
-#line 250 "parse.y"
+case 35:
+#line 440 "parse.y"
 {
-			push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
-						 ;
+			push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
+						;
     break;}
-case 21:
-#line 254 "parse.y"
+case 36:
+#line 444 "parse.y"
 {
 			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[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-						    yyvsp[-4].cbuf,yyvsp[-5].line,
-						    yyvsp[-1].cbuf,yyvsp[-2].line,
+				node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+						    (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
+						    (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
 						    yyvsp[-10].line);
+				g_string_free(yyvsp[-4].cbuf,FALSE);
+				g_string_free(yyvsp[-1].cbuf,FALSE);
 				class_nodes = g_list_append(class_nodes,node);
 			} 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[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-						    yyvsp[-1].cbuf,yyvsp[-2].line,
-						    yyvsp[-4].cbuf,yyvsp[-5].line,
+				node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+						    (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+						    (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
 						    yyvsp[-10].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[-8].id); g_free(yyvsp[-7].id);
@@ -1168,22 +1441,26 @@ case 21:
 			}
 						;
     break;}
-case 22:
-#line 283 "parse.y"
+case 37:
+#line 479 "parse.y"
 {
 			if(strcmp(yyvsp[-3].id,"get")==0) {
 				Node *node;
+				Type *type = pop_type();
 				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);
+				node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
+						    (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+						    NULL,0, yyvsp[-7].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[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-						    NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line,
-						    yyvsp[-7].line);
+				node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
+						    NULL,0,(yyvsp[-1].cbuf)->str,
+						    yyvsp[-2].line, yyvsp[-7].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[-5].id);
@@ -1195,32 +1472,117 @@ case 22:
 			}
 						;
     break;}
-case 23:
-#line 309 "parse.y"
+case 38:
+#line 507 "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
+				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);
+			} 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 39:
+#line 572 "parse.y"
+{
+			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 40:
+#line 581 "parse.y"
+{
+			yyval.id = yyvsp[0].id;
+			typestack = g_list_prepend(typestack,NULL);
+						;
+    break;}
+case 41:
+#line 587 "parse.y"
 { yyval.list = yyvsp[-1].list; ;
     break;}
-case 24:
-#line 310 "parse.y"
+case 42:
+#line 588 "parse.y"
 { yyval.list = NULL; ;
     break;}
-case 25:
-#line 313 "parse.y"
+case 43:
+#line 591 "parse.y"
 {
 			yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
 						;
     break;}
-case 26:
-#line 316 "parse.y"
+case 44:
+#line 594 "parse.y"
 {
 			yyval.list = g_list_append(NULL,yyvsp[0].id);
 						;
     break;}
-case 27:
-#line 322 "parse.y"
+case 45:
+#line 600 "parse.y"
 { ; ;
     break;}
-case 28:
-#line 323 "parse.y"
+case 46:
+#line 601 "parse.y"
 {
 			Type *type = typestack->data;
 			char *oldname = type->name;
@@ -1228,157 +1590,157 @@ case 28:
 			g_free(oldname);
 						;
     break;}
-case 29:
-#line 331 "parse.y"
+case 47:
+#line 609 "parse.y"
 {
 			Node *node = new_type(0,yyvsp[0].id,NULL);
 			typestack = g_list_prepend(typestack,node);
 						;
     break;}
-case 30:
-#line 335 "parse.y"
+case 48:
+#line 613 "parse.y"
 {
 			Node *node = new_type(stars,yyvsp[-1].id,NULL);
 			stars = 0;
 			typestack = g_list_prepend(typestack,node);
 						;
     break;}
-case 31:
-#line 342 "parse.y"
+case 49:
+#line 620 "parse.y"
 {
 			yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
 						;
     break;}
-case 32:
-#line 345 "parse.y"
+case 50:
+#line 623 "parse.y"
 {
 			yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
 						;
     break;}
-case 33:
-#line 348 "parse.y"
+case 51:
+#line 626 "parse.y"
 {
 			yyval.id = g_strdup(yyvsp[0].id);
 						;
     break;}
-case 34:
-#line 351 "parse.y"
+case 52:
+#line 629 "parse.y"
 {
 			yyval.id = g_strdup("unsigned char");
 						;
     break;}
-case 35:
-#line 354 "parse.y"
+case 53:
+#line 632 "parse.y"
 {
 			yyval.id = g_strdup("signed char");
 						;
     break;}
-case 36:
-#line 357 "parse.y"
+case 54:
+#line 635 "parse.y"
 {
 			yyval.id = g_strdup("char");
 						;
     break;}
-case 37:
-#line 360 "parse.y"
+case 55:
+#line 638 "parse.y"
 {
 			yyval.id = g_strdup("double");
 						;
     break;}
-case 38:
-#line 363 "parse.y"
+case 56:
+#line 641 "parse.y"
 {
 			yyval.id = g_strdup("float");
 						;
     break;}
-case 39:
-#line 366 "parse.y"
+case 57:
+#line 644 "parse.y"
 {
 			yyval.id = yyvsp[0].id;
 						;
     break;}
-case 40:
-#line 369 "parse.y"
+case 58:
+#line 647 "parse.y"
 {
 			yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 						;
     break;}
-case 41:
-#line 373 "parse.y"
+case 59:
+#line 651 "parse.y"
 {
 			yyval.id = yyvsp[0].id;
 						;
     break;}
-case 42:
-#line 376 "parse.y"
+case 60:
+#line 654 "parse.y"
 {
 			yyval.id = g_strdup("void");
 						;
     break;}
-case 43:
-#line 381 "parse.y"
+case 61:
+#line 659 "parse.y"
 {
 			yyval.id = "long int";
 						;
     break;}
-case 44:
-#line 384 "parse.y"
+case 62:
+#line 662 "parse.y"
 {
 			yyval.id = "long";
 						;
     break;}
-case 45:
-#line 387 "parse.y"
+case 63:
+#line 665 "parse.y"
 {
 			yyval.id = "short int";
 						;
     break;}
-case 46:
-#line 390 "parse.y"
+case 64:
+#line 668 "parse.y"
 {
 			yyval.id = "short";
 						;
     break;}
-case 47:
-#line 393 "parse.y"
+case 65:
+#line 671 "parse.y"
 {
 			yyval.id = "int";
 						;
     break;}
-case 48:
-#line 398 "parse.y"
+case 66:
+#line 676 "parse.y"
 {
 			yyval.id = "enum ";
 						;
     break;}
-case 49:
-#line 401 "parse.y"
+case 67:
+#line 679 "parse.y"
 {
 			yyval.id = "union ";
 						;
     break;}
-case 50:
-#line 404 "parse.y"
+case 68:
+#line 682 "parse.y"
 {
 			yyval.id = "struct ";
 						;
     break;}
-case 51:
-#line 409 "parse.y"
+case 69:
+#line 687 "parse.y"
 { stars++; ;
     break;}
-case 52:
-#line 410 "parse.y"
+case 70:
+#line 688 "parse.y"
 { stars++; ;
     break;}
-case 53:
-#line 413 "parse.y"
+case 71:
+#line 692 "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;
+			if(strcmp(yyvsp[-1].id, "first")==0)
+				yyval.sigtype = SIGNAL_FIRST_METHOD;
+			else if(strcmp(yyvsp[-1].id, "last")==0)
+				yyval.sigtype = SIGNAL_LAST_METHOD;
 			else {
 				yyerror(_("signal must be 'first' or 'last'"));
 				g_free(yyvsp[-1].id);
@@ -1387,29 +1749,14 @@ case 53:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 54:
-#line 425 "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);
-					;
-    break;}
-case 55:
-#line 437 "parse.y"
+case 72:
+#line 704 "parse.y"
 {
-			yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+			yyval.sigtype = SIGNAL_LAST_METHOD;
 					;
     break;}
-case 56:
-#line 440 "parse.y"
+case 73:
+#line 710 "parse.y"
 {
 			if(strcmp(yyvsp[-1].id,"first")==0)
 				yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1423,115 +1770,160 @@ case 56:
 			g_free(yyvsp[-1].id);
 					;
     break;}
-case 57:
-#line 452 "parse.y"
+case 74:
+#line 722 "parse.y"
+{
+			if(strcmp(yyvsp[-2].id,"first")==0)
+				yyval.sigtype = SIGNAL_FIRST_METHOD;
+			else if(strcmp(yyvsp[-2].id,"last")==0)
+				yyval.sigtype = SIGNAL_LAST_METHOD;
+			else {
+				yyerror(_("signal must be 'first' or 'last'"));
+				g_free(yyvsp[-2].id);
+				YYERROR;
+			}
+			g_free(yyvsp[-2].id);
+					;
+    break;}
+case 75:
+#line 734 "parse.y"
 {
 			yyval.sigtype = SIGNAL_LAST_METHOD;
 					;
     break;}
-case 58:
-#line 457 "parse.y"
+case 76:
+#line 737 "parse.y"
+{
+			/* the_scope was default thus public */
+			the_scope = PUBLIC_SCOPE;
+					;
+    break;}
+case 77:
+#line 743 "parse.y"
 {
-			gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+			gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
 						;
     break;}
-case 59:
-#line 462 "parse.y"
+case 78:
+#line 748 "parse.y"
 {
-			gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+			gtktypes = g_list_append(gtktypes, yyvsp[0].id);
 						;
     break;}
-case 60:
-#line 465 "parse.y"
+case 79:
+#line 751 "parse.y"
 { 
-			gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+			gtktypes = g_list_append(gtktypes, yyvsp[0].id);
        						;
     break;}
-case 61:
-#line 470 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 80:
+#line 756 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
     break;}
-case 62:
-#line 471 "parse.y"
+case 81:
+#line 757 "parse.y"
 { yyval.cbuf = NULL; ;
     break;}
-case 63:
-#line 475 "parse.y"
+case 82:
+#line 761 "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);
+			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 64:
-#line 485 "parse.y"
+case 83:
+#line 772 "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[0].cbuf, yyvsp[-9].line,
+				      ccode_line, vararg, yyvsp[-8].list);
+									;
+    break;}
+case 84:
+#line 783 "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);
+			push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+				      yyvsp[0].cbuf, yyvsp[-8].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 65:
-#line 495 "parse.y"
+case 85:
+#line 794 "parse.y"
 {
 			if(!has_self) {
 				yyerror(_("virtual method without 'self' as "
 					  "first parameter"));
+				free_all_global_state();
 				YYERROR;
 			}
-			push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-				      yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
-				      ccode_line,vararg);
+			push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+				      yyvsp[0].cbuf, yyvsp[-7].line,
+				      ccode_line, vararg, NULL);
 									;
     break;}
-case 66:
-#line 505 "parse.y"
+case 86:
+#line 805 "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 67:
-#line 511 "parse.y"
+case 87:
+#line 816 "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 68:
-#line 516 "parse.y"
+case 88:
+#line 822 "parse.y"
 {
-			push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
-				      yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-				      vararg);
+			push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+				      yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+				      vararg, NULL);
 								;
     break;}
-case 69:
-#line 521 "parse.y"
+case 89:
+#line 827 "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);
@@ -1541,31 +1933,66 @@ case 69:
 			}
 						;
     break;}
-case 70:
-#line 542 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
+case 90:
+#line 848 "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 71:
-#line 543 "parse.y"
+case 91:
+#line 859 "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 92:
+#line 878 "parse.y"
+{
+			g_free(onerror); onerror = NULL;
+			g_free(defreturn); defreturn = NULL;
 					;
     break;}
-case 72:
-#line 547 "parse.y"
-{ ; ;
+case 93:
+#line 884 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
     break;}
-case 73:
-#line 548 "parse.y"
-{ yyval.id = NULL; ;
+case 94:
+#line 885 "parse.y"
+{
+			yyval.id = (yyvsp[1].cbuf)->str;
+			g_string_free(yyvsp[1].cbuf, FALSE);
+					;
     break;}
-case 74:
-#line 551 "parse.y"
+case 95:
+#line 891 "parse.y"
 { vararg = FALSE; has_self = FALSE; ;
     break;}
-case 75:
-#line 552 "parse.y"
+case 96:
+#line 892 "parse.y"
 {
 			vararg = FALSE;
 			has_self = TRUE;
@@ -1578,8 +2005,8 @@ case 75:
 			}
        					;
     break;}
-case 76:
-#line 563 "parse.y"
+case 97:
+#line 903 "parse.y"
 {
 			has_self = TRUE;
 			if(strcmp(yyvsp[-2].id,"self")==0)
@@ -1591,40 +2018,40 @@ case 76:
 			}
 					;
     break;}
-case 77:
-#line 573 "parse.y"
+case 98:
+#line 913 "parse.y"
 { has_self = FALSE; ;
     break;}
-case 78:
-#line 576 "parse.y"
+case 99:
+#line 916 "parse.y"
 { vararg = TRUE; ;
     break;}
-case 79:
-#line 577 "parse.y"
+case 100:
+#line 917 "parse.y"
 { vararg = FALSE; ;
     break;}
-case 80:
-#line 580 "parse.y"
+case 101:
+#line 920 "parse.y"
 { ; ;
     break;}
-case 81:
-#line 581 "parse.y"
+case 102:
+#line 921 "parse.y"
 { ; ;
     break;}
-case 82:
-#line 584 "parse.y"
+case 103:
+#line 924 "parse.y"
 {
 			push_funcarg(yyvsp[0].id,NULL);
 								;
     break;}
-case 83:
-#line 587 "parse.y"
+case 104:
+#line 927 "parse.y"
 {
 			push_funcarg(yyvsp[-1].id,yyvsp[0].id);
 								;
     break;}
-case 84:
-#line 590 "parse.y"
+case 105:
+#line 930 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1634,8 +2061,8 @@ case 84:
 			push_funcarg(yyvsp[-4].id,NULL);
 								;
     break;}
-case 85:
-#line 598 "parse.y"
+case 106:
+#line 938 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1645,16 +2072,16 @@ case 85:
 			push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
 								;
     break;}
-case 86:
-#line 608 "parse.y"
+case 107:
+#line 948 "parse.y"
 { ; ;
     break;}
-case 87:
-#line 609 "parse.y"
+case 108:
+#line 949 "parse.y"
 { ; ;
     break;}
-case 88:
-#line 612 "parse.y"
+case 109:
+#line 952 "parse.y"
 {
 			if(strcmp(yyvsp[0].id,"type")==0) {
 				Node *node = new_check(TYPE_CHECK,NULL);
@@ -1669,61 +2096,61 @@ case 88:
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 89:
-#line 625 "parse.y"
+case 110:
+#line 965 "parse.y"
 {
 			Node *node = new_check(GT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 90:
-#line 629 "parse.y"
+case 111:
+#line 969 "parse.y"
 {
 			Node *node = new_check(LT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 91:
-#line 633 "parse.y"
+case 112:
+#line 973 "parse.y"
 {
 			Node *node = new_check(GE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 92:
-#line 637 "parse.y"
+case 113:
+#line 977 "parse.y"
 {
 			Node *node = new_check(LE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 93:
-#line 641 "parse.y"
+case 114:
+#line 981 "parse.y"
 {
 			Node *node = new_check(EQ_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 94:
-#line 645 "parse.y"
+case 115:
+#line 985 "parse.y"
 {
 			Node *node = new_check(NE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
-case 95:
-#line 651 "parse.y"
+case 116:
+#line 991 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 96:
-#line 652 "parse.y"
+case 117:
+#line 992 "parse.y"
 {
 			yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 					;
     break;}
-case 97:
-#line 656 "parse.y"
+case 118:
+#line 996 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -1948,5 +2375,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 659 "parse.y"
+#line 999 "parse.y"