]> git.draconx.ca Git - gob-dx.git/blobdiff - src/parse.c
Release 1.0.4
[gob-dx.git] / src / parse.c
index 101d2e6a44590f00405ce3b49538f2ff9b500507..9fdfed3c50279b80f71c3af2fb7679d09900901a 100644 (file)
 #define        FLOAT   270
 #define        DOUBLE  271
 #define        CHAR    272
-#define        ONERROR 273
-#define        TOKEN   274
-#define        NUMBER  275
-#define        TYPETOKEN       276
+#define        TOKEN   273
+#define        NUMBER  274
+#define        TYPETOKEN       275
+#define        ARRAY_DIM       276
 #define        CCODE   277
-#define        HCODE   278
-#define        PUBLIC  279
-#define        PRIVATE 280
-#define        ARGUMENT        281
-#define        VIRTUAL 282
-#define        SIGNAL  283
-#define        OVERRIDE        284
+#define        HTCODE  278
+#define        PHCODE  279
+#define        HCODE   280
+#define        ACODE   281
+#define        ATCODE  282
+#define        PUBLIC  283
+#define        PRIVATE 284
+#define        PROTECTED       285
+#define        CLASSWIDE       286
+#define        ARGUMENT        287
+#define        VIRTUAL 288
+#define        SIGNAL  289
+#define        OVERRIDE        290
 
 #line 21 "parse.y"
 
 #include "config.h"
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "tree.h"
+#include "treefuncs.h"
 #include "main.h"
+#include "util.h"
 
 #define _(x) (x)
        
-extern char *filename;
-       
 GList *nodes = NULL;
 
 static GList *class_nodes = NULL;
 Node *class = NULL;
+char *chunk_size = NULL;
 
 static GList *typestack = NULL;
-static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
 static int has_self = FALSE;
 static int vararg = FALSE;
 
+/* destructor and initializer for variables */
+static char *destructor = NULL;
+static int destructor_line = 0;
+static gboolean destructor_simple = TRUE;
+static char *initializer = NULL;
+static int initializer_line = 0;
+
+static char *onerror = NULL;
+static char *defreturn = NULL;
+
 static GList *gtktypes = NULL;
 
+/* this can be a global as we will only do one function at a time
+   anyway */
+static int the_scope = NO_SCOPE;
+
 void free(void *ptr);
 int yylex(void);
 
@@ -79,63 +99,141 @@ yyerror(char *str)
        if(strcmp(yytext,"\n")==0) {
                out=g_strconcat("Error: ",str," before newline",NULL);
        } else if(yytext[0]=='\0') {
-               out=g_strconcat("Error: ",str," at end of input",NULL);
+               out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);
-               while((p=strchr(tmp,'\n')))
+               while((p=strchr(tmp, '\n')))
                        *p='.';
 
-               out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+               out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
                g_free(tmp);
        }
 
-       fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+       fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
        g_free(out);
        
        exit(1);
 }
 
-static void
-push_variable(char *name, int scope, int line_no)
+static Type *
+pop_type(void)
 {
-       Node *var;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+       return type;
+}
+
+static void
+push_variable(char *name, int scope, int line_no, char *postfix)
+{
+       Node *var;
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       var = new_variable(scope,type,name,line_no);
+       var = new_variable(scope, type, name, line_no,
+                          destructor, destructor_line,
+                          destructor_simple,
+                          initializer, initializer_line);
        class_nodes = g_list_append(class_nodes, var);
 }
 
 static void
-push_function(int scope, char *oid, char *id, char *onerror,
-             GString *cbuf,int line_no, int ccode_line, int vararg)
+push_function(int scope, int method, char *oid, char *id,
+             GString *cbuf, int line_no, int ccode_line,
+             gboolean vararg, GList *flags)
 {
        Node *node;
        Type *type;
+       char *c_cbuf;
+
+       g_assert(scope != CLASS_SCOPE);
        
-       if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
-               type = typestack->data;
-               typestack = g_list_remove(typestack,typestack->data);
+       if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+               type = (Type *)new_type(g_strdup("void"), NULL, NULL);
        } else {
-               type = (Type *)new_type(0,g_strdup("void"));
+               type = pop_type();
        }
        
-       node = new_method(scope,type,oid,gtktypes,id,funcargs,
-                         onerror,cbuf,line_no,ccode_line,vararg);
+       /* a complicated and ugly test to figure out if we have
+          the wrong number of types for a signal */
+       if((method == SIGNAL_FIRST_METHOD ||
+           method == SIGNAL_LAST_METHOD) &&
+          g_list_length(gtktypes) != g_list_length(funcargs) &&
+          !(g_list_length(funcargs) == 1 &&
+            g_list_length(gtktypes) == 2 &&
+            strcmp(gtktypes->next->data, "NONE")==0)) {
+               error_print(GOB_WARN, line_no,
+                           _("The number of GTK arguments and "
+                             "function arguments for a signal "
+                             "don't seem to match"));
+       }
+       if(g_list_length(gtktypes) > 2) {
+               GList *li;
+               for(li = gtktypes->next; li; li = li->next) {
+                       if(strcmp(li->data, "NONE")==0) {
+                               error_print(GOB_ERROR, line_no,
+                                           _("NONE can only appear in an "
+                                             "argument list by itself"));
+                       }
+               }
+       }
+       if(cbuf) {
+               char *p;
+               c_cbuf = p = cbuf->str;
+               while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+                       p++;
+               if(!p || !*p)
+                       c_cbuf = NULL;
+       } else
+               c_cbuf = NULL;
+
+       node = new_method(scope, method, type, oid, gtktypes, flags,
+                         id, funcargs, onerror, defreturn, c_cbuf, line_no,
+                         ccode_line, vararg, method_unique_id++);
+
+       if(cbuf)
+               g_string_free(cbuf,
+                             /*only free segment if we haven't passed it
+                               above */
+                             c_cbuf?FALSE:TRUE);
        gtktypes = NULL;
        funcargs = NULL;
 
+       onerror = NULL;
+       defreturn = NULL;
+
        class_nodes = g_list_append(class_nodes, node);
 }
 
 static void
