#define FLOAT 270
#define DOUBLE 271
#define CHAR 272
-#define ONERROR 273
-#define TOKEN 274
-#define NUMBER 275
-#define TYPETOKEN 276
-#define ARRAY_DIM 277
-#define CCODE 278
-#define HCODE 279
-#define PUBLIC 280
-#define PRIVATE 281
-#define PROTECTED 282
-#define ARGUMENT 283
-#define VIRTUAL 284
-#define SIGNAL 285
-#define OVERRIDE 286
+#define TOKEN 273
+#define NUMBER 274
+#define TYPETOKEN 275
+#define ARRAY_DIM 276
+#define CCODE 277
+#define HTCODE 278
+#define PHCODE 279
+#define HCODE 280
+#define ACODE 281
+#define ATCODE 282
+#define PUBLIC 283
+#define PRIVATE 284
+#define PROTECTED 285
+#define CLASSWIDE 286
+#define ARGUMENT 287
+#define VIRTUAL 288
+#define SIGNAL 289
+#define OVERRIDE 290
#line 21 "parse.y"
#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
if(strcmp(yytext,"\n")==0) {
out=g_strconcat("Error: ",str," before newline",NULL);
} else if(yytext[0]=='\0') {
- out=g_strconcat("Error: ",str," at end of input",NULL);
+ out=g_strconcat("Error: ", str, " at end of input", NULL);
} else {
char *tmp = g_strdup(yytext);
- while((p=strchr(tmp,'\n')))
+ while((p=strchr(tmp, '\n')))
*p='.';
- out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+ out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
g_free(tmp);
}
- fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+ fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
g_free(out);
exit(1);
}
+static Type *
+pop_type(void)
+{
+ Type *type = typestack->data;
+ typestack = g_list_remove(typestack,typestack->data);
+ return type;
+}
+
static void
push_variable(char *name, int scope, int line_no, char *postfix)
{
Node *var;
- Type *type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ Type *type = pop_type();
type->postfix = postfix;
- var = new_variable(scope,type,name,line_no);
+ var = new_variable(scope, type, name, line_no,
+ destructor, destructor_line,
+ destructor_simple,
+ initializer, initializer_line);
class_nodes = g_list_append(class_nodes, var);
}
static void
-push_function(int scope, int method, char *oid, char *id, char *onerror,
- GString *cbuf,int line_no, int ccode_line, int vararg)
+push_function(int scope, int method, char *oid, char *id,
+ GString *cbuf, int line_no, int ccode_line,
+ gboolean vararg, GList *flags)
{
Node *node;
Type *type;
char *c_cbuf;
+
+ g_assert(scope != CLASS_SCOPE);
- if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
- type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+ type = (Type *)new_type(g_strdup("void"), NULL, NULL);
} else {
- type = (Type *)new_type(0,g_strdup("void"),NULL);
+ type = pop_type();
}
/* a complicated and ugly test to figure out if we have
g_list_length(gtktypes) != g_list_length(funcargs) &&
!(g_list_length(funcargs) == 1 &&
g_list_length(gtktypes) == 2 &&
- strcmp(gtktypes->next->data,"NONE")==0)) {
- print_error(TRUE, _("The number of GTK arguments and "
- "function arguments for a signal "
- "don't seem to match"),line_no);
+ strcmp(gtktypes->next->data, "NONE")==0)) {
+ error_print(GOB_WARN, line_no,
+ _("The number of GTK arguments and "
+ "function arguments for a signal "
+ "don't seem to match"));
+ }
+ 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;
} else
c_cbuf = NULL;
- node = new_method(scope,method,type,oid,gtktypes,id,funcargs,
- onerror,c_cbuf,line_no,ccode_line,vararg);
+ node = new_method(scope, method, type, oid, gtktypes, flags,
+ id, funcargs, onerror, defreturn, c_cbuf, line_no,
+ ccode_line, vararg, method_unique_id++);
if(cbuf)
g_string_free(cbuf,
gtktypes = NULL;
funcargs = NULL;
+ onerror = NULL;
+ defreturn = NULL;
+
class_nodes = g_list_append(class_nodes, node);
}
+static void
+free_all_global_state(void)
+{
+ g_free(onerror);
+ onerror = NULL;
+ g_free(defreturn);
+ defreturn = NULL;
+
+ g_free(chunk_size);
+ chunk_size = NULL;
+
+ g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+ g_list_free(gtktypes);
+ gtktypes = NULL;
+
+ free_node_list(funcargs);
+ funcargs = NULL;
+}
+
static void
push_funcarg(char *name, char *postfix)
{
Node *node;
- Type *type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ Type *type = pop_type();
type->postfix = postfix;
- node = new_funcarg(type,name,checks);
+ node = new_funcarg(type, name, checks);
checks = NULL;
funcargs = g_list_append(funcargs, node);
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn,NULL);
+ type = new_type(tn, g_strdup("*"), NULL);
node = new_funcarg((Type *)type,name,NULL);
funcargs = g_list_prepend(funcargs, node);
}
static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
{
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(1,g_strdup(((Class *)class)->otype),NULL);
+ type = new_type(g_strdup(((Class *)class)->otype),
+ g_strdup(constant ? "const *" : "*"), NULL);
ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
node = new_funcarg((Type *)type,id,ch);
funcargs = g_list_prepend(funcargs, node);
}
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+ GList *li;
+
+ for(li = class_nodes; li != NULL; li = li->next) {
+ Variable *var;
+ Node *node = li->data;
+ if(node->type != VARIABLE_NODE)
+ continue;
+ var = li->data;
+ if(strcmp(var->id, id)==0)
+ return var;
+ }
+
+ error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
+
+ g_assert_not_reached();
+ return NULL;
+}
+
+static gboolean
+set_return_value(char *type, char *val)
+{
+ if(strcmp(type, "onerror")==0) {
+ if(!onerror) {
+ onerror = val;
+ return TRUE;
+ } else
+ return FALSE;
+ } else if(strcmp(type, "defreturn")==0) {
+ if(!defreturn) {
+ defreturn = val;
+ return TRUE;
+ } else
+ return FALSE;
+ }
+ return FALSE;
+}
+
-#line 197 "parse.y"
+#line 293 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 214
+#define YYFINAL 263
#define YYFLAG -32768
-#define YYNTBASE 46
+#define YYNTBASE 50
-#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 76)
+#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, 44, 2, 2, 2, 2, 2, 2, 36,
- 37, 39, 2, 40, 45, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 35, 42,
- 43, 41, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 48, 2, 2, 2, 2, 2, 2, 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, 33, 38, 34, 2, 2, 2, 2, 2,
+ 2, 2, 37, 43, 38, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36
};
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
- 0, 4, 7, 10, 12, 15, 18, 20, 22, 27,
- 31, 36, 39, 42, 45, 47, 49, 51, 53, 55,
- 57, 62, 68, 80, 89, 93, 94, 98, 100, 102,
- 105, 107, 110, 113, 116, 118, 121, 124, 126, 128,
- 130, 132, 135, 137, 139, 142, 144, 147, 149, 151,
- 153, 155, 157, 160, 162, 165, 167, 171, 175, 178,
- 180, 185, 189, 191, 194, 196, 206, 217, 227, 237,
- 246, 258, 267, 273, 276, 280, 281, 283, 285, 289,
- 291, 295, 297, 301, 303, 306, 310, 317, 325, 328,
- 330, 332, 335, 338, 342, 346, 350, 354, 356, 359
+ 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[] = { 47,
- 48, 47, 0, 48, 47, 0, 47, 48, 0, 48,
- 0, 47, 24, 0, 47, 25, 0, 24, 0, 25,
- 0, 49, 33, 50, 34, 0, 49, 33, 34, 0,
- 3, 22, 4, 22, 0, 50, 67, 0, 50, 52,
- 0, 50, 53, 0, 67, 0, 52, 0, 53, 0,
- 26, 0, 27, 0, 28, 0, 51, 56, 20, 35,
- 0, 51, 56, 20, 23, 35, 0, 29, 54, 20,
- 20, 20, 33, 24, 20, 33, 24, 35, 0, 29,
- 54, 20, 20, 20, 33, 24, 35, 0, 36, 55,
- 37, 0, 0, 20, 38, 55, 0, 20, 0, 57,
- 0, 5, 57, 0, 58, 0, 58, 61, 0, 12,
- 59, 0, 11, 59, 0, 59, 0, 12, 18, 0,
- 11, 18, 0, 18, 0, 17, 0, 16, 0, 20,
- 0, 60, 20, 0, 22, 0, 6, 0, 13, 15,
- 0, 13, 0, 14, 15, 0, 14, 0, 15, 0,
- 9, 0, 8, 0, 7, 0, 39, 61, 0, 39,
- 0, 20, 64, 0, 64, 0, 51, 20, 64, 0,
- 20, 51, 64, 0, 51, 64, 0, 62, 0, 20,
- 36, 65, 37, 0, 65, 40, 20, 0, 20, 0,
- 33, 24, 0, 35, 0, 31, 63, 56, 20, 36,
- 69, 37, 68, 66, 0, 51, 31, 62, 56, 20,
- 36, 69, 37, 68, 66, 0, 30, 51, 56, 20,
- 36, 69, 37, 68, 66, 0, 51, 30, 56, 20,
- 36, 69, 37, 68, 66, 0, 30, 56, 20, 36,
- 69, 37, 68, 66, 0, 32, 36, 22, 37, 56,
- 20, 36, 69, 37, 68, 66, 0, 51, 56, 20,
- 36, 69, 37, 68, 66, 0, 20, 36, 20, 37,
- 66, 0, 19, 75, 0, 19, 33, 24, 0, 0,
- 6, 0, 20, 0, 20, 40, 70, 0, 70, 0,
- 71, 40, 10, 0, 71, 0, 71, 40, 72, 0,
- 72, 0, 56, 20, 0, 56, 20, 23, 0, 56,
- 20, 36, 20, 73, 37, 0, 56, 20, 23, 36,
- 20, 73, 37, 0, 73, 74, 0, 74, 0, 20,
- 0, 41, 75, 0, 42, 75, 0, 41, 43, 75,
- 0, 42, 43, 75, 0, 43, 43, 75, 0, 44,
- 43, 75, 0, 21, 0, 45, 21, 0, 20, 0
+static const short yyrhs[] = { 52,
+ 53, 52, 0, 53, 52, 0, 52, 53, 0, 53,
+ 0, 23, 0, 26, 0, 24, 0, 25, 0, 27,
+ 0, 28, 0, 52, 51, 0, 51, 0, 54, 37,
+ 56, 38, 0, 54, 37, 38, 0, 3, 21, 4,
+ 21, 55, 0, 0, 39, 19, 19, 40, 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,
- 216, 217, 218, 219, 222, 228, 233, 239, 246, 251,
- 258, 263, 264, 265, 266, 267, 268, 271, 272, 273,
- 276, 279, 283, 316, 344, 345, 348, 351, 357, 358,
- 366, 370, 377, 380, 383, 386, 389, 392, 395, 398,
- 401, 404, 408, 411, 416, 419, 422, 425, 428, 433,
- 436, 439, 444, 445, 449, 461, 467, 479, 491, 494,
- 500, 505, 508, 513, 514, 518, 528, 538, 548, 558,
- 568, 574, 579, 600, 601, 605, 608, 609, 620, 630,
- 633, 634, 637, 638, 641, 644, 647, 655, 665, 666,
- 669, 682, 686, 690, 694, 698, 702, 708, 709, 713
+ 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
static const char * const yytname[] = { "$","error","$undefined.","CLASS",
"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
-"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","PROTECTED","ARGUMENT","VIRTUAL",
-"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'",
-"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable",
-"argument","argflags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","simplesigtype","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,
- 46, 46, 46, 46, 47, 47, 47, 47, 48, 48,
- 49, 50, 50, 50, 50, 50, 50, 51, 51, 51,
- 52, 52, 53, 53, 54, 54, 55, 55, 56, 56,
- 57, 57, 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 59, 59, 59, 59, 59, 60,
- 60, 60, 61, 61, 62, 62, 63, 63, 63, 63,
- 64, 65, 65, 66, 66, 67, 67, 67, 67, 67,
- 67, 67, 67, 68, 68, 68, 69, 69, 69, 69,
- 70, 70, 71, 71, 72, 72, 72, 72, 73, 73,
- 74, 74, 74, 74, 74, 74, 74, 75, 75, 75
+ 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, 3,
- 4, 2, 2, 2, 1, 1, 1, 1, 1, 1,
- 4, 5, 11, 8, 3, 0, 3, 1, 1, 2,
- 1, 2, 2, 2, 1, 2, 2, 1, 1, 1,
- 1, 2, 1, 1, 2, 1, 2, 1, 1, 1,
- 1, 1, 2, 1, 2, 1, 3, 3, 2, 1,
- 4, 3, 1, 2, 1, 9, 10, 9, 9, 8,
- 11, 8, 5, 2, 3, 0, 1, 1, 3, 1,
- 3, 1, 3, 1, 2, 3, 6, 7, 2, 1,
- 1, 2, 2, 3, 3, 3, 3, 1, 2, 1
+ 3, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 2, 1, 4, 3, 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, 18, 19, 20, 26, 0,
- 0, 0, 10, 0, 0, 16, 17, 15, 11, 0,
- 0, 0, 0, 44, 52, 51, 50, 0, 0, 46,
- 48, 49, 40, 39, 38, 41, 43, 0, 0, 29,
- 31, 35, 0, 0, 0, 60, 0, 56, 0, 9,
- 13, 14, 12, 0, 0, 0, 0, 28, 0, 0,
- 30, 37, 34, 36, 33, 45, 47, 0, 0, 54,
- 32, 42, 0, 0, 0, 55, 0, 59, 0, 0,
- 0, 0, 0, 0, 0, 0, 25, 0, 0, 0,
- 53, 63, 0, 58, 57, 0, 0, 0, 0, 0,
- 21, 0, 0, 65, 73, 27, 0, 0, 44, 41,
- 0, 0, 80, 82, 84, 61, 0, 0, 0, 0,
- 0, 22, 0, 64, 0, 0, 0, 85, 76, 0,
- 62, 0, 0, 0, 0, 76, 0, 76, 79, 86,
- 0, 0, 0, 81, 83, 76, 0, 76, 0, 0,
- 0, 24, 0, 0, 0, 100, 98, 0, 0, 74,
- 70, 0, 0, 0, 76, 72, 0, 68, 0, 91,
- 0, 0, 0, 0, 0, 90, 75, 99, 66, 76,
- 69, 0, 0, 0, 0, 92, 0, 93, 0, 0,
- 87, 89, 0, 67, 23, 88, 94, 95, 96, 97,
- 71, 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[] = { 212,
- 4, 5, 6, 24, 25, 26, 27, 32, 69, 121,
- 50, 51, 52, 53, 81, 56, 57, 58, 103, 115,
- 28, 153, 122, 123, 124, 125, 185, 186, 170
+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[] = { 77,
- -16,-32768,-32768, 85, 65, 6, 51,-32768,-32768, 65,
- 120, 216, 42, 120, 46,-32768,-32768,-32768, 62, 115,
- 15, 89,-32768, 229, 54,-32768,-32768,-32768,-32768, 91,
- 116, 131, 206,-32768,-32768,-32768,-32768, 79, 135, 125,
- 140,-32768,-32768,-32768,-32768,-32768,-32768, 171, 161,-32768,
- 151,-32768, 172, 205, 179,-32768, 171,-32768, 186,-32768,
--32768,-32768,-32768, 171, 190, 196, 197, 199, 198, 207,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 218, 203, 151,
--32768,-32768, 204, 231, 232,-32768, -7,-32768, 233, 217,
- 242, -7, 171, 111, 139, 116,-32768, 244, 230, 189,
--32768,-32768, -30,-32768,-32768, 234, 171, 235, 245, 237,
--32768, 189, 243,-32768,-32768,-32768, 236, 189, 238, 59,
- 248, 239,-32768, 240,-32768,-32768, 253, 189, 254, 189,
- 241,-32768, 246,-32768, 255, 247, 171, 9, 259, 153,
--32768, 249, 251, 252, 189, 259, -5, 259,-32768, 256,
- 261, 5, 139,-32768,-32768, 259, 189, 259, 257, 139,
- 258,-32768, 139, 262, 75,-32768,-32768, 264, 269,-32768,
--32768, 139, 260, 139, 259,-32768, 271,-32768, 75,-32768,
- 13, 32, 250, 263, 63,-32768,-32768,-32768,-32768, 259,
--32768, 139, 265, 71, 58,-32768, 58,-32768, 58, 58,
--32768,-32768, 139,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 285, 296,-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,
- 76, 294,-32768,-32768, 3, 275, 277,-32768, 208, -20,
- 270,-32768, 191,-32768, 222, 266,-32768, -38,-32768, -152,
- 281, -144, -109, 170,-32768, 168, 130, -167, -43
+ 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 331
-
-
-static const short yytable[] = { 49,
- 171, 160, 133, 163, 66, 7, 126, 176, 136, 127,
- 178, 172, 83, 174, 161, 86, 88, 202, 142, 189,
- 144, 191, 48, 55, 166, 167, 202, 78, 84, 162,
- 192, 150, 166, 167, 54, 159, 89, 168, 12, 204,
- 16, 17, 18, 91, 151, 203, 104, 173, 105, 169,
- 211, 166, 167, 86, 13, 195, 85, 169, 33, 34,
- 35, 36, 37, 29, 38, 39, 40, 41, 42, 43,
- 44, 45, 109, 46, 197, 47, 169, 166, 167, 1,
- 11, 30, 180, 64, 65, 14, 129, 1, 2, 3,
- 180, 40, 41, 42, 180, -78, 72, 31, 137, 201,
- 2, 3, 169, 181, 182, 183, 184, 206, 8, 9,
- 67, 181, 182, 183, 184, 181, 182, 183, 184, 33,
- 34, 35, 36, 37, 59, 38, 39, 40, 41, 42,
- 43, 44, 45, 110, 46, 68, 47, 196, 198, 76,
- 16, 17, 18, 8, 9, 111, 112, 40, 41, 42,
- 70, 207, 74, 208, 77, 209, 210, 33, 34, 35,
- 36, 37, 154, 38, 39, 40, 41, 42, 43, 44,
- 45, 113, 46, 114, 47, 33, 34, 35, 36, 37,
- 79, 38, 39, 40, 41, 42, 43, 44, 45, 80,
- 46, 82, 47, 33, 119, 35, 36, 37, 87, 38,
- 39, 40, 41, 42, 43, 44, 45, 90, 120, 92,
- 47, 34, 35, 36, 37, 94, 38, 39, 40, 41,
- 42, 43, 44, 45, 83, 46, 98, 47, 73, 75,
- 16, 17, 18, 95, 97, 15, 96, 99, 100, 84,
- 84, 16, 17, 18, 19, 20, 21, 22, 15, 23,
- 102, 83, 106, 107, 16, 17, 18, 19, 20, 21,
- 22, 108, 60, 117, 131, 118, 134, 138, 135, 128,
- 130, 132, 141, 143, -77, 139, 145, 152, 147, 140,
- 165, 179, 146, 148, 213, 156, 157, 187, 158, 188,
- 177, 164, 199, 175, 193, 214, 190, 10, 61, 205,
- 62, 101, 71, 116, 63, 200, 149, 155, 194, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 93
+#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[] = { 20,
- 153, 146, 112, 148, 25, 22, 37, 160, 118, 40,
- 163, 156, 20, 158, 20, 54, 55, 185, 128, 172,
- 130, 174, 20, 21, 20, 21, 194, 48, 36, 35,
- 175, 23, 20, 21, 20, 145, 57, 33, 33, 192,
- 26, 27, 28, 64, 36, 190, 85, 157, 87, 45,
- 203, 20, 21, 92, 4, 43, 54, 45, 5, 6,
- 7, 8, 9, 22, 11, 12, 13, 14, 15, 16,
- 17, 18, 93, 20, 43, 22, 45, 20, 21, 3,
- 5, 36, 20, 30, 31, 10, 107, 3, 24, 25,
- 20, 13, 14, 15, 20, 37, 18, 36, 40, 37,
- 24, 25, 45, 41, 42, 43, 44, 37, 24, 25,
- 20, 41, 42, 43, 44, 41, 42, 43, 44, 5,
- 6, 7, 8, 9, 36, 11, 12, 13, 14, 15,
- 16, 17, 18, 23, 20, 20, 22, 181, 182, 15,
- 26, 27, 28, 24, 25, 35, 36, 13, 14, 15,
- 20, 195, 18, 197, 15, 199, 200, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 33, 20, 35, 22, 5, 6, 7, 8, 9,
- 20, 11, 12, 13, 14, 15, 16, 17, 18, 39,
- 20, 20, 22, 5, 6, 7, 8, 9, 20, 11,
- 12, 13, 14, 15, 16, 17, 18, 22, 20, 20,
- 22, 6, 7, 8, 9, 20, 11, 12, 13, 14,
- 15, 16, 17, 18, 20, 20, 20, 22, 38, 39,
- 26, 27, 28, 37, 37, 20, 38, 20, 36, 36,
- 36, 26, 27, 28, 29, 30, 31, 32, 20, 34,
- 20, 20, 20, 37, 26, 27, 28, 29, 30, 31,
- 32, 20, 34, 20, 20, 36, 24, 20, 33, 36,
- 36, 35, 20, 20, 37, 37, 36, 19, 24, 40,
- 20, 20, 37, 37, 0, 37, 36, 24, 37, 21,
- 33, 36, 43, 37, 24, 0, 37, 4, 24, 35,
- 24, 80, 33, 96, 24, 43, 137, 140, 179, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 65
+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"
switch (yyn) {
case 1:
-#line 216 "parse.y"
+#line 311 "parse.y"
{ ; ;
break;}
case 2:
-#line 217 "parse.y"
+#line 312 "parse.y"
{ ; ;
break;}
case 3:
-#line 218 "parse.y"
+#line 313 "parse.y"
{ ; ;
break;}
case 4:
-#line 219 "parse.y"
+#line 314 "parse.y"
{ ; ;
break;}
case 5:
-#line 222 "parse.y"
+#line 317 "parse.y"
{
- Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+ Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
nodes = g_list_append(nodes,node);
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 6:
-#line 228 "parse.y"
+#line 323 "parse.y"
{
- Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line);
+ Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 7:
-#line 233 "parse.y"
+#line 329 "parse.y"
{
- Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+ Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
nodes = g_list_append(nodes,node);
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 8:
-#line 239 "parse.y"
+#line 335 "parse.y"
{
- Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line);
+ Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 9:
-#line 246 "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 251 "parse.y"
+case 14:
+#line 364 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
nodes = g_list_append(nodes,class);
;
break;}
-case 11:
-#line 258 "parse.y"
+case 15:
+#line 371 "parse.y"
{
- class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+ class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL);
;
break;}
-case 12:
-#line 263 "parse.y"
+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 13:
-#line 264 "parse.y"
+case 20:
+#line 397 "parse.y"
{ ; ;
break;}
-case 14:
-#line 265 "parse.y"
+case 21:
+#line 400 "parse.y"
{ ; ;
break;}
-case 15:
-#line 266 "parse.y"
+case 22:
+#line 401 "parse.y"
{ ; ;
break;}
-case 16:
-#line 267 "parse.y"
+case 23:
+#line 402 "parse.y"
{ ; ;
break;}
-case 17:
-#line 268 "parse.y"
+case 24:
+#line 403 "parse.y"
{ ; ;
break;}
-case 18:
-#line 271 "parse.y"
+case 25:
+#line 406 "parse.y"
{ the_scope = PUBLIC_SCOPE; ;
break;}
-case 19:
-#line 272 "parse.y"
+case 26:
+#line 407 "parse.y"
{ the_scope = PRIVATE_SCOPE; ;
break;}
-case 20:
-#line 273 "parse.y"
+case 27:
+#line 408 "parse.y"
{ the_scope = PROTECTED_SCOPE; ;
break;}
-case 21:
-#line 276 "parse.y"
+case 28:
+#line 409 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
+ break;}
+case 29:
+#line 412 "parse.y"
{
- push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL);
+ if(strcmp(yyvsp[-1].id, "destroywith")==0) {
+ g_free(yyvsp[-1].id);
+ destructor = yyvsp[0].id;
+ destructor_line = line_no;
+ destructor_simple = TRUE;
+ } else {
+ g_free(yyvsp[-1].id);
+ g_free(yyvsp[0].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 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[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
-case 22:
-#line 279 "parse.y"
+case 39:
+#line 466 "parse.y"
{
- push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id);
+ push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
-case 23:
-#line 283 "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,
+ 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);
} 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,
+ 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_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"));
}
;
break;}
-case 24:
-#line 316 "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)->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 = 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)->str,
+ 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);
+ 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 25:
-#line 344 "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 26:
-#line 345 "parse.y"
+case 46:
+#line 625 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 27:
-#line 348 "parse.y"
+case 47:
+#line 628 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 28:
-#line 351 "parse.y"
+case 48:
+#line 631 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 29:
-#line 357 "parse.y"
-{ ; ;
- break;}
-case 30:
-#line 358 "parse.y"
-{
- Type *type = typestack->data;
- char *oldname = type->name;
- type->name = g_strconcat("const ",oldname,NULL);
- g_free(oldname);
- ;
- break;}
-case 31:
-#line 366 "parse.y"
+case 49:
+#line 637 "parse.y"
{
- Node *node = new_type(0,yyvsp[0].id,NULL);
+ Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
typestack = g_list_prepend(typestack,node);
- ;
+ ;
break;}
-case 32:
-#line 370 "parse.y"
+case 50:
+#line 641 "parse.y"
{
- Node *node = new_type(stars,yyvsp[-1].id,NULL);
- stars = 0;
+ Node *node = new_type(yyvsp[0].id, NULL, NULL);
typestack = g_list_prepend(typestack,node);
- ;
+ ;
break;}
-case 33:
-#line 377 "parse.y"
+case 51:
+#line 648 "parse.y"
{
- yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
-case 34:
-#line 380 "parse.y"
+case 52:
+#line 651 "parse.y"
{
- yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
-case 35:
-#line 383 "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 36:
-#line 386 "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 37:
-#line 389 "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 38:
-#line 392 "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 39:
-#line 395 "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 40:
-#line 398 "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 41:
-#line 401 "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 42:
-#line 404 "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 43:
-#line 408 "parse.y"
+case 61:
+#line 692 "parse.y"
{
yyval.id = yyvsp[0].id;
- ;
+ ;
break;}
-case 44:
-#line 411 "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 45:
-#line 416 "parse.y"
+case 63:
+#line 699 "parse.y"
{
- yyval.id = "long int";
- ;
+ yyval.id = g_strdup(yyvsp[0].id);
+ ;
break;}
-case 46:
-#line 419 "parse.y"
+case 64:
+#line 702 "parse.y"
{
- yyval.id = "long";
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ ;
break;}
-case 47:
-#line 422 "parse.y"
-{
- yyval.id = "short int";
- ;
+case 65:
+#line 707 "parse.y"
+{ yyval.id = "void"; ;
break;}
-case 48:
-#line 425 "parse.y"
-{
- yyval.id = "short";
- ;
+case 66:
+#line 708 "parse.y"
+{ yyval.id = "char"; ;
break;}
-case 49:
-#line 428 "parse.y"
-{
- yyval.id = "int";
- ;
+case 67:
+#line 709 "parse.y"
+{ yyval.id = "short"; ;
break;}
-case 50:
-#line 433 "parse.y"
-{
- yyval.id = "enum ";
- ;
+case 68:
+#line 710 "parse.y"
+{ yyval.id = "int"; ;
break;}
-case 51:
-#line 436 "parse.y"
-{
- yyval.id = "union ";
- ;
+case 69:
+#line 711 "parse.y"
+{ yyval.id = "long"; ;
break;}
-case 52:
-#line 439 "parse.y"
-{
- yyval.id = "struct ";
- ;
+case 70:
+#line 712 "parse.y"
+{ yyval.id = "float"; ;
break;}
-case 53:
-#line 444 "parse.y"
-{ stars++; ;
+case 71:
+#line 713 "parse.y"
+{ yyval.id = "double"; ;
break;}
-case 54:
-#line 445 "parse.y"
-{ stars++; ;
+case 72:
+#line 714 "parse.y"
+{ yyval.id = "signed"; ;
break;}
-case 55:
-#line 449 "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.id = g_strconcat("*", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
+ break;}
+case 80:
+#line 729 "parse.y"
+{
+ 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)
+ else if(strcmp(yyvsp[-1].id, "last")==0)
yyval.sigtype = SIGNAL_LAST_METHOD;
else {
yyerror(_("signal must be 'first' or 'last'"));
g_free(yyvsp[-1].id);
;
break;}
-case 56:
-#line 461 "parse.y"
+case 82:
+#line 748 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 57:
-#line 467 "parse.y"
+case 83:
+#line 754 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 58:
-#line 479 "parse.y"
+case 84:
+#line 766 "parse.y"
{
if(strcmp(yyvsp[-2].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-2].id);
;
break;}
-case 59:
-#line 491 "parse.y"
+case 85:
+#line 778 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 60:
-#line 494 "parse.y"
+case 86:
+#line 781 "parse.y"
{
/* the_scope was default thus public */
the_scope = PUBLIC_SCOPE;
;
break;}
-case 61:
-#line 500 "parse.y"
+case 87:
+#line 787 "parse.y"
{
- gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+ gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
;
break;}
-case 62:
-#line 505 "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 63:
-#line 508 "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 64:
-#line 513 "parse.y"
+case 90:
+#line 800 "parse.y"
{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 65:
-#line 514 "parse.y"
+case 91:
+#line 801 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 66:
-#line 518 "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(the_scope, yyvsp[-7].sigtype,NULL,
- yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
- ccode_line,vararg);
+ yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line,
+ ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 67:
-#line 528 "parse.y"
+case 93:
+#line 821 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
- push_function(the_scope, yyvsp[-7].sigtype,NULL,
- yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
- ccode_line,vararg);
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ free_all_global_state();
+ YYERROR;
+ }
+ push_function(the_scope, yyvsp[-7].sigtype, NULL,
+ yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line,
+ ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 68:
-#line 538 "parse.y"
+case 94:
+#line 837 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
+ free_all_global_state();
+ YYERROR;
+ }
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ free_all_global_state();
YYERROR;
}
push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
- ccode_line,vararg);
+ yyvsp[0].cbuf, yyvsp[-8].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 69:
-#line 548 "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(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
- ccode_line,vararg);
+ yyvsp[0].cbuf, yyvsp[-7].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 70:
-#line 558 "parse.y"
+case 96:
+#line 869 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
- yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
- ccode_line,vararg);
+ yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 71:
-#line 568 "parse.y"
+case 97:
+#line 880 "parse.y"
{
push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
- yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,
- yyvsp[-10].line,ccode_line,
- vararg);
+ yyvsp[-5].id, yyvsp[0].cbuf,
+ yyvsp[-10].line, ccode_line,
+ vararg, NULL);
;
break;}
-case 72:
-#line 574 "parse.y"
+case 98:
+#line 886 "parse.y"
{
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ free_all_global_state();
+ YYERROR;
+ }
push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line,
- vararg);
+ yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+ vararg, NULL);
;
break;}
-case 73:
-#line 579 "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(NO_SCOPE, INIT_METHOD, NULL,
- yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
- ccode_line,FALSE);
- } else if(strcmp(yyvsp[-4].id,"class_init")==0) {
+ yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+ ccode_line, FALSE, NULL);
+ } else if(strcmp(yyvsp[-4].id, "class_init")==0) {
push_init_arg(yyvsp[-2].id,TRUE);
push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
- yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
- ccode_line,FALSE);
+ yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+ ccode_line, FALSE, NULL);
} else {
g_free(yyvsp[-4].id);
g_free(yyvsp[-2].id);
- 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 74:
-#line 600 "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 75:
-#line 601 "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 76:
-#line 605 "parse.y"
-{ yyval.id = NULL; ;
- break;}
-case 77:
-#line 608 "parse.y"
+case 105:
+#line 962 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 78:
-#line 609 "parse.y"
+case 106:
+#line 963 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
if(strcmp(yyvsp[0].id,"self")==0)
- push_self(yyvsp[0].id);
+ push_self(yyvsp[0].id, FALSE);
else {
g_free(yyvsp[0].id);
yyerror(_("parse error"));
}
;
break;}
-case 79:
-#line 620 "parse.y"
+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 108:
+#line 985 "parse.y"
+{
+ vararg = FALSE;
+ has_self = TRUE;
+ if(strcmp(yyvsp[0].id,"self")==0)
+ push_self(yyvsp[0].id, TRUE);
+ else {
+ g_free(yyvsp[0].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+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"));
}
;
break;}
-case 80:
-#line 630 "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 81:
-#line 633 "parse.y"
+case 113:
+#line 1029 "parse.y"
{ vararg = TRUE; ;
break;}
-case 82:
-#line 634 "parse.y"
+case 114:
+#line 1030 "parse.y"
{ vararg = FALSE; ;
break;}
-case 83:
-#line 637 "parse.y"
+case 115:
+#line 1033 "parse.y"
{ ; ;
break;}
-case 84:
-#line 638 "parse.y"
+case 116:
+#line 1034 "parse.y"
{ ; ;
break;}
-case 85:
-#line 641 "parse.y"
+case 117:
+#line 1037 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 86:
-#line 644 "parse.y"
+case 118:
+#line 1040 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 87:
-#line 647 "parse.y"
+case 119:
+#line 1043 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 88:
-#line 655 "parse.y"
+case 120:
+#line 1051 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
;
break;}
-case 89:
-#line 665 "parse.y"
+case 121:
+#line 1061 "parse.y"
{ ; ;
break;}
-case 90:
-#line 666 "parse.y"
+case 122:
+#line 1062 "parse.y"
{ ; ;
break;}
-case 91:
-#line 669 "parse.y"
+case 123:
+#line 1065 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 92:
-#line 682 "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 93:
-#line 686 "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 94:
-#line 690 "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 95:
-#line 694 "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 96:
-#line 698 "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 97:
-#line 702 "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 98:
-#line 708 "parse.y"
+case 130:
+#line 1104 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 99:
-#line 709 "parse.y"
+case 131:
+#line 1105 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 100:
-#line 713 "parse.y"
+case 132:
+#line 1109 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 716 "parse.y"
+#line 1112 "parse.y"