X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2310330e7d4d724bf6641339836be8523f95c916..6d0fe9d5f8c513045bf064ea256c822beac19037:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 101d2e6..1d226c4 100644 --- a/src/parse.c +++ b/src/parse.c @@ -24,14 +24,15 @@ #define TOKEN 274 #define NUMBER 275 #define TYPETOKEN 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 ARRAY_DIM 277 +#define CCODE 278 +#define HCODE 279 +#define PUBLIC 280 +#define PRIVATE 281 +#define ARGUMENT 282 +#define VIRTUAL 283 +#define SIGNAL 284 +#define OVERRIDE 285 #line 21 "parse.y" @@ -96,11 +97,13 @@ yyerror(char *str) } static void -push_variable(char *name, int scope, int line_no) +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->postfix = postfix; var = new_variable(scope,type,name,line_no); class_nodes = g_list_append(class_nodes, var); @@ -117,9 +120,23 @@ push_function(int scope, char *oid, char *id, char *onerror, type = typestack->data; typestack = g_list_remove(typestack,typestack->data); } else { - type = (Type *)new_type(0,g_strdup("void")); + type = (Type *)new_type(0,g_strdup("void"),NULL); } + /* a complicated and ugly test to figure out if we have + the wrong number of types for a signal */ + if((scope == SIGNAL_FIRST_METHOD || + scope == SIGNAL_LAST_METHOD || + scope == PRIVATE_SIGNAL_FIRST_METHOD || + scope == PRIVATE_SIGNAL_LAST_METHOD) && + 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); + } node = new_method(scope,type,oid,gtktypes,id,funcargs, onerror,cbuf,line_no,ccode_line,vararg); gtktypes = NULL; @@ -129,11 +146,13 @@ push_function(int scope, char *oid, char *id, char *onerror, } static void -push_funcarg(char *name) +push_funcarg(char *name, char *postfix) { Node *node; Type *type = typestack->data; typestack = g_list_remove(typestack,typestack->data); + + type->postfix = postfix; node = new_funcarg(type,name,checks); checks = NULL; @@ -153,7 +172,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,7 +183,7 @@ 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); @@ -172,7 +191,7 @@ push_self(char *id) } -#line 160 "parse.y" +#line 178 "parse.y" typedef union { char *id; GString *cbuf; @@ -194,26 +213,26 @@ typedef union { -#define YYFINAL 198 +#define YYFINAL 216 #define YYFLAG -32768 -#define YYNTBASE 45 +#define YYNTBASE 46 -#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 75) 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, 44, 2, 2, 2, 2, 2, 2, 35, + 36, 38, 2, 39, 45, 2, 2, 2, 41, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 34, 43, + 40, 42, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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, 32, 37, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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 +248,80 @@ 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 }; #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 + 31, 36, 39, 42, 45, 47, 49, 51, 56, 62, + 67, 73, 85, 94, 98, 99, 103, 105, 107, 110, + 112, 115, 118, 121, 123, 126, 129, 131, 133, 135, + 137, 140, 142, 144, 147, 149, 152, 154, 156, 158, + 160, 162, 165, 167, 168, 170, 174, 178, 181, 184, + 188, 192, 195, 197, 202, 206, 208, 211, 213, 223, + 233, 243, 256, 266, 276, 282, 285, 289, 292, 293, + 295, 297, 301, 303, 307, 309, 313, 315, 318, 322, + 329, 337, 340, 342, 344, 347, 350, 354, 358, 362, + 366, 368, 371 }; -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[] = { 47, + 48, 47, 0, 48, 47, 0, 47, 48, 0, 48, + 0, 47, 24, 0, 47, 25, 0, 24, 0, 25, + 0, 49, 32, 50, 33, 0, 49, 32, 33, 0, + 3, 22, 4, 22, 0, 50, 66, 0, 50, 51, + 0, 50, 52, 0, 66, 0, 51, 0, 52, 0, + 26, 55, 20, 34, 0, 26, 55, 20, 23, 34, + 0, 27, 55, 20, 34, 0, 27, 55, 20, 23, + 34, 0, 28, 53, 20, 20, 20, 32, 24, 20, + 32, 24, 34, 0, 28, 53, 20, 20, 20, 32, + 24, 34, 0, 35, 54, 36, 0, 0, 20, 37, + 54, 0, 20, 0, 56, 0, 5, 56, 0, 57, + 0, 57, 60, 0, 12, 58, 0, 11, 58, 0, + 58, 0, 12, 18, 0, 11, 18, 0, 18, 0, + 17, 0, 16, 0, 20, 0, 59, 20, 0, 22, + 0, 6, 0, 13, 15, 0, 13, 0, 14, 15, + 0, 14, 0, 15, 0, 9, 0, 8, 0, 7, + 0, 38, 60, 0, 38, 0, 0, 26, 0, 27, + 20, 63, 0, 20, 27, 63, 0, 27, 63, 0, + 20, 63, 0, 26, 20, 63, 0, 20, 26, 63, + 0, 26, 63, 0, 63, 0, 20, 35, 64, 36, + 0, 64, 39, 20, 0, 20, 0, 32, 24, 0, + 34, 0, 30, 62, 55, 20, 35, 68, 36, 67, + 65, 0, 29, 27, 55, 20, 35, 68, 36, 67, + 65, 0, 29, 61, 55, 20, 35, 68, 36, 67, + 65, 0, 31, 35, 22, 36, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 26, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 27, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 20, 35, 20, 36, 65, + 0, 19, 74, 0, 19, 32, 24, 0, 40, 41, + 0, 0, 6, 0, 20, 0, 20, 39, 69, 0, + 69, 0, 70, 39, 10, 0, 70, 0, 70, 39, + 71, 0, 71, 0, 55, 20, 0, 55, 20, 23, + 0, 55, 20, 35, 20, 72, 36, 0, 55, 20, + 23, 35, 20, 72, 36, 0, 72, 73, 0, 73, + 0, 20, 0, 42, 74, 0, 43, 74, 0, 42, + 40, 74, 0, 43, 40, 74, 0, 40, 40, 74, + 0, 44, 40, 74, 0, 21, 0, 45, 21, 0, + 20, 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 + 197, 198, 199, 200, 203, 207, 211, 215, 221, 226, + 233, 238, 239, 240, 241, 242, 243, 246, 249, 252, + 255, 259, 288, 314, 315, 318, 321, 327, 328, 336, + 340, 347, 350, 353, 356, 359, 362, 365, 368, 371, + 374, 378, 381, 386, 389, 392, 395, 398, 403, 406, + 409, 414, 415, 418, 419, 422, 434, 446, 449, 461, + 473, 485, 488, 493, 498, 501, 506, 507, 511, 521, + 531, 541, 547, 552, 557, 578, 579, 583, 584, 587, + 588, 599, 609, 612, 613, 616, 617, 620, 623, 626, + 634, 644, 645, 648, 661, 665, 669, 673, 677, 681, + 687, 688, 692 }; #endif @@ -305,161 +331,169 @@ 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 +"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL", +"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'", +"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable", +"argument","argflags","flaglist","type","type1","type2","integer","tspecifier", +"stars","optpublic","fullsigtype","sigtype","tokenlist","codenocode","method", +"onerror","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 + 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, + 49, 50, 50, 50, 50, 50, 50, 51, 51, 51, + 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, + 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 58, 58, 58, 58, 58, 59, 59, + 59, 60, 60, 61, 61, 62, 62, 62, 62, 62, + 62, 62, 62, 63, 64, 64, 65, 65, 66, 66, + 66, 66, 66, 66, 66, 67, 67, 67, 67, 68, + 68, 68, 68, 69, 69, 70, 70, 71, 71, 71, + 71, 72, 72, 73, 73, 73, 73, 73, 73, 73, + 74, 74, 74 }; 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, + 3, 2, 2, 1, 2, 2, 1, 1, 4, 3, + 4, 2, 2, 2, 1, 1, 1, 4, 5, 4, + 5, 11, 8, 3, 0, 3, 1, 1, 2, 1, + 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, + 2, 1, 1, 2, 1, 2, 1, 1, 1, 1, + 1, 2, 1, 0, 1, 3, 3, 2, 2, 3, + 3, 2, 1, 4, 3, 1, 2, 1, 9, 9, + 9, 12, 9, 9, 5, 2, 3, 2, 0, 1, + 1, 3, 1, 3, 1, 3, 1, 2, 3, 6, + 7, 2, 1, 1, 2, 2, 3, 3, 3, 3, 1, 2, 1 }; 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 + 2, 0, 0, 1, 0, 0, 0, 25, 54, 0, + 0, 10, 0, 16, 17, 15, 11, 0, 0, 43, + 51, 50, 49, 0, 0, 45, 47, 48, 39, 38, + 37, 40, 42, 0, 28, 30, 34, 0, 0, 0, + 0, 55, 0, 0, 0, 0, 0, 0, 63, 0, + 9, 13, 14, 12, 0, 29, 36, 33, 35, 32, + 44, 46, 0, 53, 31, 41, 0, 27, 0, 0, + 0, 0, 0, 0, 0, 0, 59, 0, 62, 0, + 58, 0, 0, 0, 0, 18, 0, 52, 0, 20, + 0, 0, 24, 0, 0, 0, 61, 57, 66, 0, + 60, 56, 0, 0, 0, 68, 75, 19, 43, 40, + 0, 0, 83, 85, 87, 21, 0, 26, 0, 0, + 0, 64, 0, 0, 0, 67, 0, 88, 79, 0, + 79, 0, 0, 0, 65, 0, 0, 82, 89, 0, + 0, 0, 0, 84, 86, 0, 0, 79, 79, 79, + 0, 0, 0, 103, 101, 0, 0, 76, 78, 0, + 0, 0, 23, 0, 0, 0, 0, 0, 94, 0, + 0, 0, 0, 0, 93, 77, 102, 73, 74, 0, + 70, 71, 69, 79, 0, 0, 0, 95, 0, 96, + 0, 90, 92, 0, 0, 91, 99, 97, 98, 100, + 22, 0, 72, 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[] = { 214, + 4, 5, 6, 23, 24, 25, 51, 79, 121, 45, + 46, 47, 48, 75, 54, 58, 59, 110, 117, 26, + 153, 122, 123, 124, 125, 184, 185, 168 }; -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[] = { 43, + 1,-32768,-32768, 56, 28, 39, 72,-32768,-32768, 28, + 177, 152, 69, 177, 61, 118, 118, 68, 181, 66, + 84,-32768, 164,-32768,-32768,-32768,-32768, 81, 153,-32768, +-32768,-32768,-32768, 185, 191, 106, 113,-32768,-32768,-32768, +-32768,-32768,-32768, 117,-32768, 101,-32768, 126, 135, 137, + 143,-32768, 118, 118, 62, 156, 169, 118,-32768, 174, +-32768,-32768,-32768,-32768, 178,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 13, 101,-32768,-32768, 60, 175, 179, 193, + 196, 197, 183, 199, 199, 200,-32768, 34,-32768, 34, +-32768, 201, 186, 26, 189,-32768, 136,-32768, 190,-32768, + 136, 137,-32768, 205, 192, 194,-32768,-32768,-32768, 51, +-32768,-32768, 195, 118, 202,-32768,-32768,-32768, 198, 138, + 208, 203,-32768, 204,-32768,-32768, 206,-32768, 209, 136, + 136,-32768, 211, 136, 212,-32768, 118, -19, -6, 100, + -6, 213, 210, 214,-32768, 215, 217,-32768, 218, 216, + -15, 207, 222,-32768,-32768, 223, -5, -6, -6, -6, + 136, 220, 35,-32768,-32768, 221, 226,-32768,-32768, 225, + 232, 227,-32768, 26, 26, 26, 224, 35,-32768, 228, + -12, 4, 229, 21,-32768,-32768,-32768,-32768,-32768, 233, +-32768,-32768,-32768, -6, 30, 6, 6,-32768, 6,-32768, + 6,-32768,-32768, 230, 231,-32768,-32768,-32768,-32768,-32768, +-32768, 234,-32768, 235, 238,-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 + 9, 240,-32768,-32768, 239, 242,-32768, 131, -16, 237, +-32768, 176,-32768, 187,-32768,-32768, -45,-32768, 12, 244, + -138, -99, 133,-32768, 132, 93, -177, -97 }; -#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 272 + + +static const short yytable[] = { 44, + 49, 127, 156, 149, 164, 165, 203, 164, 165, 87, + 89, 91, 151, 11, 172, 150, 166, 203, 14, 174, + 175, 176, 7, 164, 165, 164, 165, 197, 173, 167, + 143, 144, 167, 152, 146, 95, 81, 82, 107, 108, + 179, 92, 111, 199, 112, 1, 96, 97, 167, 179, + 167, 2, 3, 83, 179, 205, 202, 115, 1, 116, + 180, 177, 181, 182, 183, 206, 2, 3, 86, 180, + 12, 181, 182, 183, 180, 13, 181, 182, 183, 8, + 9, 83, 99, 198, 200, 55, 132, 84, 85, 133, + 27, 56, 57, 100, 101, 28, 86, 135, 207, 208, + 65, 209, 50, 210, 29, 30, 31, 32, 33, 154, + 34, 35, 36, 37, 38, 39, 40, 41, 60, 42, + 71, 43, 29, 30, 31, 32, 33, 72, 34, 35, + 36, 37, 38, 39, 40, 41, 73, 42, 74, 43, + 29, 119, 31, 32, 33, 76, 34, 35, 36, 37, + 38, 39, 40, 41, 77, 120, 78, 43, 30, 31, + 32, 33, 80, 34, 35, 36, 37, 38, 39, 40, + 41, 15, 42, -81, 43, 88, 137, 16, 17, 18, + 19, 20, 21, 15, 22, 191, 192, 193, 90, 16, + 17, 18, 19, 20, 21, 93, 61, 36, 37, 38, + 8, 9, 67, 36, 37, 38, 52, 53, 69, 68, + 70, 102, 104, 94, 103, 105, 106, 86, 83, 109, + 113, 114, 118, 126, 129, 136, 130, 138, 131, 134, + 145, 147, 128, -80, 215, 163, 157, 216, 139, 178, + 142, 141, 140, 10, 186, 158, 187, 169, 188, 159, + 160, 161, 162, 170, 171, 189, 204, 213, 190, 194, + 98, 62, 212, 211, 63, 66, 64, 196, 201, 148, + 195, 155 }; 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 + 17, 101, 141, 23, 20, 21, 184, 20, 21, 55, + 56, 57, 19, 5, 20, 35, 32, 195, 10, 158, + 159, 160, 22, 20, 21, 20, 21, 40, 34, 45, + 130, 131, 45, 40, 134, 23, 53, 54, 84, 85, + 20, 58, 88, 40, 90, 3, 34, 35, 45, 20, + 45, 24, 25, 20, 20, 194, 36, 32, 3, 34, + 40, 161, 42, 43, 44, 36, 24, 25, 35, 40, + 32, 42, 43, 44, 40, 4, 42, 43, 44, 24, + 25, 20, 23, 181, 182, 20, 36, 26, 27, 39, + 22, 26, 27, 34, 35, 35, 35, 114, 196, 197, + 20, 199, 35, 201, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 35, 20, + 15, 22, 5, 6, 7, 8, 9, 15, 11, 12, + 13, 14, 15, 16, 17, 18, 20, 20, 38, 22, + 5, 6, 7, 8, 9, 20, 11, 12, 13, 14, + 15, 16, 17, 18, 20, 20, 20, 22, 6, 7, + 8, 9, 20, 11, 12, 13, 14, 15, 16, 17, + 18, 20, 20, 36, 22, 20, 39, 26, 27, 28, + 29, 30, 31, 20, 33, 174, 175, 176, 20, 26, + 27, 28, 29, 30, 31, 22, 33, 13, 14, 15, + 24, 25, 18, 13, 14, 15, 26, 27, 18, 34, + 35, 37, 20, 36, 36, 20, 20, 35, 20, 20, + 20, 36, 34, 34, 20, 24, 35, 20, 35, 35, + 20, 20, 102, 36, 0, 20, 24, 0, 36, 20, + 32, 36, 39, 4, 24, 36, 21, 41, 24, 36, + 36, 35, 35, 32, 32, 24, 24, 24, 32, 36, + 74, 23, 32, 34, 23, 29, 23, 40, 40, 137, + 178, 140 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1005,51 +1039,51 @@ yyreduce: switch (yyn) { case 1: -#line 179 "parse.y" +#line 197 "parse.y" { ; ; break;} case 2: -#line 180 "parse.y" +#line 198 "parse.y" { ; ; break;} case 3: -#line 181 "parse.y" +#line 199 "parse.y" { ; ; break;} case 4: -#line 182 "parse.y" +#line 200 "parse.y" { ; ; break;} case 5: -#line 185 "parse.y" +#line 203 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 6: -#line 189 "parse.y" +#line 207 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 7: -#line 193 "parse.y" +#line 211 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 8: -#line 197 "parse.y" +#line 215 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 9: -#line 203 "parse.y" +#line 221 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1057,49 +1091,69 @@ case 9: ; break;} case 10: -#line 210 "parse.y" +#line 226 "parse.y" { - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); ; break;} case 11: -#line 215 "parse.y" -{ ; ; +#line 233 "parse.y" +{ + class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + ; break;} case 12: -#line 216 "parse.y" +#line 238 "parse.y" { ; ; break;} case 13: -#line 217 "parse.y" +#line 239 "parse.y" { ; ; break;} case 14: -#line 218 "parse.y" +#line 240 "parse.y" { ; ; break;} case 15: -#line 219 "parse.y" +#line 241 "parse.y" { ; ; break;} case 16: -#line 220 "parse.y" +#line 242 "parse.y" { ; ; break;} case 17: -#line 223 "parse.y" -{ - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); - ; +#line 243 "parse.y" +{ ; ; break;} case 18: -#line 226 "parse.y" +#line 246 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); + push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL); ; break;} case 19: -#line 230 "parse.y" +#line 249 "parse.y" +{ + push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ; + break;} +case 20: +#line 252 "parse.y" +{ + push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL); + ; + break;} +case 21: +#line 255 "parse.y" +{ + push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ; + break;} +case 22: +#line 259 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1130,8 +1184,8 @@ case 19: } ; break;} -case 20: -#line 259 "parse.y" +case 23: +#line 288 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1157,32 +1211,32 @@ case 20: } ; break;} -case 21: -#line 285 "parse.y" +case 24: +#line 314 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 286 "parse.y" +case 25: +#line 315 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 289 "parse.y" +case 26: +#line 318 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 292 "parse.y" +case 27: +#line 321 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 298 "parse.y" +case 28: +#line 327 "parse.y" { ; ; break;} -case 26: -#line 299 "parse.y" +case 29: +#line 328 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1190,152 +1244,160 @@ case 26: g_free(oldname); ; break;} -case 27: -#line 307 "parse.y" +case 30: +#line 336 "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 31: +#line 340 "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 32: +#line 347 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 30: -#line 321 "parse.y" +case 33: +#line 350 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 31: -#line 324 "parse.y" +case 34: +#line 353 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 32: -#line 327 "parse.y" +case 35: +#line 356 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 33: -#line 330 "parse.y" +case 36: +#line 359 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 34: -#line 333 "parse.y" +case 37: +#line 362 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 35: -#line 336 "parse.y" +case 38: +#line 365 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 36: -#line 339 "parse.y" +case 39: +#line 368 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 37: -#line 342 "parse.y" +case 40: +#line 371 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 345 "parse.y" +case 41: +#line 374 "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 42: +#line 378 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 40: -#line 352 "parse.y" +case 43: +#line 381 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 41: -#line 357 "parse.y" +case 44: +#line 386 "parse.y" { yyval.id = "long int"; ; break;} -case 42: -#line 360 "parse.y" +case 45: +#line 389 "parse.y" { yyval.id = "long"; ; break;} -case 43: -#line 363 "parse.y" +case 46: +#line 392 "parse.y" { yyval.id = "short int"; ; break;} -case 44: -#line 366 "parse.y" +case 47: +#line 395 "parse.y" { yyval.id = "short"; ; break;} -case 45: -#line 369 "parse.y" +case 48: +#line 398 "parse.y" { yyval.id = "int"; ; break;} -case 46: -#line 374 "parse.y" +case 49: +#line 403 "parse.y" { yyval.id = "enum "; ; break;} -case 47: -#line 377 "parse.y" +case 50: +#line 406 "parse.y" { yyval.id = "union "; ; break;} -case 48: -#line 380 "parse.y" +case 51: +#line 409 "parse.y" { yyval.id = "struct "; ; break;} -case 49: -#line 385 "parse.y" +case 52: +#line 414 "parse.y" { stars++; ; break;} -case 50: -#line 386 "parse.y" +case 53: +#line 415 "parse.y" { stars++; ; break;} -case 51: -#line 389 "parse.y" +case 54: +#line 418 "parse.y" +{ ; ; + break;} +case 55: +#line 419 "parse.y" +{ ; ; + break;} +case 56: +#line 422 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; @@ -1349,8 +1411,8 @@ case 51: g_free(yyvsp[-1].id); ; break;} -case 52: -#line 401 "parse.y" +case 57: +#line 434 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; @@ -1364,14 +1426,14 @@ case 52: g_free(yyvsp[-2].id); ; break;} -case 53: -#line 413 "parse.y" +case 58: +#line 446 "parse.y" { yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; ; break;} -case 54: -#line 416 "parse.y" +case 59: +#line 449 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1385,40 +1447,76 @@ case 54: g_free(yyvsp[-1].id); ; break;} -case 55: -#line 428 "parse.y" +case 60: +#line 461 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 61: +#line 473 "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 62: +#line 485 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 433 "parse.y" +case 63: +#line 488 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 64: +#line 493 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 57: -#line 438 "parse.y" +case 65: +#line 498 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 58: -#line 441 "parse.y" +case 66: +#line 501 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 59: -#line 446 "parse.y" +case 67: +#line 506 "parse.y" { yyval.cbuf=yyvsp[0].cbuf; ; break;} -case 60: -#line 447 "parse.y" +case 68: +#line 507 "parse.y" { yyval.cbuf = NULL; ; break;} -case 61: -#line 451 "parse.y" +case 69: +#line 511 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1430,8 +1528,8 @@ case 61: ccode_line,vararg); ; break;} -case 62: -#line 461 "parse.y" +case 70: +#line 521 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1443,8 +1541,8 @@ case 62: ccode_line,vararg); ; break;} -case 63: -#line 471 "parse.y" +case 71: +#line 531 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1452,12 +1550,12 @@ case 63: YYERROR; } push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, ccode_line,vararg); ; break;} -case 64: -#line 481 "parse.y" +case 72: +#line 541 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, @@ -1465,24 +1563,24 @@ case 64: vararg); ; break;} -case 65: -#line 487 "parse.y" +case 73: +#line 547 "parse.y" { push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, vararg); ; break;} -case 66: -#line 492 "parse.y" +case 74: +#line 552 "parse.y" { push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, vararg); ; break;} -case 67: -#line 497 "parse.y" +case 75: +#line 557 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1503,31 +1601,31 @@ case 67: } ; break;} -case 68: -#line 518 "parse.y" +case 76: +#line 578 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 69: -#line 519 "parse.y" +case 77: +#line 579 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 70: -#line 523 "parse.y" +case 78: +#line 583 "parse.y" { ; ; break;} -case 71: -#line 524 "parse.y" +case 79: +#line 584 "parse.y" { yyval.id = NULL; ; break;} -case 72: -#line 527 "parse.y" +case 80: +#line 587 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 73: -#line 528 "parse.y" +case 81: +#line 588 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1540,8 +1638,8 @@ case 73: } ; break;} -case 74: -#line 539 "parse.y" +case 82: +#line 599 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1553,53 +1651,70 @@ case 74: } ; break;} -case 75: -#line 549 "parse.y" +case 83: +#line 609 "parse.y" { has_self = FALSE; ; break;} -case 76: -#line 552 "parse.y" +case 84: +#line 612 "parse.y" { vararg = TRUE; ; break;} -case 77: -#line 553 "parse.y" +case 85: +#line 613 "parse.y" { vararg = FALSE; ; break;} -case 78: -#line 556 "parse.y" +case 86: +#line 616 "parse.y" { ; ; break;} -case 79: -#line 557 "parse.y" +case 87: +#line 617 "parse.y" { ; ; break;} -case 80: -#line 560 "parse.y" +case 88: +#line 620 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 81: -#line 563 "parse.y" +case 89: +#line 623 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 90: +#line 626 "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 91: +#line 634 "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 92: +#line 644 "parse.y" { ; ; break;} -case 83: -#line 574 "parse.y" +case 93: +#line 645 "parse.y" { ; ; break;} -case 84: -#line 577 "parse.y" +case 94: +#line 648 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1614,61 +1729,61 @@ case 84: g_free(yyvsp[0].id); ; break;} -case 85: -#line 590 "parse.y" +case 95: +#line 661 "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 96: +#line 665 "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 97: +#line 669 "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 98: +#line 673 "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 99: +#line 677 "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 100: +#line 681 "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 101: +#line 687 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 92: -#line 617 "parse.y" +case 102: +#line 688 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 93: -#line 621 "parse.y" +case 103: +#line 692 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1893,5 +2008,5 @@ yyerrhandle: } return 1; } -#line 624 "parse.y" +#line 695 "parse.y"