-push_funcarg(char *name)
+free_all_global_state(void)
+{
+       g_free(onerror);
+       onerror = NULL;
+       g_free(defreturn);
+       defreturn = NULL;
+
+       g_free(chunk_size);
+       chunk_size = NULL;
+       
+       g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+       g_list_free(gtktypes);
+       gtktypes = NULL;
+
+       free_node_list(funcargs);
+       funcargs = NULL;
+}
+
+static void
+push_funcarg(char *name, char *postfix)
 {
        Node *node;
-       Type *type = typestack->data;
-       typestack = g_list_remove(typestack,typestack->data);
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       node = new_funcarg(type,name,checks);
+       node = new_funcarg(type, name, checks);
        checks = NULL;
        
        funcargs = g_list_append(funcargs, node);
@@ -153,26 +251,67 @@ push_init_arg(char *name, int is_class)
        else
                tn = g_strdup(((Class *)class)->otype);
 
-       type = new_type(1,tn);
+       type = new_type(tn, g_strdup("*"), NULL);
        node = new_funcarg((Type *)type,name,NULL);
        funcargs = g_list_prepend(funcargs, node);
 }
 
 static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
 {
        Node *node;
        Node *type;
        GList *ch = NULL;
-       type = new_type(1,g_strdup(((Class *)class)->otype));
+       type = new_type(g_strdup(((Class *)class)->otype),
+                       g_strdup(constant ? "const *" : "*"), NULL);
        ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
        ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
        node = new_funcarg((Type *)type,id,ch);
        funcargs = g_list_prepend(funcargs, node);
 }
 
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+       GList *li;
+
+       for(li = class_nodes; li != NULL; li = li->next) {
+               Variable *var;
+               Node *node = li->data;
+               if(node->type != VARIABLE_NODE)
+                       continue;
+               var = li->data;
+               if(strcmp(var->id, id)==0)
+                       return var;
+       }
+
+       error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
+
+       g_assert_not_reached();
+       return NULL;
+}
+
+static gboolean
+set_return_value(char *type, char *val)
+{
+       if(strcmp(type, "onerror")==0) {
+               if(!onerror) {
+                       onerror = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       } else if(strcmp(type, "defreturn")==0) {
+               if(!defreturn) {
+                       defreturn = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       }
+       return FALSE;
+}
+
 
-#line 160 "parse.y"
+#line 293 "parse.y"
 typedef union {
        char *id;
        GString *cbuf;
@@ -194,26 +333,26 @@ typedef union {
 
 
 
-#define        YYFINAL         198
+#define        YYFINAL         263
 #define        YYFLAG          -32768
-#define        YYNTBASE        45
+#define        YYNTBASE        50
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 88)
 
 static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    43,     2,     2,     2,     2,     2,     2,    34,
-    35,    37,     2,    38,    44,     2,     2,     2,    40,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    33,    42,
-    39,    41,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    48,     2,     2,     2,     2,     2,     2,    39,
+    40,    44,     2,    45,    49,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,    41,    47,
+    42,    46,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    31,    36,    32,     2,     2,     2,     2,     2,
+     2,     2,    37,    43,    38,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -229,73 +368,95 @@ static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
      7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
     17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30
+    27,    28,    29,    30,    31,    32,    33,    34,    35,    36
 };
 
 #if YYDEBUG != 0
 static const short yyprhs[] = {     0,
-     0,     4,     7,    10,    12,    15,    18,    20,    22,    27,
-    32,    35,    38,    41,    43,    45,    47,    52,    57,    69,
-    78,    82,    83,    87,    89,    91,    94,    96,    99,   102,
-   105,   107,   110,   113,   115,   117,   119,   121,   124,   126,
-   128,   131,   133,   136,   138,   140,   142,   144,   146,   149,
-   151,   155,   159,   162,   165,   167,   172,   176,   178,   181,
-   183,   193,   203,   212,   225,   235,   245,   251,   254,   258,
-   261,   262,   264,   266,   270,   272,   276,   278,   282,   284,
-   287,   294,   297,   299,   301,   304,   307,   311,   315,   319,
-   323,   325,   328
+     0,     4,     7,    10,    12,    14,    16,    18,    20,    22,
+    24,    27,    29,    34,    38,    44,    45,    50,    55,    58,
+    60,    62,    64,    66,    68,    70,    72,    74,    76,    79,
+    83,    86,    90,    93,    96,    98,   100,   101,   107,   114,
+   126,   135,   141,   147,   149,   153,   154,   158,   160,   163,
+   165,   167,   169,   172,   175,   178,   182,   186,   189,   192,
+   195,   197,   200,   202,   205,   207,   209,   211,   213,   215,
+   217,   219,   221,   223,   225,   227,   229,   231,   234,   237,
+   241,   244,   246,   250,   254,   257,   259,   264,   268,   270,
+   273,   275,   286,   298,   308,   318,   327,   339,   348,   354,
+   357,   362,   363,   365,   368,   370,   372,   375,   378,   382,
+   387,   392,   394,   398,   400,   404,   406,   409,   413,   420,
+   428,   431,   433,   435,   438,   441,   445,   449,   453,   457,
+   459,   462
 };
 
-static const short yyrhs[] = {    46,
-    47,    46,     0,    47,    46,     0,    46,    47,     0,    47,
-     0,    46,    23,     0,    46,    24,     0,    23,     0,    24,
-     0,    48,    31,    49,    32,     0,     3,    22,     4,    22,
-     0,    49,    64,     0,    49,    50,     0,    49,    51,     0,
-    64,     0,    50,     0,    51,     0,    25,    54,    20,    33,
-     0,    26,    54,    20,    33,     0,    27,    52,    20,    20,
-    20,    31,    23,    20,    31,    23,    33,     0,    27,    52,
-    20,    20,    20,    31,    23,    33,     0,    34,    53,    35,
-     0,     0,    20,    36,    53,     0,    20,     0,    55,     0,
-     5,    55,     0,    56,     0,    56,    59,     0,    12,    57,
-     0,    11,    57,     0,    57,     0,    12,    18,     0,    11,
-    18,     0,    18,     0,    17,     0,    16,     0,    20,     0,
-    58,    20,     0,    22,     0,     6,     0,    13,    15,     0,
-    13,     0,    14,    15,     0,    14,     0,    15,     0,     9,
-     0,     8,     0,     7,     0,    37,    59,     0,    37,     0,
-    26,    20,    61,     0,    20,    26,    61,     0,    26,    61,
-     0,    20,    61,     0,    61,     0,    20,    34,    62,    35,
-     0,    62,    38,    20,     0,    20,     0,    31,    23,     0,
-    33,     0,    29,    60,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    26,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    54,    20,    34,    66,    35,    65,    63,
-     0,    30,    34,    22,    35,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    25,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    26,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    20,    34,    20,    35,    63,     0,
-    19,    72,     0,    19,    31,    23,     0,    39,    40,     0,
-     0,     6,     0,    20,     0,    20,    38,    67,     0,    67,
-     0,    68,    38,    10,     0,    68,     0,    68,    38,    69,
-     0,    69,     0,    54,    20,     0,    54,    20,    34,    20,
-    70,    35,     0,    70,    71,     0,    71,     0,    20,     0,
-    41,    72,     0,    42,    72,     0,    41,    39,    72,     0,
-    42,    39,    72,     0,    39,    39,    72,     0,    43,    39,
-    72,     0,    21,     0,    44,    21,     0,    20,     0
+static const short yyrhs[] = {    52,
+    53,    52,     0,    53,    52,     0,    52,    53,     0,    53,
+     0,    23,     0,    26,     0,    24,     0,    25,     0,    27,
+     0,    28,     0,    52,    51,     0,    51,     0,    54,    37,
+    56,    38,     0,    54,    37,    38,     0,     3,    21,     4,
+    21,    55,     0,     0,    39,    19,    19,    40,     0,    39,
+    19,    20,    40,     0,    56,    57,     0,    57,     0,    78,
+     0,    62,     0,    63,     0,    41,     0,    29,     0,    30,
+     0,    31,     0,    32,     0,    19,    19,     0,    19,    37,
+    23,     0,    42,    87,     0,    42,    37,    23,     0,    59,
+    60,     0,    60,    59,     0,    60,     0,    59,     0,     0,
+    58,    67,    19,    61,    41,     0,    58,    67,    19,    22,
+    61,    41,     0,    33,    65,    64,    19,    19,    37,    23,
+    19,    37,    23,    41,     0,    33,    65,    64,    19,    19,
+    37,    23,    41,     0,    33,    65,    64,    19,    19,     0,
+    19,    39,    19,    67,    40,     0,    19,     0,    39,    66,
+    40,     0,     0,    19,    43,    66,     0,    19,     0,    68,
+    72,     0,    68,     0,    69,     0,    19,     0,     5,    19,
+     0,    19,     5,     0,    71,    19,     0,     5,    71,    19,
+     0,    71,    19,     5,     0,    70,    69,     0,    21,    69,
+     0,     5,    69,     0,    21,     0,    21,     5,     0,    70,
+     0,    70,     5,     0,     6,     0,    18,     0,    14,     0,
+    15,     0,    13,     0,    16,     0,    17,     0,    11,     0,
+    12,     0,     7,     0,     8,     0,     9,     0,    44,     0,
+    44,     5,     0,    44,    72,     0,    44,     5,    72,     0,
+    19,    75,     0,    75,     0,    58,    19,    75,     0,    19,
+    58,    75,     0,    58,    75,     0,    73,     0,    19,    39,
+    76,    40,     0,    76,    45,    19,     0,    19,     0,    37,
+    23,     0,    41,     0,    35,    65,    74,    67,    19,    39,
+    81,    40,    79,    77,     0,    58,    35,    65,    73,    67,
+    19,    39,    81,    40,    79,    77,     0,    34,    58,    67,
+    19,    39,    81,    40,    79,    77,     0,    58,    34,    67,
+    19,    39,    81,    40,    79,    77,     0,    34,    67,    19,
+    39,    81,    40,    79,    77,     0,    36,    39,    21,    40,
+    67,    19,    39,    81,    40,    79,    77,     0,    58,    67,
+    19,    39,    81,    40,    79,    77,     0,    19,    39,    19,
+    40,    77,     0,    19,    80,     0,    19,    80,    19,    80,
+     0,     0,    87,     0,    37,    23,     0,     6,     0,    19,
+     0,    19,     5,     0,     5,    19,     0,    19,    45,    82,
+     0,    19,     5,    45,    82,     0,     5,    19,    45,    82,
+     0,    82,     0,    83,    45,    10,     0,    83,     0,    83,
+    45,    84,     0,    84,     0,    67,    19,     0,    67,    19,
+    22,     0,    67,    19,    39,    19,    85,    40,     0,    67,
+    19,    22,    39,    19,    85,    40,     0,    85,    86,     0,
+    86,     0,    19,     0,    46,    87,     0,    47,    87,     0,
+    46,    42,    87,     0,    47,    42,    87,     0,    42,    42,
+    87,     0,    48,    42,    87,     0,    20,     0,    49,    20,
+     0,    19,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   179,   180,   181,   182,   185,   189,   193,   197,   203,   210,
-   215,   216,   217,   218,   219,   220,   223,   226,   230,   259,
-   285,   286,   289,   292,   298,   299,   307,   311,   318,   321,
-   324,   327,   330,   333,   336,   339,   342,   345,   349,   352,
-   357,   360,   363,   366,   369,   374,   377,   380,   385,   386,
-   389,   401,   413,   416,   428,   433,   438,   441,   446,   447,
-   451,   461,   471,   481,   487,   492,   497,   518,   519,   523,
-   524,   527,   528,   539,   549,   552,   553,   556,   557,   560,
-   563,   573,   574,   577,   590,   594,   598,   602,   606,   610,
-   616,   617,   621
+   311,   312,   313,   314,   317,   323,   329,   335,   341,   347,
+   355,   356,   359,   364,   371,   376,   377,   385,   396,   397,
+   400,   401,   402,   403,   406,   407,   408,   409,   412,   425,
+   441,   445,   453,   454,   455,   456,   457,   463,   466,   470,
+   506,   535,   609,   618,   624,   625,   628,   631,   637,   641,
+   648,   651,   654,   658,   662,   666,   671,   679,   683,   688,
+   692,   695,   699,   702,   707,   708,   709,   710,   711,   712,
+   713,   714,   715,   718,   719,   720,   723,   724,   725,   729,
+   736,   748,   754,   766,   778,   781,   787,   792,   795,   800,
+   801,   805,   821,   837,   853,   869,   880,   886,   896,   919,
+   930,   949,   955,   956,   962,   963,   974,   985,   996,  1006,
+  1016,  1026,  1029,  1030,  1033,  1034,  1037,  1040,  1043,  1051,
+  1061,  1062,  1065,  1078,  1082,  1086,  1090,  1094,  1098,  1104,
+  1105,  1109
 };
 #endif
 
@@ -304,162 +465,218 @@ static const short yyrline[] = { 0,
 
 static const char * const yytname[] = {   "$","error","$undefined.","CLASS",
 "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
-"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
-"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
-"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
-"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype",
-"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
-"arg","checklist","check","numtok", NULL
+"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM",
+"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED",
+"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'",
+"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes",
+"class","classdec","chunk","classcode","thing","scope","destructor","initializer",
+"varoptions","variable","argument","argtype","flags","flaglist","type","specifier_list",
+"spec_list","specifier","strunionenum","pointer","simplesigtype","fullsigtype",
+"sigtype","tokenlist","codenocode","method","returnvals","retcode","funcargs",
+"arglist","arglist1","arg","checklist","check","numtok", NULL
 };
 #endif
 
 static const short yyr1[] = {     0,
-    45,    45,    45,    45,    46,    46,    46,    46,    47,    48,
-    49,    49,    49,    49,    49,    49,    50,    50,    51,    51,
-    52,    52,    53,    53,    54,    54,    55,    55,    56,    56,
-    56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
-    57,    57,    57,    57,    57,    58,    58,    58,    59,    59,
-    60,    60,    60,    60,    60,    61,    62,    62,    63,    63,
-    64,    64,    64,    64,    64,    64,    64,    65,    65,    65,
-    65,    66,    66,    66,    66,    67,    67,    68,    68,    69,
-    69,    70,    70,    71,    71,    71,    71,    71,    71,    71,
-    72,    72,    72
+    50,    50,    50,    50,    51,    51,    51,    51,    51,    51,
+    52,    52,    53,    53,    54,    55,    55,    55,    56,    56,
+    57,    57,    57,    57,    58,    58,    58,    58,    59,    59,
+    60,    60,    61,    61,    61,    61,    61,    62,    62,    63,
+    63,    63,    64,    64,    65,    65,    66,    66,    67,    67,
+    68,    68,    68,    68,    68,    68,    68,    69,    69,    69,
+    69,    69,    69,    69,    70,    70,    70,    70,    70,    70,
+    70,    70,    70,    71,    71,    71,    72,    72,    72,    72,
+    73,    73,    74,    74,    74,    74,    75,    76,    76,    77,
+    77,    78,    78,    78,    78,    78,    78,    78,    78,    79,
+    79,    79,    80,    80,    81,    81,    81,    81,    81,    81,
+    81,    81,    82,    82,    83,    83,    84,    84,    84,    84,
+    85,    85,    86,    86,    86,    86,    86,    86,    86,    87,
+    87,    87
 };
 
 static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     4,
-     2,     2,     2,     1,     1,     1,     4,     4,    11,     8,
-     3,     0,     3,     1,     1,     2,     1,     2,     2,     2,
-     1,     2,     2,     1,     1,     1,     1,     2,     1,     1,
-     2,     1,     2,     1,     1,     1,     1,     1,     2,     1,
-     3,     3,     2,     2,     1,     4,     3,     1,     2,     1,
-     9,     9,     8,    12,     9,     9,     5,     2,     3,     2,
-     0,     1,     1,     3,     1,     3,     1,     3,     1,     2,
-     6,     2,     1,     1,     2,     2,     3,     3,     3,     3,
-     1,     2,     1
+     3,     2,     2,     1,     1,     1,     1,     1,     1,     1,
+     2,     1,     4,     3,     5,     0,     4,     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,     2,     1,
+     1,     1,     2,     2,     2,     3,     3,     2,     2,     2,
+     1,     2,     1,     2,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     2,     2,     3,
+     2,     1,     3,     3,     2,     1,     4,     3,     1,     2,
+     1,    10,    11,     9,     9,     8,    11,     8,     5,     2,
+     4,     0,     1,     2,     1,     1,     2,     2,     3,     4,
+     4,     1,     3,     1,     3,     1,     2,     3,     6,     7,
+     2,     1,     1,     2,     2,     3,     3,     3,     3,     1,
+     2,     1
 };
 
 static const short yydefact[] = {     0,
-     0,     7,     8,     0,     4,     0,     0,     5,     6,     3,
-     2,     0,     0,     1,     0,     0,     0,    22,     0,     0,
-     0,     0,    15,    16,    14,    10,     0,     0,    40,    48,
-    47,    46,     0,     0,    42,    44,    45,    36,    35,    34,
-    37,    39,     0,    25,    27,    31,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    55,     0,     9,    12,    13,
-    11,     0,    26,    33,    30,    32,    29,    41,    43,     0,
-    50,    28,    38,     0,    24,     0,     0,     0,     0,     0,
-     0,     0,    54,     0,    53,     0,     0,     0,    17,     0,
-    49,    18,     0,     0,    21,     0,     0,     0,    52,    58,
-     0,    51,     0,     0,     0,    60,    67,    40,    37,     0,
-     0,    75,    77,    79,     0,    23,     0,     0,     0,    56,
-     0,     0,     0,    59,     0,    80,    71,     0,    71,     0,
-     0,    71,    57,     0,     0,    74,     0,     0,     0,     0,
-    76,    78,     0,     0,    71,     0,    71,     0,     0,    93,
-    91,     0,     0,    68,    70,     0,     0,     0,    20,     0,
-    63,     0,     0,    84,     0,     0,     0,     0,     0,    83,
-    69,    92,    65,    66,     0,    62,    61,    71,     0,     0,
-    85,     0,    86,     0,    81,    82,     0,     0,    89,    87,
-    88,    90,    19,     0,    64,     0,     0,     0
+     0,     5,     7,     8,     6,     9,    10,    12,     0,     4,
+     0,     0,    11,     3,     2,     0,     0,     1,     0,    25,
+    26,    27,    28,    46,     0,    46,     0,    14,    24,     0,
+    20,     0,    22,    23,    21,    16,     0,     0,     0,     0,
+    65,    74,    75,    76,    72,    73,    69,    67,    68,    70,
+    71,    66,    52,    61,     0,     0,    50,    51,    63,     0,
+     0,     0,    13,    19,     0,    46,     0,     0,    15,     0,
+    48,     0,    44,     0,     0,    53,    60,     0,    54,    62,
+    59,     0,     0,    77,    49,    64,    58,    55,     0,     0,
+    86,     0,    82,     0,     0,     0,    37,     0,     0,     0,
+    45,     0,     0,    56,     0,     0,    78,    79,    57,     0,
+     0,     0,    81,     0,    85,     0,     0,     0,     0,     0,
+     0,    37,     0,     0,    36,    35,     0,     0,     0,     0,
+    91,    99,    47,     0,    42,     0,     0,    65,    52,     0,
+     0,   112,   114,   116,    80,    89,     0,    84,    83,     0,
+     0,     0,     0,    29,     0,     0,     0,   132,   130,     0,
+     0,    31,    33,    34,    38,    17,    18,    90,     0,     0,
+     0,    53,    54,     0,   117,   102,     0,    87,     0,     0,
+     0,     0,     0,    30,    39,   102,    32,   131,    43,     0,
+   102,     0,     0,   109,   118,     0,     0,     0,   113,   115,
+    88,     0,     0,   102,     0,     0,     0,    41,     0,   111,
+   110,     0,     0,     0,   100,   103,    96,   102,     0,     0,
+     0,    98,     0,    94,     0,   123,     0,     0,     0,     0,
+     0,   122,   104,     0,     0,   102,    95,   102,     0,     0,
+     0,     0,   124,     0,   125,     0,   119,   121,   101,    92,
+     0,     0,    40,   120,   128,   126,   127,   129,    97,    93,
+     0,     0,     0
 };
 
-static const short yydefgoto[] = {   196,
-     4,     5,     6,    22,    23,    24,    50,    76,   110,    44,
-    45,    46,    47,    72,    55,    56,   101,   107,    25,   140,
-   111,   112,   113,   114,   169,   170,   154
+static const short yydefgoto[] = {   261,
+     8,     9,    10,    11,    69,    30,    31,    32,   125,   126,
+   127,    33,    34,    74,    39,    72,   140,    57,    58,    59,
+    60,    85,    91,    92,    93,   147,   132,    35,   198,   215,
+   141,   142,   143,   144,   231,   232,   216
 };
 
-static const short yypact[] = {    21,
-   -18,-32768,-32768,    68,    66,    20,    54,-32768,-32768,    66,
-   155,   171,     0,   155,    48,   116,   116,    52,    61,   -14,
-    59,   160,-32768,-32768,-32768,-32768,    29,   151,-32768,-32768,
--32768,-32768,    81,   189,   111,   120,-32768,-32768,-32768,-32768,
--32768,-32768,   117,-32768,    64,-32768,   124,   133,   135,   152,
-   116,   154,   150,   163,   116,-32768,   186,-32768,-32768,-32768,
--32768,   158,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   148,
-    64,-32768,-32768,   161,   173,   175,   191,   192,   179,   180,
-   195,   196,-32768,    28,-32768,   197,   183,    86,-32768,   134,
--32768,-32768,   134,   135,-32768,   199,   187,   134,-32768,-32768,
-   -22,-32768,   188,   116,   200,-32768,-32768,   185,    18,   204,
-   190,-32768,   193,-32768,   194,-32768,   201,   134,   198,-32768,
-   206,   134,   207,-32768,   116,   202,    41,    98,    41,   205,
-   203,    41,-32768,   208,   210,-32768,   214,    -6,   209,   211,
--32768,-32768,   215,    26,    41,    86,    41,   134,    22,-32768,
--32768,   212,   216,-32768,-32768,   217,   218,   219,-32768,    86,
--32768,    86,   213,-32768,   220,    -3,     8,   221,    -9,-32768,
--32768,-32768,-32768,-32768,   222,-32768,-32768,    41,    -1,    -1,
--32768,    -1,-32768,    -1,-32768,-32768,   223,   224,-32768,-32768,
--32768,-32768,-32768,   228,-32768,   230,   239,-32768
+static const short yypact[] = {    88,
+   -12,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    88,   347,
+   -15,    15,-32768,   347,   347,   157,    18,   347,     7,-32768,
+-32768,-32768,-32768,    25,   153,    25,    36,-32768,-32768,   175,
+-32768,   118,-32768,-32768,-32768,    67,   102,   122,   135,   245,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,    22,   313,   262,   144,   131,-32768,   327,   160,
+   198,   159,-32768,-32768,   262,    25,   162,   180,-32768,   161,
+   171,   178,   164,   181,   341,-32768,-32768,   183,-32768,   341,
+-32768,   196,   182,     8,-32768,   341,-32768,   214,   193,   201,
+-32768,   262,-32768,   186,   212,   229,    48,    62,    57,   122,
+-32768,   236,   246,-32768,   233,   279,   131,-32768,-32768,   243,
+   270,   280,-32768,    50,-32768,   287,   262,   277,    50,   262,
+    -1,     9,   279,    -5,   278,   302,   281,   283,   295,   314,
+-32768,-32768,-32768,   262,   299,   279,   296,   309,     0,   331,
+   311,-32768,   316,-32768,-32768,-32768,    98,-32768,-32768,   324,
+   345,   279,   346,-32768,   344,   335,   328,-32768,-32768,   354,
+   358,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   339,   357,
+   342,   104,   105,   262,    38,   362,   228,-32768,   364,   279,
+   348,   349,   352,-32768,-32768,   362,-32768,-32768,-32768,    16,
+   362,   262,   262,-32768,   353,   365,    10,    57,-32768,-32768,
+-32768,   350,   279,   362,   279,    57,   356,-32768,    57,-32768,
+-32768,   366,   109,   363,   369,-32768,-32768,   362,   355,    57,
+   359,-32768,   371,-32768,   109,-32768,   360,    43,    53,   361,
+    61,-32768,-32768,    10,    57,   362,-32768,   362,   367,   100,
+     6,     6,-32768,     6,-32768,     6,-32768,-32768,-32768,-32768,
+    57,    57,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+   396,   397,-32768
 };
 
 static const short yypgoto[] = {-32768,
-    45,   243,-32768,-32768,   231,   232,-32768,   164,   -16,   229,
--32768,   172,-32768,   181,-32768,   -44,-32768,    15,   240,  -124,
-   -91,   136,-32768,   137,-32768,    94,   -82
+   351,   163,   389,-32768,-32768,-32768,   370,   -18,   275,   282,
+   284,-32768,-32768,-32768,   -16,   304,   -24,-32768,   -38,-32768,
+   -37,   -10,   315,-32768,   -36,-32768,  -186,-32768,  -180,   176,
+  -119,     4,-32768,   232,   187,  -152,  -124
 };
 
 
-#define        YYLAST          265
-
-
-static const short yytable[] = {    43,
-    48,   115,    52,     7,   143,    53,   119,   146,    83,    85,
-   164,    54,   120,   150,   151,   121,   150,   151,   150,   151,
-   160,    26,   162,     1,   152,   185,   131,   150,   151,   165,
-   134,   166,   167,   168,    78,   180,    99,   153,    86,   102,
-   153,   164,   153,     2,     3,   158,   182,    80,    62,    11,
-    12,   153,   -73,   188,    14,   125,   163,    13,   159,   138,
-   165,    82,   166,   167,   168,    28,    29,    30,    31,    32,
-     1,    33,    34,    35,    36,    37,    38,    39,    40,   139,
-    41,    27,    42,   181,   183,    49,    51,   123,     2,     3,
-     8,     9,    57,    35,    36,    37,   189,   190,    64,   191,
-    71,   192,    28,    29,    30,    31,    32,   141,    33,    34,
-    35,    36,    37,    38,    39,    40,   105,    41,   106,    42,
-    28,    29,    30,    31,    32,    68,    33,    34,    35,    36,
-    37,    38,    39,    40,    69,    41,    70,    42,    28,   108,
-    30,    31,    32,    73,    33,    34,    35,    36,    37,    38,
-    39,    40,    74,   109,    75,    42,    29,    30,    31,    32,
-   161,    33,    34,    35,    36,    37,    38,    39,    40,    80,
-    41,    77,    42,    79,   176,    81,   177,     8,     9,    15,
-    89,    90,    84,    82,    16,    17,    18,    19,    20,    21,
-    15,    58,    88,    92,    93,    16,    17,    18,    19,    20,
-    21,    35,    36,    37,    65,    67,    66,    87,    94,    95,
-    96,    97,    98,    82,    80,   100,   103,   104,   117,   -72,
-   118,   122,   124,   126,   127,   133,   135,   144,   129,   197,
-   128,   130,   132,   149,   171,   137,   172,   145,   198,   173,
-   174,   156,   147,   148,   187,   157,    10,   178,   155,   175,
-   195,    91,    59,    60,   194,   193,    63,   116,   179,   184,
-   136,    61,   186,     0,   142
+#define        YYLAST          412
+
+
+static const short yytable[] = {   162,
+    56,    77,    78,   157,   173,   206,    55,    67,    12,    61,
+   209,   217,   107,   158,   159,    81,   171,   154,    17,   222,
+    87,    16,   224,   220,   158,   159,    79,   121,   158,   159,
+    82,   160,   182,   237,   207,   155,    77,   235,    36,  -106,
+    95,    77,    90,   161,   174,    37,   214,    77,   250,    96,
+   124,    84,   113,   115,   161,   251,   208,   252,   161,   195,
+   202,   158,   159,    38,   259,   260,   121,   116,   110,   122,
+   112,   158,   159,   108,    62,   148,   196,   149,   248,   226,
+   128,   129,   113,   219,   242,   221,   123,   248,   111,   124,
+     1,   161,   151,   130,   244,   153,   145,   131,    77,    78,
+   247,   161,   227,   243,   245,    68,   228,   229,   230,   169,
+     2,     3,     4,     5,     6,     7,   255,   256,   226,   257,
+    70,   258,    40,    41,    42,    43,    44,   226,    45,    46,
+    47,    48,    49,    50,    51,    52,    53,   178,    54,   254,
+    71,   227,   179,  -108,  -107,   228,   229,   230,   192,   193,
+   227,    65,    66,    73,   228,   229,   230,    40,    41,    42,
+    43,    44,    83,    45,    46,    47,    48,    49,    50,    51,
+    52,    53,    15,    54,    84,    19,    18,   194,    88,    94,
+    97,    20,    21,    22,    23,    20,    21,    22,    23,    24,
+    25,    26,    27,    19,    28,   210,   211,    29,    98,   103,
+    99,   104,   102,    20,    21,    22,    23,    24,    25,    26,
+    27,   110,    63,   100,   105,    29,    89,   101,   109,   114,
+   106,    20,    21,    22,    23,   117,    20,    21,    22,    23,
+   118,   111,    40,    41,    42,    43,    44,   199,    45,    46,
+    47,    48,    49,    50,    51,    52,    53,   119,    54,    75,
+    41,    42,    43,    44,   134,    45,    46,    47,    48,    49,
+    50,    51,    52,    76,   135,    54,    40,    41,    42,    43,
+    44,   136,    45,    46,    47,    48,    49,    50,    51,    52,
+    53,   111,    54,   137,   138,    42,    43,    44,   146,    45,
+    46,    47,    48,    49,    50,    51,    52,   139,   110,    54,
+    75,    41,    42,    43,    44,   150,    45,    46,    47,    48,
+    49,    50,    51,    52,   172,   152,    54,    80,    41,   124,
+   121,   165,   166,    45,    46,    47,    48,    49,    50,    51,
+    52,    86,    41,    54,   167,   170,   168,    45,    46,    47,
+    48,    49,    50,    51,    52,    75,    41,    54,  -105,   175,
+   176,    45,    46,    47,    48,    49,    50,    51,    52,    13,
+   177,    54,   180,   181,   183,    13,   184,   186,    13,     2,
+     3,     4,     5,     6,     7,   185,   187,   188,   189,   190,
+   197,   191,   201,   213,   225,   233,   203,   234,   204,   218,
+   205,   212,   223,   239,   236,   262,   263,    14,   238,    64,
+   164,   241,   246,   133,     0,   156,   163,   253,   200,   249,
+   120,   240
 };
 
-static const short yycheck[] = {    16,
-    17,    93,    19,    22,   129,    20,    98,   132,    53,    54,
-    20,    26,    35,    20,    21,    38,    20,    21,    20,    21,
-   145,    22,   147,     3,    31,    35,   118,    20,    21,    39,
-   122,    41,    42,    43,    51,    39,    81,    44,    55,    84,
-    44,    20,    44,    23,    24,    20,    39,    20,    20,     5,
-    31,    44,    35,   178,    10,    38,   148,     4,    33,    19,
-    39,    34,    41,    42,    43,     5,     6,     7,     8,     9,
-     3,    11,    12,    13,    14,    15,    16,    17,    18,    39,
-    20,    34,    22,   166,   167,    34,    26,   104,    23,    24,
-    23,    24,    34,    13,    14,    15,   179,   180,    18,   182,
-    37,   184,     5,     6,     7,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    31,    20,    33,    22,
-     5,     6,     7,     8,     9,    15,    11,    12,    13,    14,
-    15,    16,    17,    18,    15,    20,    20,    22,     5,     6,
-     7,     8,     9,    20,    11,    12,    13,    14,    15,    16,
-    17,    18,    20,    20,    20,    22,     6,     7,     8,     9,
-   146,    11,    12,    13,    14,    15,    16,    17,    18,    20,
-    20,    20,    22,    20,   160,    26,   162,    23,    24,    20,
-    33,    34,    20,    34,    25,    26,    27,    28,    29,    30,
-    20,    32,    35,    33,    34,    25,    26,    27,    28,    29,
-    30,    13,    14,    15,    33,    34,    18,    22,    36,    35,
-    20,    20,    34,    34,    20,    20,    20,    35,    20,    35,
-    34,    34,    23,    20,    35,    20,    20,    23,    35,     0,
-    38,    31,    35,    20,    23,    34,    21,    35,     0,    23,
-    23,    31,    35,    34,    23,    31,     4,    35,    40,    31,
-    23,    71,    22,    22,    31,    33,    28,    94,    39,    39,
-   125,    22,   169,    -1,   128
+static const short yycheck[] = {   124,
+    25,    40,    40,   123,     5,   186,    25,    32,    21,    26,
+   191,   198,     5,    19,    20,    54,   136,    19,     4,   206,
+    59,    37,   209,   204,    19,    20,     5,    19,    19,    20,
+    55,    37,   152,   220,    19,    37,    75,   218,    21,    40,
+    65,    80,    61,    49,    45,    39,    37,    86,   235,    66,
+    42,    44,    89,    90,    49,   236,    41,   238,    49,    22,
+   180,    19,    20,    39,   251,   252,    19,    92,    19,    22,
+    89,    19,    20,    84,    39,   112,    39,   114,   231,    19,
+    19,    20,   119,   203,    42,   205,    39,   240,    39,    42,
+     3,    49,   117,    37,    42,   120,   107,    41,   137,   137,
+    40,    49,    42,   228,   229,    39,    46,    47,    48,   134,
+    23,    24,    25,    26,    27,    28,   241,   242,    19,   244,
+    19,   246,     5,     6,     7,     8,     9,    19,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    40,    21,    40,
+    19,    42,    45,    40,    40,    46,    47,    48,    45,    45,
+    42,    34,    35,    19,    46,    47,    48,     5,     6,     7,
+     8,     9,    19,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    10,    21,    44,    19,    14,   174,    19,    21,
+    19,    29,    30,    31,    32,    29,    30,    31,    32,    33,
+    34,    35,    36,    19,    38,   192,   193,    41,    19,    19,
+    40,    19,    39,    29,    30,    31,    32,    33,    34,    35,
+    36,    19,    38,    43,    19,    41,    19,    40,     5,    19,
+    39,    29,    30,    31,    32,    40,    29,    30,    31,    32,
+    19,    39,     5,     6,     7,     8,     9,    10,    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,     5,     6,     7,     8,
+     9,    39,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    39,    21,     5,     6,     7,     8,     9,    19,    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,    39,    21,     5,     6,    42,
+    19,    41,    40,    11,    12,    13,    14,    15,    16,    17,
+    18,     5,     6,    21,    40,    37,    23,    11,    12,    13,
+    14,    15,    16,    17,    18,     5,     6,    21,    40,    19,
+    40,    11,    12,    13,    14,    15,    16,    17,    18,     9,
+    45,    21,    39,    19,    19,    15,    23,    40,    18,    23,
+    24,    25,    26,    27,    28,    41,    23,    20,    40,    23,
+    19,    40,    19,    19,    19,    23,    39,    19,    40,    40,
+    39,    39,    37,    23,    40,     0,     0,     9,    40,    30,
+   126,    42,    42,   100,    -1,   122,   125,    41,   177,   234,
+    96,   225
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/lib/bison.simple"
@@ -1005,124 +1222,283 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 179 "parse.y"
+#line 311 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 180 "parse.y"
+#line 312 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 181 "parse.y"
+#line 313 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 182 "parse.y"
+#line 314 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 185 "parse.y"
+#line 317 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 6:
-#line 189 "parse.y"
+#line 323 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 7:
-#line 193 "parse.y"
+#line 329 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 8:
-#line 197 "parse.y"
+#line 335 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
+                                              ccode_line);
                        nodes = g_list_append(nodes,node);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
                                        ;
     break;}
 case 9:
-#line 203 "parse.y"
+#line 341 "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 347 "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 355 "parse.y"
+{ ; ;
+    break;}
+case 12:
+#line 356 "parse.y"
+{ ; ;
+    break;}
+case 13:
+#line 359 "parse.y"
 {
                        ((Class *)class)->nodes = class_nodes;
                        class_nodes = NULL;
                        nodes = g_list_append(nodes,class);
                                                ;
     break;}
-case 10:
-#line 210 "parse.y"
+case 14:
+#line 364 "parse.y"
 {
-                       class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+                       ((Class *)class)->nodes = NULL;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
                                                ;
     break;}
-case 11:
-#line 215 "parse.y"
+case 15:
+#line 371 "parse.y"
+{
+                       class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL);
+                                               ;
+    break;}
+case 17:
+#line 377 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"chunks") == 0) {
+                                       chunk_size = g_strdup(yyvsp[0].id);
+                       } else {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+               ;
+    break;}
+case 18:
+#line 385 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"chunks") == 0) {
+                               if(atoi(yyvsp[0].id) != 0)
+                                       chunk_size = g_strdup(yyvsp[0].id);
+                       } else {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+               ;
+    break;}
+case 19:
+#line 396 "parse.y"
 { ; ;
     break;}
-case 12:
-#line 216 "parse.y"
+case 20:
+#line 397 "parse.y"
 { ; ;
     break;}
-case 13:
-#line 217 "parse.y"
+case 21:
+#line 400 "parse.y"
 { ; ;
     break;}
-case 14:
-#line 218 "parse.y"
+case 22:
+#line 401 "parse.y"
 { ; ;
     break;}
-case 15:
-#line 219 "parse.y"
+case 23:
+#line 402 "parse.y"
 { ; ;
     break;}
-case 16:
-#line 220 "parse.y"
+case 24:
+#line 403 "parse.y"
 { ; ;
     break;}
-case 17:
-#line 223 "parse.y"
+case 25:
+#line 406 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+    break;}
+case 26:
+#line 407 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+    break;}
+case 27:
+#line 408 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+    break;}
+case 28:
+#line 409 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
+    break;}
+case 29:
+#line 412 "parse.y"
+{
+                       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 30:
+#line 425 "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 31:
+#line 441 "parse.y"
+{
+                       initializer = yyvsp[0].id;
+                       initializer_line = ccode_line;
+                               ;
+    break;}
+case 32:
+#line 445 "parse.y"
+{
+                       initializer = (yyvsp[0].cbuf)->str;
+                       initializer_line = ccode_line;
+                       g_string_free(yyvsp[0].cbuf, FALSE);
+                               ;
+    break;}
+case 33:
+#line 453 "parse.y"
+{ ; ;
+    break;}
+case 34:
+#line 454 "parse.y"
+{ ; ;
+    break;}
+case 35:
+#line 455 "parse.y"
+{ destructor = NULL; ;
+    break;}
+case 36:
+#line 456 "parse.y"
+{ initializer = NULL; ;
+    break;}
+case 37:
+#line 457 "parse.y"
+{
+                       destructor = NULL;
+                       initializer = NULL;
+                                       ;
+    break;}
+case 38:
+#line 463 "parse.y"
 {
-                       push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line);
+                       push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
                                                ;
     break;}
-case 18:
-#line 226 "parse.y"
+case 39:
+#line 466 "parse.y"
 {
-                       push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line);
+                       push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
                                                ;
     break;}
-case 19:
-#line 230 "parse.y"
+case 40:
+#line 470 "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);
                                g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
                                g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL);
