X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2310330e7d4d724bf6641339836be8523f95c916..4f7cfa972623842e64e3a8468696f1f6f40fd202:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 101d2e6..9b63335 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,18 +20,24 @@ #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" @@ -41,13 +47,12 @@ #include #include -#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; @@ -60,8 +65,22 @@ static GList *checks = NULL; static int has_self = FALSE; static int vararg = FALSE; +/* destructor and initializer for variables */ +static char *destructor = NULL; +static int destructor_line = 0; +static gboolean destructor_simple = TRUE; +static char *initializer = NULL; +static int initializer_line = 0; + +static char *onerror = NULL; +static char *defreturn = NULL; + static GList *gtktypes = NULL; +/* this can be a global as we will only do one function at a time + anyway */ +static int the_scope = NO_SCOPE; + void free(void *ptr); int yylex(void); @@ -79,63 +98,138 @@ 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 = pop_type(); } else { - type = (Type *)new_type(0,g_strdup("void")); + type = (Type *)new_type(0,g_strdup("void"),NULL); } - 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)) { + print_error(TRUE, _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match"), line_no); + } + if(g_list_length(gtktypes) > 2) { + GList *li; + for(li = gtktypes->next; li; li = li->next) { + if(strcmp(li->data, "NONE")==0) { + print_error(FALSE, + _("NONE can only appear in an " + "argument list by itself"), + line_no); + } + } + } + if(cbuf) { + char *p; + c_cbuf = p = cbuf->str; + while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + p++; + if(!p || !*p) + c_cbuf = NULL; + } else + c_cbuf = NULL; + + node = new_method(scope, method, type, oid, gtktypes, flags, + id, funcargs, onerror, defreturn, c_cbuf, line_no, + ccode_line, vararg); + + if(cbuf) + g_string_free(cbuf, + /*only free segment if we haven't passed it + above */ + c_cbuf?FALSE:TRUE); gtktypes = NULL; funcargs = NULL; + onerror = NULL; + defreturn = NULL; + class_nodes = g_list_append(class_nodes, node); } static void -push_funcarg(char *name) +free_all_global_state(void) +{ + g_free(onerror); + onerror = NULL; + g_free(defreturn); + defreturn = NULL; + + g_list_foreach(gtktypes, (GFunc)g_free, NULL); + g_list_free(gtktypes); + gtktypes = NULL; + + free_node_list(funcargs); + funcargs = NULL; +} + +static void +push_funcarg(char *name, char *postfix) { Node *node; - Type *type = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + Type *type = pop_type(); + + type->postfix = postfix; - node = new_funcarg(type,name,checks); + node = new_funcarg(type, name, checks); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -153,7 +247,7 @@ push_init_arg(char *name, int is_class) else tn = g_strdup(((Class *)class)->otype); - type = new_type(1,tn); + type = new_type(1,tn,NULL); node = new_funcarg((Type *)type,name,NULL); funcargs = g_list_prepend(funcargs, node); } @@ -164,15 +258,57 @@ push_self(char *id) Node *node; Node *type; GList *ch = NULL; - type = new_type(1,g_strdup(((Class *)class)->otype)); + type = new_type(1,g_strdup(((Class *)class)->otype),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; + char *s; + + for(li = class_nodes; li != NULL; li = li->next) { + Variable *var; + Node *node = li->data; + if(node->type != VARIABLE_NODE) + continue; + var = li->data; + if(strcmp(var->id, id)==0) + return var; + } + + s = g_strdup_printf(_("Variable %s not defined here"), id); + print_error(FALSE, s, line); + + g_assert_not_reached(); + return NULL; +} + +static gboolean +set_return_value(char *type, char *val) +{ + if(strcmp(type, "onerror")==0) { + if(!onerror) { + onerror = val; + return TRUE; + } else + return FALSE; + } else if(strcmp(type, "defreturn")==0) { + if(!defreturn) { + defreturn = val; + return TRUE; + } else + return FALSE; + } + return FALSE; +} + -#line 160 "parse.y" +#line 290 "parse.y" typedef union { char *id; GString *cbuf; @@ -194,26 +330,26 @@ typedef union { -#define YYFINAL 198 +#define YYFINAL 243 #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] : 87) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 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, 41, + 42, 44, 2, 45, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 39, 47, + 40, 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 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 +365,86 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30 + 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, 43, 46, 48, 50, 52, + 54, 56, 58, 60, 62, 64, 67, 71, 74, 78, + 81, 84, 86, 88, 89, 95, 102, 114, 123, 129, + 135, 137, 141, 142, 146, 148, 150, 153, 155, 158, + 161, 164, 166, 169, 172, 174, 176, 178, 180, 183, + 185, 187, 190, 192, 195, 197, 199, 201, 203, 205, + 208, 210, 213, 215, 219, 223, 226, 228, 233, 237, + 239, 242, 244, 255, 267, 277, 287, 296, 308, 317, + 323, 326, 331, 332, 334, 337, 339, 341, 345, 347, + 351, 353, 357, 359, 362, 366, 373, 381, 384, 386, + 388, 391, 394, 398, 402, 406, 410, 412, 415 }; -static const short yyrhs[] = { 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, + 55, 38, 0, 54, 37, 38, 0, 3, 21, 4, + 21, 0, 55, 56, 0, 56, 0, 77, 0, 61, + 0, 62, 0, 39, 0, 29, 0, 30, 0, 31, + 0, 32, 0, 19, 19, 0, 19, 37, 23, 0, + 40, 86, 0, 40, 37, 23, 0, 58, 59, 0, + 59, 58, 0, 59, 0, 58, 0, 0, 57, 66, + 19, 60, 39, 0, 57, 66, 19, 22, 60, 39, + 0, 33, 64, 63, 19, 19, 37, 23, 19, 37, + 23, 39, 0, 33, 64, 63, 19, 19, 37, 23, + 39, 0, 33, 64, 63, 19, 19, 0, 19, 41, + 19, 66, 42, 0, 19, 0, 41, 65, 42, 0, + 0, 19, 43, 65, 0, 19, 0, 67, 0, 5, + 67, 0, 68, 0, 68, 71, 0, 12, 69, 0, + 11, 69, 0, 69, 0, 12, 18, 0, 11, 18, + 0, 18, 0, 17, 0, 16, 0, 19, 0, 70, + 19, 0, 21, 0, 6, 0, 13, 15, 0, 13, + 0, 14, 15, 0, 14, 0, 15, 0, 9, 0, + 8, 0, 7, 0, 44, 71, 0, 44, 0, 19, + 74, 0, 74, 0, 57, 19, 74, 0, 19, 57, + 74, 0, 57, 74, 0, 72, 0, 19, 41, 75, + 42, 0, 75, 45, 19, 0, 19, 0, 37, 23, + 0, 39, 0, 35, 64, 73, 66, 19, 41, 80, + 42, 78, 76, 0, 57, 35, 64, 72, 66, 19, + 41, 80, 42, 78, 76, 0, 34, 57, 66, 19, + 41, 80, 42, 78, 76, 0, 57, 34, 66, 19, + 41, 80, 42, 78, 76, 0, 34, 66, 19, 41, + 80, 42, 78, 76, 0, 36, 41, 21, 42, 66, + 19, 41, 80, 42, 78, 76, 0, 57, 66, 19, + 41, 80, 42, 78, 76, 0, 19, 41, 19, 42, + 76, 0, 19, 79, 0, 19, 79, 19, 79, 0, + 0, 86, 0, 37, 23, 0, 6, 0, 19, 0, + 19, 45, 81, 0, 81, 0, 82, 45, 10, 0, + 82, 0, 82, 45, 83, 0, 83, 0, 66, 19, + 0, 66, 19, 22, 0, 66, 19, 41, 19, 84, + 42, 0, 66, 19, 22, 41, 19, 84, 42, 0, + 84, 85, 0, 85, 0, 19, 0, 46, 86, 0, + 47, 86, 0, 46, 40, 86, 0, 47, 40, 86, + 0, 40, 40, 86, 0, 48, 40, 86, 0, 20, + 0, 49, 20, 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 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 + 308, 309, 310, 311, 314, 320, 326, 332, 338, 344, + 352, 353, 356, 361, 368, 373, 374, 377, 378, 379, + 380, 383, 384, 385, 386, 389, 402, 418, 422, 430, + 431, 432, 433, 434, 440, 443, 447, 482, 510, 580, + 589, 595, 596, 599, 602, 608, 609, 617, 621, 628, + 631, 634, 637, 640, 643, 646, 649, 652, 655, 659, + 662, 667, 670, 673, 676, 679, 684, 687, 690, 695, + 696, 700, 712, 718, 730, 742, 745, 751, 756, 759, + 764, 765, 769, 785, 801, 817, 833, 844, 850, 860, + 881, 892, 911, 917, 918, 924, 925, 936, 946, 949, + 950, 953, 954, 957, 960, 963, 971, 981, 982, 985, + 998, 1002, 1006, 1010, 1014, 1018, 1024, 1025, 1029 }; #endif @@ -304,162 +453,196 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","CLASS", "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED", -"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN", -"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","classcode","thing","scope","destructor","initializer","varoptions", +"variable","argument","argtype","flags","flaglist","type","type1","type2","integer", +"tspecifier","stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode", +"method","returnvals","retcode","funcargs","arglist","arglist1","arg","checklist", +"check","numtok", NULL }; #endif static const short yyr1[] = { 0, - 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, 56, 56, 56, + 56, 57, 57, 57, 57, 58, 58, 59, 59, 60, + 60, 60, 60, 60, 61, 61, 62, 62, 62, 63, + 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 69, 69, 69, 69, 69, 70, 70, 70, 71, + 71, 72, 72, 73, 73, 73, 73, 74, 75, 75, + 76, 76, 77, 77, 77, 77, 77, 77, 77, 77, + 78, 78, 78, 79, 79, 80, 80, 80, 80, 81, + 81, 82, 82, 83, 83, 83, 83, 84, 84, 85, + 85, 85, 85, 85, 85, 85, 86, 86, 86 }; static const short yyr2[] = { 0, - 3, 2, 2, 1, 2, 2, 1, 1, 4, 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, 4, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, + 2, 1, 1, 0, 5, 6, 11, 8, 5, 5, + 1, 3, 0, 3, 1, 1, 2, 1, 2, 2, + 2, 1, 2, 2, 1, 1, 1, 1, 2, 1, + 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, + 1, 2, 1, 3, 3, 2, 1, 4, 3, 1, + 2, 1, 10, 11, 9, 9, 8, 11, 8, 5, + 2, 4, 0, 1, 2, 1, 1, 3, 1, 3, + 1, 3, 1, 2, 3, 6, 7, 2, 1, 1, + 2, 2, 3, 3, 3, 3, 1, 2, 1 }; static const short yydefact[] = { 0, - 0, 7, 8, 0, 4, 0, 0, 5, 6, 3, - 2, 0, 0, 1, 0, 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, 22, + 23, 24, 25, 43, 0, 43, 0, 14, 21, 0, + 17, 0, 19, 20, 18, 15, 0, 0, 0, 0, + 61, 69, 68, 67, 0, 0, 63, 65, 66, 57, + 56, 55, 58, 60, 0, 0, 46, 48, 52, 0, + 0, 0, 13, 16, 0, 43, 0, 0, 45, 0, + 41, 0, 47, 54, 51, 53, 50, 62, 64, 0, + 0, 71, 49, 59, 0, 0, 77, 0, 73, 0, + 0, 0, 34, 0, 0, 42, 0, 0, 0, 0, + 70, 0, 0, 0, 72, 0, 76, 0, 0, 0, + 0, 0, 0, 34, 0, 0, 33, 32, 0, 0, + 82, 90, 44, 0, 39, 0, 61, 58, 0, 0, + 99, 101, 103, 80, 0, 75, 74, 0, 0, 0, + 0, 26, 0, 0, 119, 117, 0, 0, 28, 0, + 30, 31, 35, 81, 0, 0, 0, 0, 104, 93, + 0, 78, 0, 0, 0, 0, 0, 27, 36, 29, + 118, 93, 40, 0, 93, 98, 105, 0, 0, 0, + 100, 102, 79, 0, 0, 93, 0, 0, 0, 38, + 0, 0, 0, 0, 91, 94, 87, 93, 0, 0, + 0, 89, 0, 85, 0, 110, 0, 0, 0, 0, + 0, 109, 95, 0, 0, 93, 86, 93, 0, 0, + 0, 0, 111, 0, 112, 0, 106, 108, 92, 83, + 0, 0, 37, 107, 115, 113, 114, 116, 88, 84, + 0, 0, 0 }; -static const short yydefgoto[] = { 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[] = { 241, + 8, 9, 10, 11, 30, 31, 32, 117, 118, 119, + 33, 34, 72, 39, 70, 129, 57, 58, 59, 60, + 83, 87, 88, 89, 135, 122, 35, 180, 195, 130, + 131, 132, 133, 211, 212, 196 }; -static const short yypact[] = { 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[] = { 158, + 13,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 158, 185, + -26, 44,-32768, 185, 185, 168, 51, 185, 33,-32768, +-32768,-32768,-32768, 43, 138, 43, 46,-32768,-32768, 186, +-32768, 107,-32768,-32768,-32768,-32768, 67, 71, 82, 271, +-32768,-32768,-32768,-32768, 176, 280, 95, 102,-32768,-32768, +-32768,-32768,-32768,-32768, 238, 108,-32768, 86,-32768, 112, + 73, 111,-32768,-32768, 238, 43, 114, 92, 105, 96, + 121, 144,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 145, + 131, 86,-32768,-32768, 147, 154,-32768, 238,-32768, 133, + 161, 177, 152, 41, 71,-32768, 195, 204, 200, 255, +-32768, 207, 239, 246,-32768, 1,-32768, 256, 238, 240, + 1, 238, 8, -10, -5, 255, 155, 272, 257, 274, +-32768,-32768,-32768, 238, 262, 255, 258, 20, 282, 260, +-32768, 259,-32768,-32768, 34,-32768,-32768, 264, 284, 255, + 287,-32768, 285, 268,-32768,-32768, 286, 290,-32768, 269, +-32768,-32768,-32768,-32768, 270, 291, 273, 238, -3, 294, + 221,-32768, 297, 255, 276, 277, 279,-32768,-32768,-32768, +-32768, 294,-32768, -15, 294,-32768, 281, 299, -2, 41, +-32768,-32768,-32768, 283, 255, 294, 255, 41, 289,-32768, + 41, 302, 89, 300, 305,-32768,-32768, 294, 288, 41, + 292,-32768, 304,-32768, 89,-32768, 293, 3, 9, 295, + 35,-32768,-32768, -2, 41, 294,-32768, 294, 298, 49, + 17, 17,-32768, 17,-32768, 17,-32768,-32768,-32768,-32768, + 41, 41,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 328, 329,-32768 }; static const short yypgoto[] = {-32768, - 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 + 52, 45, 322,-32768,-32768, 306, -22, 214, 222, 224, +-32768,-32768,-32768, -20, 245, -24, 301,-32768, 53,-32768, + 261, 250,-32768, 54,-32768, -175,-32768, -165, 130, -114, + 187,-32768, 188, 141, -151, -115 }; -#define YYLAST 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 349 + + +static const short yytable[] = { 149, + 56, 150, 55, 189, 197, 61, 188, 67, 113, 191, + 16, 157, 202, 145, 146, 204, 145, 146, 177, 102, + 200, 145, 146, 190, 217, 166, 142, 145, 146, 115, + 80, 147, 215, 12, 194, 145, 146, 178, 86, 230, + 91, 103, 222, 148, 143, 92, 148, 17, 224, 184, + 231, 148, 232, 206, 15, 239, 240, 148, 18, 228, + 13, -97, 104, 108, 158, 148, 13, 206, 228, 13, + 199, 36, 201, 37, 207, 162, 227, 120, 163, 121, + 208, 209, 210, 38, 139, 68, 62, 141, 207, 69, + 234, 85, 223, 225, 208, 209, 210, 75, 77, 155, + 71, 20, 21, 22, 23, 235, 236, 206, 237, 78, + 238, 40, 41, 42, 43, 44, 79, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 81, 54, 207, 82, + 84, 90, 93, 94, 208, 209, 210, 96, 105, 107, + 65, 66, 40, 41, 42, 43, 44, 95, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 136, 54, 137, + 1, 97, 98, 99, 105, 102, 20, 21, 22, 23, + 113, 100, 106, 114, 109, 20, 21, 22, 23, 110, + 2, 3, 4, 5, 6, 7, 19, 103, 47, 48, + 49, 115, 116, 74, 115, 111, 20, 21, 22, 23, + 24, 25, 26, 27, 19, 28, 29, 2, 3, 4, + 5, 6, 7, 124, 20, 21, 22, 23, 24, 25, + 26, 27, 125, 63, 29, 40, 41, 42, 43, 44, + 181, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 126, 54, 40, 41, 42, 43, 44, 103, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 134, 54, 40, + 127, 42, 43, 44, 102, 45, 46, 47, 48, 49, + 50, 51, 52, 128, 138, 54, 41, 42, 43, 44, + 140, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 113, 54, 47, 48, 49, 153, 154, 76, 156, -96, + 159, 160, 165, 161, 164, 167, 169, 168, 170, 171, + 172, 173, 179, 174, 175, 183, 185, 193, 186, 187, + 205, 192, 213, 214, 198, 203, 219, 242, 243, 216, + 14, 152, 221, 218, 226, 64, 233, 144, 151, 123, + 73, 112, 101, 229, 176, 220, 0, 0, 182 }; -static const short yycheck[] = { 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[] = { 115, + 25, 116, 25, 19, 180, 26, 172, 32, 19, 175, + 37, 126, 188, 19, 20, 191, 19, 20, 22, 19, + 186, 19, 20, 39, 200, 140, 19, 19, 20, 40, + 55, 37, 198, 21, 37, 19, 20, 41, 61, 215, + 65, 41, 40, 49, 37, 66, 49, 4, 40, 164, + 216, 49, 218, 19, 10, 231, 232, 49, 14, 211, + 9, 42, 85, 88, 45, 49, 15, 19, 220, 18, + 185, 21, 187, 41, 40, 42, 42, 37, 45, 39, + 46, 47, 48, 41, 109, 19, 41, 112, 40, 19, + 42, 19, 208, 209, 46, 47, 48, 45, 46, 124, + 19, 29, 30, 31, 32, 221, 222, 19, 224, 15, + 226, 5, 6, 7, 8, 9, 15, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 19, 21, 40, 44, + 19, 21, 19, 42, 46, 47, 48, 42, 85, 86, + 34, 35, 5, 6, 7, 8, 9, 43, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 104, 21, 106, + 3, 41, 19, 19, 111, 19, 29, 30, 31, 32, + 19, 41, 19, 22, 42, 29, 30, 31, 32, 19, + 23, 24, 25, 26, 27, 28, 19, 41, 13, 14, + 15, 40, 41, 18, 40, 19, 29, 30, 31, 32, + 33, 34, 35, 36, 19, 38, 39, 23, 24, 25, + 26, 27, 28, 19, 29, 30, 31, 32, 33, 34, + 35, 36, 19, 38, 39, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 41, 21, 5, 6, 7, 8, 9, 41, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 19, 21, 6, 7, 8, 9, + 41, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 19, 21, 13, 14, 15, 39, 23, 18, 37, 42, + 19, 42, 19, 45, 41, 19, 39, 23, 23, 20, + 42, 42, 19, 23, 42, 19, 41, 19, 42, 41, + 19, 41, 23, 19, 42, 37, 23, 0, 0, 42, + 9, 118, 40, 42, 40, 30, 39, 114, 117, 95, + 40, 92, 82, 214, 158, 205, -1, -1, 161 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1005,119 +1188,254 @@ yyreduce: switch (yyn) { case 1: -#line 179 "parse.y" +#line 308 "parse.y" { ; ; break;} case 2: -#line 180 "parse.y" +#line 309 "parse.y" { ; ; break;} case 3: -#line 181 "parse.y" +#line 310 "parse.y" { ; ; break;} case 4: -#line 182 "parse.y" +#line 311 "parse.y" { ; ; break;} case 5: -#line 185 "parse.y" +#line 314 "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 320 "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 326 "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 332 "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 338 "parse.y" +{ + Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 10: +#line 344 "parse.y" +{ + Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 11: +#line 352 "parse.y" +{ ; ; + break;} +case 12: +#line 353 "parse.y" +{ ; ; + break;} +case 13: +#line 356 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 10: -#line 210 "parse.y" +case 14: +#line 361 "parse.y" +{ + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); + ; + break;} +case 15: +#line 368 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} -case 11: -#line 215 "parse.y" +case 16: +#line 373 "parse.y" { ; ; break;} -case 12: -#line 216 "parse.y" +case 17: +#line 374 "parse.y" { ; ; break;} -case 13: -#line 217 "parse.y" +case 18: +#line 377 "parse.y" { ; ; break;} -case 14: -#line 218 "parse.y" +case 19: +#line 378 "parse.y" { ; ; break;} -case 15: -#line 219 "parse.y" +case 20: +#line 379 "parse.y" { ; ; break;} -case 16: -#line 220 "parse.y" +case 21: +#line 380 "parse.y" { ; ; break;} -case 17: -#line 223 "parse.y" +case 22: +#line 383 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 23: +#line 384 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 24: +#line 385 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 25: +#line 386 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 26: +#line 389 "parse.y" { - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); + if(strcmp(yyvsp[-1].id, "destroywith")==0) { + g_free(yyvsp[-1].id); + destructor = yyvsp[0].id; + destructor_line = line_no; + destructor_simple = TRUE; + } else { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 27: +#line 402 "parse.y" +{ + if(strcmp(yyvsp[-2].id, "destroy")==0) { + g_free(yyvsp[-2].id); + destructor = (yyvsp[0].cbuf)->str; + g_string_free(yyvsp[0].cbuf, FALSE); + destructor_line = ccode_line; + destructor_simple = FALSE; + } else { + g_free(yyvsp[-2].id); + g_string_free(yyvsp[0].cbuf, TRUE); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 28: +#line 418 "parse.y" +{ + initializer = yyvsp[0].id; + initializer_line = ccode_line; + ; + break;} +case 29: +#line 422 "parse.y" +{ + initializer = (yyvsp[0].cbuf)->str; + initializer_line = ccode_line; + g_string_free(yyvsp[0].cbuf, FALSE); + ; + break;} +case 30: +#line 430 "parse.y" +{ ; ; + break;} +case 31: +#line 431 "parse.y" +{ ; ; + break;} +case 32: +#line 432 "parse.y" +{ destructor = NULL; ; + break;} +case 33: +#line 433 "parse.y" +{ initializer = NULL; ; + break;} +case 34: +#line 434 "parse.y" +{ + destructor = NULL; + initializer = NULL; + ; + break;} +case 35: +#line 440 "parse.y" +{ + push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 18: -#line 226 "parse.y" +case 36: +#line 443 "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 37: +#line 447 "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); @@ -1130,22 +1448,26 @@ case 19: } ; break;} -case 20: -#line 259 "parse.y" +case 38: +#line 482 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; + Type *type = pop_type(); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id, - yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0, - yyvsp[-7].line); + node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + NULL,0, yyvsp[-7].line); + g_string_free(yyvsp[-1].cbuf,FALSE); class_nodes = g_list_append(class_nodes,node); } else if(strcmp(yyvsp[-3].id,"set")==0) { Node *node; + Type *type = pop_type(); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id, - NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line, - yyvsp[-7].line); + node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id, + NULL,0,(yyvsp[-1].cbuf)->str, + yyvsp[-2].line, yyvsp[-7].line); + g_string_free(yyvsp[-1].cbuf,FALSE); class_nodes = g_list_append(class_nodes,node); } else { g_free(yyvsp[-3].id); g_free(yyvsp[-5].id); @@ -1157,32 +1479,122 @@ case 20: } ; break;} -case 21: -#line 285 "parse.y" +case 39: +#line 510 "parse.y" +{ + Node *node; + char *get, *set = NULL; + Variable *var; + Type *type; + char *root; + + if(strcmp(yyvsp[0].id, "link")!=0 && + strcmp(yyvsp[0].id, "stringlink")!=0 && + strcmp(yyvsp[0].id, "objectlink")!=0) { + g_free(yyvsp[0].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); + g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL); + yyerror(_("parse error")); + YYERROR; + } + + type = pop_type(); + + var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); + if(var->scope == PRIVATE_SCOPE) + root = "self->_priv"; + else if(var->scope == CLASS_SCOPE) + root = "SELF_CLASS(GTK_OBJECT(self)->klass)"; + else + root = "self"; + + if(strcmp(yyvsp[0].id, "link")==0) { + set = g_strdup_printf("%s->%s = ARG;", + root, yyvsp[-1].id); + } else if(strcmp(yyvsp[0].id, "stringlink")==0) { + set = g_strdup_printf("g_free(%s->%s); " + "%s->%s = g_strdup(ARG);", + root, yyvsp[-1].id, + root, yyvsp[-1].id); + } else if(strcmp(yyvsp[0].id, "objectlink")==0) { + set = g_strdup_printf( + "if(%s->%s) " + "gtk_object_unref(GTK_OBJECT(%s->%s)); " + "%s->%s = ARG; " + "if(%s->%s) " + "gtk_object_ref(GTK_OBJECT(%s->%s));", + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id); + } else { + g_assert_not_reached(); + } + + /* get is the same for everything */ + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); + + g_free(yyvsp[0].id); + + + if(!type) + type = copy_type(var->vtype); + + node = new_argument(yyvsp[-2].id, type, yyvsp[-3].list, + yyvsp[-1].id, get, yyvsp[-4].line, + set, yyvsp[-4].line, yyvsp[-4].line); + class_nodes = g_list_append(class_nodes,node); + ; + break;} +case 40: +#line 580 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"type")!=0) { + g_free(yyvsp[-4].id); + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + yyval.id = yyvsp[-4].id; + ; + break;} +case 41: +#line 589 "parse.y" +{ + yyval.id = yyvsp[0].id; + typestack = g_list_prepend(typestack,NULL); + ; + break;} +case 42: +#line 595 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 286 "parse.y" +case 43: +#line 596 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 289 "parse.y" +case 44: +#line 599 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 292 "parse.y" +case 45: +#line 602 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 298 "parse.y" +case 46: +#line 608 "parse.y" { ; ; break;} -case 26: -#line 299 "parse.y" +case 47: +#line 609 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1190,157 +1602,157 @@ case 26: g_free(oldname); ; break;} -case 27: -#line 307 "parse.y" +case 48: +#line 617 "parse.y" { - Node *node = new_type(0,yyvsp[0].id); + Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} -case 28: -#line 311 "parse.y" +case 49: +#line 621 "parse.y" { - Node *node = new_type(stars,yyvsp[-1].id); + Node *node = new_type(stars,yyvsp[-1].id,NULL); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 29: -#line 318 "parse.y" +case 50: +#line 628 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 30: -#line 321 "parse.y" +case 51: +#line 631 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 31: -#line 324 "parse.y" +case 52: +#line 634 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 32: -#line 327 "parse.y" +case 53: +#line 637 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 33: -#line 330 "parse.y" +case 54: +#line 640 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 34: -#line 333 "parse.y" +case 55: +#line 643 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 35: -#line 336 "parse.y" +case 56: +#line 646 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 36: -#line 339 "parse.y" +case 57: +#line 649 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 37: -#line 342 "parse.y" +case 58: +#line 652 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 345 "parse.y" +case 59: +#line 655 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 39: -#line 349 "parse.y" +case 60: +#line 659 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 40: -#line 352 "parse.y" +case 61: +#line 662 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 41: -#line 357 "parse.y" +case 62: +#line 667 "parse.y" { yyval.id = "long int"; ; break;} -case 42: -#line 360 "parse.y" +case 63: +#line 670 "parse.y" { yyval.id = "long"; ; break;} -case 43: -#line 363 "parse.y" +case 64: +#line 673 "parse.y" { yyval.id = "short int"; ; break;} -case 44: -#line 366 "parse.y" +case 65: +#line 676 "parse.y" { yyval.id = "short"; ; break;} -case 45: -#line 369 "parse.y" +case 66: +#line 679 "parse.y" { yyval.id = "int"; ; break;} -case 46: -#line 374 "parse.y" +case 67: +#line 684 "parse.y" { yyval.id = "enum "; ; break;} -case 47: -#line 377 "parse.y" +case 68: +#line 687 "parse.y" { yyval.id = "union "; ; break;} -case 48: -#line 380 "parse.y" +case 69: +#line 690 "parse.y" { yyval.id = "struct "; ; break;} -case 49: -#line 385 "parse.y" +case 70: +#line 695 "parse.y" { stars++; ; break;} -case 50: -#line 386 "parse.y" +case 71: +#line 696 "parse.y" { stars++; ; break;} -case 51: -#line 389 "parse.y" +case 72: +#line 700 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) - yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + if(strcmp(yyvsp[-1].id, "first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id, "last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); g_free(yyvsp[-1].id); @@ -1349,29 +1761,14 @@ case 51: g_free(yyvsp[-1].id); ; break;} -case 52: -#line 401 "parse.y" -{ - if(strcmp(yyvsp[-2].id,"first")==0) - yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-2].id,"last")==0) - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-2].id); - YYERROR; - } - g_free(yyvsp[-2].id); - ; - break;} -case 53: -#line 413 "parse.y" +case 73: +#line 712 "parse.y" { - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 54: -#line 416 "parse.y" +case 74: +#line 718 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1385,115 +1782,185 @@ case 54: g_free(yyvsp[-1].id); ; break;} -case 55: -#line 428 "parse.y" +case 75: +#line 730 "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 76: +#line 742 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 433 "parse.y" +case 77: +#line 745 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + /* the_scope was default thus public */ + the_scope = PUBLIC_SCOPE; + ; + break;} +case 78: +#line 751 "parse.y" +{ + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 57: -#line 438 "parse.y" +case 79: +#line 756 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 58: -#line 441 "parse.y" +case 80: +#line 759 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 59: -#line 446 "parse.y" -{ yyval.cbuf=yyvsp[0].cbuf; ; +case 81: +#line 764 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 60: -#line 447 "parse.y" +case 82: +#line 765 "parse.y" { yyval.cbuf = NULL; ; break;} -case 61: -#line 451 "parse.y" +case 83: +#line 769 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } - push_function(yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 62: -#line 461 "parse.y" +case 84: +#line 785 "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 85: +#line 801 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); YYERROR; } - push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[0].cbuf, yyvsp[-8].line, + ccode_line, vararg, NULL); ; break;} -case 63: -#line 471 "parse.y" +case 86: +#line 817 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } - push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + 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[-7].line, + ccode_line, vararg, NULL); ; break;} -case 64: -#line 481 "parse.y" +case 87: +#line 833 "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 88: +#line 844 "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 89: +#line 850 "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 90: +#line 860 "parse.y" { - if(strcmp(yyvsp[-4].id,"init")==0) { + if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); - push_function(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); @@ -1503,31 +1970,66 @@ case 67: } ; break;} -case 68: -#line 518 "parse.y" -{ yyval.id = yyvsp[0].id; ; +case 91: +#line 881 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-1].id); + ; break;} -case 69: -#line 519 "parse.y" +case 92: +#line 892 "parse.y" { - yyval.id = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf,FALSE); + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + onerror = defreturn = NULL; + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-3].id); + g_free(yyvsp[-1].id); + ; + break;} +case 93: +#line 911 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; ; break;} -case 70: -#line 523 "parse.y" -{ ; ; +case 94: +#line 917 "parse.y" +{ yyval.id = yyvsp[0].id; ; break;} -case 71: -#line 524 "parse.y" -{ yyval.id = NULL; ; +case 95: +#line 918 "parse.y" +{ + yyval.id = (yyvsp[1].cbuf)->str; + g_string_free(yyvsp[1].cbuf, FALSE); + ; break;} -case 72: -#line 527 "parse.y" +case 96: +#line 924 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 73: -#line 528 "parse.y" +case 97: +#line 925 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1540,8 +2042,8 @@ case 73: } ; break;} -case 74: -#line 539 "parse.y" +case 98: +#line 936 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1553,53 +2055,70 @@ case 74: } ; break;} -case 75: -#line 549 "parse.y" +case 99: +#line 946 "parse.y" { has_self = FALSE; ; break;} -case 76: -#line 552 "parse.y" +case 100: +#line 949 "parse.y" { vararg = TRUE; ; break;} -case 77: -#line 553 "parse.y" +case 101: +#line 950 "parse.y" { vararg = FALSE; ; break;} -case 78: -#line 556 "parse.y" +case 102: +#line 953 "parse.y" { ; ; break;} -case 79: -#line 557 "parse.y" +case 103: +#line 954 "parse.y" { ; ; break;} -case 80: -#line 560 "parse.y" +case 104: +#line 957 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 81: -#line 563 "parse.y" +case 105: +#line 960 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 106: +#line 963 "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 107: +#line 971 "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 108: +#line 981 "parse.y" { ; ; break;} -case 83: -#line 574 "parse.y" +case 109: +#line 982 "parse.y" { ; ; break;} -case 84: -#line 577 "parse.y" +case 110: +#line 985 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1614,61 +2133,61 @@ case 84: g_free(yyvsp[0].id); ; break;} -case 85: -#line 590 "parse.y" +case 111: +#line 998 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 594 "parse.y" +case 112: +#line 1002 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 598 "parse.y" +case 113: +#line 1006 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 88: -#line 602 "parse.y" +case 114: +#line 1010 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 89: -#line 606 "parse.y" +case 115: +#line 1014 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 90: -#line 610 "parse.y" +case 116: +#line 1018 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 91: -#line 616 "parse.y" +case 117: +#line 1024 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 92: -#line 617 "parse.y" +case 118: +#line 1025 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 93: -#line 621 "parse.y" +case 119: +#line 1029 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1893,5 +2412,5 @@ yyerrhandle: } return 1; } -#line 624 "parse.y" +#line 1032 "parse.y"