+                               g_list_free(yyvsp[-9].list);
                                g_string_free(yyvsp[-1].cbuf,TRUE);
                                g_string_free(yyvsp[-4].cbuf,TRUE);
                                yyerror(_("parse error"));
@@ -1130,248 +1506,355 @@ case 19:
                        }
                                                ;
     break;}
-case 20:
-#line 259 "parse.y"
+case 41:
+#line 506 "parse.y"
 {
-                       if(strcmp(yyvsp[-3].id,"get")==0) {
+                       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);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-3].id,"set")==0) {
+                               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);
-                               class_nodes = g_list_append(class_nodes,node);
+                               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);
                                g_free(yyvsp[-4].id);
-                               g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
+                               g_list_foreach(yyvsp[-6].list, (GFunc)g_free, NULL);
+                               g_list_free(yyvsp[-6].list);
+                               g_string_free(yyvsp[-1].cbuf, TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                                                ;
     break;}
-case 21:
-#line 285 "parse.y"
+case 42:
+#line 535 "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);
+                               g_list_free(yyvsp[-3].list);
+                               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_GET_CLASS(self)";
+                               if(no_self_alias)
+                                       error_print(GOB_ERROR, yyvsp[-4].line,
+                                                   _("Self aliases needed when autolinking to a classwide member"));
+                       } else
+                               root = "self";
+
+                       if(strcmp(yyvsp[0].id, "link")==0) {
+                               set = g_strdup_printf("%s->%s = ARG;",
+                                                     root, yyvsp[-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();
+                       }
+
+                       if(strcmp(yyvsp[0].id, "stringlink")==0) {
+                               get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, yyvsp[-1].id);
+                       } else
+                               /* For everything else, get is just straight assignment */
+                               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 43:
+#line 609 "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 44:
+#line 618 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                       typestack = g_list_prepend(typestack,NULL);
+                                               ;
+    break;}
+case 45:
+#line 624 "parse.y"
 { yyval.list = yyvsp[-1].list; ;
     break;}
-case 22:
-#line 286 "parse.y"
+case 46:
+#line 625 "parse.y"
 { yyval.list = NULL; ;
     break;}
-case 23:
-#line 289 "parse.y"
+case 47:
+#line 628 "parse.y"
 {
                        yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
                                                ;
     break;}
-case 24:
-#line 292 "parse.y"
+case 48:
+#line 631 "parse.y"
 {
                        yyval.list = g_list_append(NULL,yyvsp[0].id);
                                                ;
     break;}
-case 25:
-#line 298 "parse.y"
-{ ; ;
-    break;}
-case 26:
-#line 299 "parse.y"
-{
-                       Type *type = typestack->data;
-                       char *oldname = type->name;
-                       type->name = g_strconcat("const ",oldname,NULL);
-                       g_free(oldname);
-                                               ;
-    break;}
-case 27:
-#line 307 "parse.y"
+case 49:
+#line 637 "parse.y"
 {
-                       Node *node = new_type(0,yyvsp[0].id);
+                       Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
                        typestack = g_list_prepend(typestack,node);
-                                               ;
+                                                       ;
     break;}
-case 28:
-#line 311 "parse.y"
+case 50:
+#line 641 "parse.y"
 {
-                       Node *node = new_type(stars,yyvsp[-1].id);
-                       stars = 0;
+                       Node *node = new_type(yyvsp[0].id, NULL, NULL);
                        typestack = g_list_prepend(typestack,node);
-                                               ;
+                                                       ;
     break;}
-case 29:
-#line 318 "parse.y"
+case 51:
+#line 648 "parse.y"
 {
-                       yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
-                                               ;
+                       yyval.id = yyvsp[0].id;
+                                                       ;
     break;}
-case 30:
-#line 321 "parse.y"
+case 52:
+#line 651 "parse.y"
 {
-                       yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
-                                               ;
+                       yyval.id = yyvsp[0].id;
+                                                       ;
     break;}
-case 31:
-#line 324 "parse.y"
+case 53:
+#line 654 "parse.y"
 {
-                       yyval.id = g_strdup(yyvsp[0].id);
-                                               ;
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
     break;}
-case 32:
-#line 327 "parse.y"
+case 54:
+#line 658 "parse.y"
 {
-                       yyval.id = g_strdup("unsigned char");
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
     break;}
-case 33:
-#line 330 "parse.y"
+case 55:
+#line 662 "parse.y"
 {
-                       yyval.id = g_strdup("signed char");
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
     break;}
-case 34:
-#line 333 "parse.y"
+case 56:
+#line 666 "parse.y"
 {
-                       yyval.id = g_strdup("char");
-                                               ;
+                       yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+                                            yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
     break;}
-case 35:
-#line 336 "parse.y"
+case 57:
+#line 671 "parse.y"
 {
-                       yyval.id = g_strdup("double");
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-2].id, " ",
+                                            yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
     break;}
-case 36:
-#line 339 "parse.y"
+case 58:
+#line 679 "parse.y"
 {
-                       yyval.id = g_strdup("float");
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
     break;}
-case 37:
-#line 342 "parse.y"
+case 59:
+#line 683 "parse.y"
 {
-                       yyval.id = yyvsp[0].id;
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[-1].id);
+                       g_free(yyvsp[0].id);
+                                                       ;
     break;}
-case 38:
-#line 345 "parse.y"
+case 60:
+#line 688 "parse.y"
 {
-                       yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
-                                               ;
+                                                       ;
     break;}
-case 39:
-#line 349 "parse.y"
+case 61:
+#line 692 "parse.y"
 {
                        yyval.id = yyvsp[0].id;
-                                               ;
+                                                       ;
     break;}
-case 40:
-#line 352 "parse.y"
+case 62:
+#line 695 "parse.y"
 {
-                       yyval.id = g_strdup("void");
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
     break;}
-case 41:
-#line 357 "parse.y"
+case 63:
+#line 699 "parse.y"
 {
-                       yyval.id = "long int";
-                                               ;
+                       yyval.id = g_strdup(yyvsp[0].id);
+                                                       ;
     break;}
-case 42:
-#line 360 "parse.y"
+case 64:
+#line 702 "parse.y"
 {
-                       yyval.id = "long";
-                                               ;
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                                                       ;
     break;}
-case 43:
-#line 363 "parse.y"
-{
-                       yyval.id = "short int";
-                                               ;
+case 65:
+#line 707 "parse.y"
+{ yyval.id = "void"; ;
     break;}
-case 44:
-#line 366 "parse.y"
-{
-                       yyval.id = "short";
-                                               ;
+case 66:
+#line 708 "parse.y"
+{ yyval.id = "char"; ;
     break;}
-case 45:
-#line 369 "parse.y"
-{
-                       yyval.id = "int";
-                                               ;
+case 67:
+#line 709 "parse.y"
+{ yyval.id = "short"; ;
     break;}
-case 46:
-#line 374 "parse.y"
-{
-                       yyval.id = "enum ";
-                                               ;
+case 68:
+#line 710 "parse.y"
+{ yyval.id = "int"; ;
     break;}
-case 47:
-#line 377 "parse.y"
-{
-                       yyval.id = "union ";
-                                               ;
+case 69:
+#line 711 "parse.y"
+{ yyval.id = "long"; ;
     break;}
-case 48:
-#line 380 "parse.y"
-{
-                       yyval.id = "struct ";
-                                               ;
+case 70:
+#line 712 "parse.y"
+{ yyval.id = "float"; ;
     break;}
-case 49:
-#line 385 "parse.y"
-{ stars++; ;
+case 71:
+#line 713 "parse.y"
+{ yyval.id = "double"; ;
     break;}
-case 50:
-#line 386 "parse.y"
-{ stars++; ;
+case 72:
+#line 714 "parse.y"
+{ yyval.id = "signed"; ;
     break;}
-case 51:
-#line 389 "parse.y"
+case 73:
+#line 715 "parse.y"
+{ yyval.id = "unsigned"; ;
+    break;}
+case 74:
+#line 718 "parse.y"
+{ yyval.id = "struct"; ;
+    break;}
+case 75:
+#line 719 "parse.y"
+{ yyval.id = "union"; ;
+    break;}
+case 76:
+#line 720 "parse.y"
+{ yyval.id = "enum"; ;
+    break;}
+case 77:
+#line 723 "parse.y"
+{ yyval.id = g_strdup("*"); ;
+    break;}
+case 78:
+#line 724 "parse.y"
+{ yyval.id = g_strdup("* const"); ;
+    break;}
+case 79:
+#line 725 "parse.y"
 {
-                       if(strcmp(yyvsp[-1].id,"first")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-1].id,"last")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-                       else {
-                               yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-1].id);
-                               YYERROR;
-                       }
-                       g_free(yyvsp[-1].id);
+                               yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
                                        ;
     break;}
-case 52:
-#line 401 "parse.y"
+case 80:
+#line 729 "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;
+                               yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       ;
+    break;}
+case 81:
+#line 736 "parse.y"
+{
+                       if(strcmp(yyvsp[-1].id, "first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-1].id, "last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
                        else {
                                yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id);
                                YYERROR;
                        }
-                       g_free(yyvsp[-2].id);
+                       g_free(yyvsp[-1].id);
                                        ;
     break;}
-case 53:
-#line 413 "parse.y"
+case 82:
+#line 748 "parse.y"
 {
-                       yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+                       yyval.sigtype = SIGNAL_LAST_METHOD;
                                        ;
     break;}
-case 54:
-#line 416 "parse.y"
+case 83:
+#line 754 "parse.y"
 {
                        if(strcmp(yyvsp[-1].id,"first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -1385,154 +1868,289 @@ case 54:
                        g_free(yyvsp[-1].id);
                                        ;
     break;}
-case 55:
-#line 428 "parse.y"
+case 84:
+#line 766 "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 85:
+#line 778 "parse.y"
 {
                        yyval.sigtype = SIGNAL_LAST_METHOD;
                                        ;
     break;}
-case 56:
-#line 433 "parse.y"
+case 86:
+#line 781 "parse.y"
+{
+                       /* the_scope was default thus public */
+                       the_scope = PUBLIC_SCOPE;
+                                       ;
+    break;}
+case 87:
+#line 787 "parse.y"
 {
-                       gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+                       gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
                                                ;
     break;}
-case 57:
-#line 438 "parse.y"
+case 88:
+#line 792 "parse.y"
 {
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+                       gtktypes = g_list_append(gtktypes, yyvsp[0].id);
                                                ;
     break;}
-case 58:
-#line 441 "parse.y"
+case 89:
+#line 795 "parse.y"
 { 
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+                       gtktypes = g_list_append(gtktypes, yyvsp[0].id);
                                                        ;
     break;}
-case 59:
-#line 446 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 90:
+#line 800 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
     break;}
-case 60:
-#line 447 "parse.y"
+case 91:
+#line 801 "parse.y"
 { yyval.cbuf = NULL; ;
     break;}
-case 61:
-#line 451 "parse.y"
+case 92:
+#line 805 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(yyvsp[-7].sigtype,NULL,
-                                     yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
+                       push_function(the_scope, yyvsp[-7].sigtype,NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line,
+                                     ccode_line, vararg, yyvsp[-8].list);
                                                                        ;
     break;}
-case 62:
-#line 461 "parse.y"
+case 93:
+#line 821 "parse.y"
+{
+                       if(!has_self) {
+                               yyerror(_("signal without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, yyvsp[-7].sigtype, NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line,
+                                     ccode_line, vararg, yyvsp[-8].list);
+                                                                       ;
+    break;}
+case 94:
+#line 837 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-8].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 63:
-#line 471 "parse.y"
+case 95:
+#line 853 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-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 64:
-#line 481 "parse.y"
+case 96:
+#line 869 "parse.y"
 {
-                       push_function(OVERRIDE_METHOD, yyvsp[-9].id,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,
-                                     yyvsp[-11].line,yyvsp[-1].line,
-                                     vararg);
+                       if(!has_self) {
+                               yyerror(_("virtual method without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 65:
-#line 487 "parse.y"
+case 97:
+#line 880 "parse.y"
 {
-                       push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
-                                                               ;
+                       push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,
+                                     yyvsp[-10].line, ccode_line,
+                                     vararg, NULL);
+                                                                       ;
     break;}
-case 66:
-#line 492 "parse.y"
+case 98:
+#line 886 "parse.y"
 {
-                       push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+                                     vararg, NULL);
                                                                ;
     break;}
-case 67:
-#line 497 "parse.y"
+case 99:
+#line 896 "parse.y"
 {
-                       if(strcmp(yyvsp[-4].id,"init")==0) {
+                       if(strcmp(yyvsp[-4].id, "init")==0) {
                                push_init_arg(yyvsp[-2].id,FALSE);
-                               push_function(INIT_METHOD, NULL,
-                                             yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-                                             ccode_line,FALSE);
-                       } else if(strcmp(yyvsp[-4].id,"class_init")==0) {
+                               push_function(NO_SCOPE, INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
+                       } else if(strcmp(yyvsp[-4].id, "class_init")==0) {
                                push_init_arg(yyvsp[-2].id,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL, 
-                                             yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-                                             ccode_line,FALSE);
+                               push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
                        } else {
                                g_free(yyvsp[-4].id);
                                g_free(yyvsp[-2].id);
-                               g_string_free(yyvsp[-2].cbuf,TRUE);
+                               g_string_free(yyvsp[0].cbuf,TRUE);
+                               yyerror(_("parse error "
+                                         "(untyped blocks must be init or "
+                                         "class_init)"));
+                               YYERROR;
+                       }
+                                               ;
+    break;}
+case 100:
+#line 919 "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 101:
+#line 930 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                       if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) {
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
+                       if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) {
+                               onerror = defreturn = NULL;
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-3].id);
+                       g_free(yyvsp[-1].id);
                                                ;
     break;}
-case 68:
-#line 518 "parse.y"
+case 102:
+#line 949 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                                       ;
+    break;}
+case 103:
+#line 955 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 69:
-#line 519 "parse.y"
+case 104:
+#line 956 "parse.y"
 {
-                       yyval.id = (yyvsp[0].cbuf)->str;
-                       g_string_free(yyvsp[0].cbuf,FALSE);
+                       yyval.id = (yyvsp[1].cbuf)->str;
+                       g_string_free(yyvsp[1].cbuf, FALSE);
                                        ;
     break;}
-case 70:
-#line 523 "parse.y"
-{ ; ;
+case 105:
+#line 962 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
     break;}
-case 71:
-#line 524 "parse.y"
-{ yyval.id = NULL; ;
+case 106:
+#line 963 "parse.y"
+{
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[0].id,"self")==0)
+                               push_self(yyvsp[0].id, FALSE);
+                       else {
+                               g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               ;
     break;}
-case 72:
-#line 527 "parse.y"
-{ vararg = FALSE; has_self = FALSE; ;
+case 107:
+#line 974 "parse.y"
+{
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-1].id,"self")==0)
+                               push_self(yyvsp[-1].id, TRUE);
+                       else {
+                               g_free(yyvsp[-1].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               ;
     break;}
-case 73:
-#line 528 "parse.y"
+case 108:
+#line 985 "parse.y"
 {
                        vararg = FALSE;
                        has_self = TRUE;
                        if(strcmp(yyvsp[0].id,"self")==0)
-                               push_self(yyvsp[0].id);
+                               push_self(yyvsp[0].id, TRUE);
                        else {
                                g_free(yyvsp[0].id);
                                yyerror(_("parse error"));
@@ -1540,12 +2158,12 @@ case 73:
                        }
                                                ;
     break;}
-case 74:
-#line 539 "parse.y"
+case 109:
+#line 996 "parse.y"
 {
                        has_self = TRUE;
                        if(strcmp(yyvsp[-2].id,"self")==0)
-                               push_self(yyvsp[-2].id);
+                               push_self(yyvsp[-2].id, FALSE);
                        else {
                                g_free(yyvsp[-2].id);
                                yyerror(_("parse error"));
@@ -1553,53 +2171,96 @@ case 74:
                        }
                                        ;
     break;}
-case 75:
-#line 549 "parse.y"
+case 110:
+#line 1006 "parse.y"
+{
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-3].id,"self")==0)
+                               push_self(yyvsp[-3].id, TRUE);
+                       else {
+                               g_free(yyvsp[-3].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       ;
+    break;}
+case 111:
+#line 1016 "parse.y"
+{
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-2].id,"self")==0)
+                               push_self(yyvsp[-2].id, TRUE);
+                       else {
+                               g_free(yyvsp[-2].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       ;
+    break;}
+case 112:
+#line 1026 "parse.y"
 { has_self = FALSE; ;
     break;}
-case 76:
-#line 552 "parse.y"
+case 113:
+#line 1029 "parse.y"
 { vararg = TRUE; ;
     break;}
-case 77:
-#line 553 "parse.y"
+case 114:
+#line 1030 "parse.y"
 { vararg = FALSE; ;
     break;}
-case 78:
-#line 556 "parse.y"
+case 115:
+#line 1033 "parse.y"
 { ; ;
     break;}
-case 79:
-#line 557 "parse.y"
+case 116:
+#line 1034 "parse.y"
 { ; ;
     break;}
-case 80:
-#line 560 "parse.y"
+case 117:
+#line 1037 "parse.y"
 {
-                       push_funcarg(yyvsp[0].id);
+                       push_funcarg(yyvsp[0].id,NULL);
                                                                ;
     break;}
-case 81:
-#line 563 "parse.y"
+case 118:
+#line 1040 "parse.y"
+{
+                       push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+                                                               ;
+    break;}
+case 119:
+#line 1043 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                        g_free(yyvsp[-2].id);
-                       push_funcarg(yyvsp[-4].id);
+                       push_funcarg(yyvsp[-4].id,NULL);
                                                                ;
     break;}
-case 82:
-#line 573 "parse.y"
+case 120:
+#line 1051 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"check")!=0) {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-2].id);
+                       push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+                                                               ;
+    break;}
+case 121:
+#line 1061 "parse.y"
 { ; ;
     break;}
-case 83:
-#line 574 "parse.y"
+case 122:
+#line 1062 "parse.y"
 { ; ;
     break;}
-case 84:
-#line 577 "parse.y"
+case 123:
+#line 1065 "parse.y"
 {
                        if(strcmp(yyvsp[0].id,"type")==0) {
                                Node *node = new_check(TYPE_CHECK,NULL);
@@ -1614,61 +2275,61 @@ case 84:
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 85:
-#line 590 "parse.y"
+case 124:
+#line 1078 "parse.y"
 {
                        Node *node = new_check(GT_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 86:
-#line 594 "parse.y"
+case 125:
+#line 1082 "parse.y"
 {
                        Node *node = new_check(LT_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 87:
-#line 598 "parse.y"
+case 126:
+#line 1086 "parse.y"
 {
                        Node *node = new_check(GE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 88:
-#line 602 "parse.y"
+case 127:
+#line 1090 "parse.y"
 {
                        Node *node = new_check(LE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 89:
-#line 606 "parse.y"
+case 128:
+#line 1094 "parse.y"
 {
                        Node *node = new_check(EQ_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 90:
-#line 610 "parse.y"
+case 129:
+#line 1098 "parse.y"
 {
                        Node *node = new_check(NE_CHECK,yyvsp[0].id);
                        checks = g_list_append(checks,node);
                                        ;
     break;}
-case 91:
-#line 616 "parse.y"
+case 130:
+#line 1104 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 92:
-#line 617 "parse.y"
+case 131:
+#line 1105 "parse.y"
 {
                        yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 93:
-#line 621 "parse.y"
+case 132:
+#line 1109 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -1893,5 +2554,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 624 "parse.y"
+#line 1112 "parse.y"