X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6e77e91bbb048a0ee1a072715c0ce808c169ab38..f31590988781d77ff5249987801d03a986368ca2:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 665f536..f8593b9 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,30 +1,30 @@ /* A Bison parser, made from parse.y - by GNU Bison version 1.25 - */ + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ -#define CLASS 258 -#define FROM 259 -#define CONST 260 -#define VOID 261 -#define STRUCT 262 -#define UNION 263 -#define ENUM 264 -#define THREEDOTS 265 -#define SIGNED 266 -#define UNSIGNED 267 -#define LONG 268 -#define SHORT 269 -#define INT 270 -#define FLOAT 271 -#define DOUBLE 272 -#define CHAR 273 -#define ONERROR 274 -#define TOKEN 275 -#define NUMBER 276 -#define TYPETOKEN 277 +#define CLASS 257 +#define FROM 258 +#define CONST 259 +#define VOID 260 +#define STRUCT 261 +#define UNION 262 +#define ENUM 263 +#define THREEDOTS 264 +#define SIGNED 265 +#define UNSIGNED 266 +#define LONG 267 +#define SHORT 268 +#define INT 269 +#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 @@ -97,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); @@ -118,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; @@ -130,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; @@ -154,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); } @@ -165,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); @@ -173,7 +191,7 @@ push_self(char *id) } -#line 160 "parse.y" +#line 178 "parse.y" typedef union { char *id; GString *cbuf; @@ -195,26 +213,26 @@ typedef union { -#define YYFINAL 198 +#define YYFINAL 207 #define YYFLAG -32768 -#define YYNTBASE 45 +#define YYNTBASE 46 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 73) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74) 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, @@ -227,76 +245,79 @@ 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, 2, 2, 2, 1, 2, 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 + 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 }; #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 + 32, 35, 38, 41, 43, 45, 47, 52, 58, 63, + 69, 81, 90, 94, 95, 99, 101, 103, 106, 108, + 111, 114, 117, 119, 122, 125, 127, 129, 131, 133, + 136, 138, 140, 143, 145, 148, 150, 152, 154, 156, + 158, 161, 163, 167, 171, 174, 177, 179, 184, 188, + 190, 193, 195, 205, 215, 224, 237, 247, 257, 263, + 266, 270, 273, 274, 276, 278, 282, 284, 288, 290, + 294, 296, 299, 303, 310, 318, 321, 323, 325, 328, + 331, 335, 339, 343, 347, 349, 352 }; -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, 3, 22, 4, 22, + 0, 50, 65, 0, 50, 51, 0, 50, 52, 0, + 65, 0, 51, 0, 52, 0, 26, 55, 20, 34, + 0, 26, 55, 20, 23, 34, 0, 27, 55, 20, + 34, 0, 27, 55, 20, 23, 34, 0, 28, 53, + 20, 20, 20, 32, 24, 20, 32, 24, 34, 0, + 28, 53, 20, 20, 20, 32, 24, 34, 0, 35, + 54, 36, 0, 0, 20, 37, 54, 0, 20, 0, + 56, 0, 5, 56, 0, 57, 0, 57, 60, 0, + 12, 58, 0, 11, 58, 0, 58, 0, 12, 18, + 0, 11, 18, 0, 18, 0, 17, 0, 16, 0, + 20, 0, 59, 20, 0, 22, 0, 6, 0, 13, + 15, 0, 13, 0, 14, 15, 0, 14, 0, 15, + 0, 9, 0, 8, 0, 7, 0, 38, 60, 0, + 38, 0, 27, 20, 62, 0, 20, 27, 62, 0, + 27, 62, 0, 20, 62, 0, 62, 0, 20, 35, + 63, 36, 0, 63, 39, 20, 0, 20, 0, 32, + 24, 0, 34, 0, 30, 61, 55, 20, 35, 67, + 36, 66, 64, 0, 29, 27, 55, 20, 35, 67, + 36, 66, 64, 0, 29, 55, 20, 35, 67, 36, + 66, 64, 0, 31, 35, 22, 36, 55, 20, 35, + 67, 36, 66, 32, 24, 0, 26, 55, 20, 35, + 67, 36, 66, 32, 24, 0, 27, 55, 20, 35, + 67, 36, 66, 32, 24, 0, 20, 35, 20, 36, + 64, 0, 19, 73, 0, 19, 32, 24, 0, 40, + 41, 0, 0, 6, 0, 20, 0, 20, 39, 68, + 0, 68, 0, 69, 39, 10, 0, 69, 0, 69, + 39, 70, 0, 70, 0, 55, 20, 0, 55, 20, + 23, 0, 55, 20, 35, 20, 71, 36, 0, 55, + 20, 23, 35, 20, 71, 36, 0, 71, 72, 0, + 72, 0, 20, 0, 42, 73, 0, 43, 73, 0, + 42, 40, 73, 0, 43, 40, 73, 0, 40, 40, + 73, 0, 44, 40, 73, 0, 21, 0, 45, 21, + 0, 20, 0 }; #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, 544, 559, 562, 563, 566, 567, 570, - 573, 583, 584, 587, 600, 604, 608, 612, 616, 620, - 626, 627, 631 + 197, 198, 199, 200, 203, 207, 211, 215, 221, 228, + 233, 234, 235, 236, 237, 238, 241, 244, 247, 250, + 254, 283, 309, 310, 313, 316, 322, 323, 331, 335, + 342, 345, 348, 351, 354, 357, 360, 363, 366, 369, + 373, 376, 381, 384, 387, 390, 393, 398, 401, 404, + 409, 410, 413, 425, 437, 440, 452, 457, 462, 465, + 470, 471, 475, 485, 495, 505, 511, 516, 521, 542, + 543, 547, 548, 551, 552, 563, 573, 576, 577, 580, + 581, 584, 587, 590, 598, 608, 609, 612, 625, 629, + 633, 637, 641, 645, 651, 652, 656 }; #endif @@ -306,164 +327,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","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, + 46, 46, 46, 46, 47, 47, 47, 47, 48, 49, + 50, 50, 50, 50, 50, 50, 51, 51, 51, 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, - 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 + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 58, 58, 58, 58, 58, 59, 59, 59, + 60, 60, 61, 61, 61, 61, 61, 62, 63, 63, + 64, 64, 65, 65, 65, 65, 65, 65, 65, 66, + 66, 66, 66, 67, 67, 67, 67, 68, 68, 69, + 69, 70, 70, 70, 70, 71, 71, 72, 72, 72, + 72, 72, 72, 72, 73, 73, 73 }; 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 + 2, 2, 2, 1, 1, 1, 4, 5, 4, 5, + 11, 8, 3, 0, 3, 1, 1, 2, 1, 2, + 2, 2, 1, 2, 2, 1, 1, 1, 1, 2, + 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, + 2, 1, 3, 3, 2, 2, 1, 4, 3, 1, + 2, 1, 9, 9, 8, 12, 9, 9, 5, 2, + 3, 2, 0, 1, 1, 3, 1, 3, 1, 3, + 1, 2, 3, 6, 7, 2, 1, 1, 2, 2, + 3, 3, 3, 3, 1, 2, 1 }; 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, 24, 0, 0, + 0, 0, 15, 16, 14, 10, 0, 0, 42, 50, + 49, 48, 0, 0, 44, 46, 47, 38, 37, 36, + 39, 41, 0, 27, 29, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 57, 0, 9, 12, 13, + 11, 0, 28, 35, 32, 34, 31, 43, 45, 0, + 52, 30, 40, 0, 26, 0, 0, 0, 0, 0, + 0, 0, 56, 0, 55, 0, 0, 0, 0, 17, + 0, 51, 0, 19, 0, 0, 23, 0, 0, 0, + 54, 60, 0, 53, 0, 0, 0, 62, 69, 18, + 42, 39, 0, 0, 77, 79, 81, 20, 0, 25, + 0, 0, 0, 58, 0, 0, 0, 61, 0, 82, + 73, 0, 73, 0, 0, 73, 59, 0, 0, 76, + 83, 0, 0, 0, 0, 78, 80, 0, 0, 73, + 0, 73, 0, 0, 0, 97, 95, 0, 0, 70, + 72, 0, 0, 0, 22, 0, 65, 0, 0, 0, + 88, 0, 0, 0, 0, 0, 87, 71, 96, 67, + 68, 0, 64, 63, 73, 0, 0, 0, 89, 0, + 90, 0, 84, 86, 0, 0, 85, 93, 91, 92, + 94, 21, 0, 66, 0, 0, 0 }; -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[] = { 205, + 4, 5, 6, 22, 23, 24, 50, 76, 113, 44, + 45, 46, 47, 72, 55, 56, 103, 109, 25, 145, + 114, 115, 116, 117, 176, 177, 160 }; -static const short 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[] = { 3, + 47,-32768,-32768, 70, 169, 94, 75,-32768,-32768, 169, + 182, 171, 79, 182, 100, 125, 125, 109, 69, 77, + 111, 159,-32768,-32768,-32768,-32768, 108, 160,-32768,-32768, +-32768,-32768, 190, 196, 138, 147,-32768,-32768,-32768,-32768, +-32768,-32768, 144,-32768, 132,-32768, 163, 193, 197, 198, + 125, 199, 32, 200, 125,-32768, 194,-32768,-32768,-32768, +-32768, 145,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 65, + 132,-32768,-32768, 161, 184, 186, 203, 204, 191, 192, + 205, 208,-32768, 26,-32768, 209, 195, 76, 201,-32768, + 143,-32768, 202,-32768, 143, 197,-32768, 210, 206, 143, +-32768,-32768, 66,-32768, 207, 125, 213,-32768,-32768,-32768, + 211, 176, 212, 214,-32768, 215,-32768,-32768, 216,-32768, + 217, 143, 219,-32768, 218, 143, 220,-32768, 125, 21, + -6, 107, -6, 221, 222, -6,-32768, 223, 225,-32768, + 226, 224, -9, 227, 230,-32768,-32768, 231, 29, -6, + 76, -6, 143, 228, 28,-32768,-32768, 229, 235,-32768, +-32768, 233, 240, 234,-32768, 76,-32768, 76, 236, 28, +-32768, 237, -2, 5, 238, 11,-32768,-32768,-32768,-32768, +-32768, 241,-32768,-32768, -6, 22, -4, -4,-32768, -4, +-32768, -4,-32768,-32768, 239, 242,-32768,-32768,-32768,-32768, +-32768,-32768, 243,-32768, 246, 251,-32768 }; static const short 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 + 93, 265,-32768,-32768, 248, 249,-32768, 137, -16, 247, +-32768, -13,-32768, 168,-32768, -44,-32768, -136, 254, -128, + -93, 105,-32768, 148, 73, -172, -81 }; -#define YYLAST 265 +#define YYLAST 280 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 + 48, 119, 52, 194, 148, 1, 123, 151, 83, 85, + 156, 157, 143, 194, 167, 156, 157, 156, 157, 65, + 67, 166, 158, 168, 156, 157, 2, 3, 135, 183, + 171, 184, 138, 144, 78, 159, 101, 188, 86, 104, + 159, 171, 159, 141, 190, 80, 193, 171, 164, 159, + 172, 80, 173, 174, 175, 142, 196, 197, 81, 169, + 82, 172, 165, 173, 174, 175, 82, 172, 7, 173, + 174, 175, 1, 28, 29, 30, 31, 32, 13, 33, + 34, 35, 36, 37, 38, 39, 40, 89, 41, 127, + 42, 189, 191, 8, 9, 51, 53, 11, 90, 91, + 26, 124, 14, 54, 125, 198, 199, 107, 200, 108, + 201, 28, 29, 30, 31, 32, 146, 33, 34, 35, + 36, 37, 38, 39, 40, 12, 41, 62, 42, 28, + 29, 30, 31, 32, 27, 33, 34, 35, 36, 37, + 38, 39, 40, 49, 41, 57, 42, 28, 111, 30, + 31, 32, 68, 33, 34, 35, 36, 37, 38, 39, + 40, 69, 112, 70, 42, 29, 30, 31, 32, 71, + 33, 34, 35, 36, 37, 38, 39, 40, 15, 41, + 88, 42, 73, 93, 16, 17, 18, 19, 20, 21, + 15, 58, 2, 3, 94, 95, 16, 17, 18, 19, + 20, 21, 35, 36, 37, 8, 9, 64, 35, 36, + 37, -75, 74, 66, 129, 87, 75, 77, 79, 84, + 96, 97, 98, 99, 80, 100, 82, 102, 105, 121, + 106, 130, 120, 140, 110, 118, 128, 137, 92, 139, + 122, 126, 186, 155, 149, 206, -74, 170, 134, 131, + 207, 133, 178, 132, 136, 179, 180, 150, 152, 153, + 154, 162, 163, 181, 195, 182, 204, 161, 10, 59, + 60, 185, 202, 203, 63, 61, 187, 192, 0, 147 }; 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, 95, 19, 176, 133, 3, 100, 136, 53, 54, + 20, 21, 19, 186, 151, 20, 21, 20, 21, 33, + 34, 150, 32, 152, 20, 21, 24, 25, 122, 166, + 20, 168, 126, 40, 51, 45, 81, 40, 55, 84, + 45, 20, 45, 23, 40, 20, 36, 20, 20, 45, + 40, 20, 42, 43, 44, 35, 185, 36, 27, 153, + 35, 40, 34, 42, 43, 44, 35, 40, 22, 42, + 43, 44, 3, 5, 6, 7, 8, 9, 4, 11, + 12, 13, 14, 15, 16, 17, 18, 23, 20, 106, + 22, 173, 174, 24, 25, 27, 20, 5, 34, 35, + 22, 36, 10, 27, 39, 187, 188, 32, 190, 34, + 192, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 32, 20, 20, 22, 5, + 6, 7, 8, 9, 35, 11, 12, 13, 14, 15, + 16, 17, 18, 35, 20, 35, 22, 5, 6, 7, + 8, 9, 15, 11, 12, 13, 14, 15, 16, 17, + 18, 15, 20, 20, 22, 6, 7, 8, 9, 38, + 11, 12, 13, 14, 15, 16, 17, 18, 20, 20, + 36, 22, 20, 23, 26, 27, 28, 29, 30, 31, + 20, 33, 24, 25, 34, 35, 26, 27, 28, 29, + 30, 31, 13, 14, 15, 24, 25, 18, 13, 14, + 15, 36, 20, 18, 39, 22, 20, 20, 20, 20, + 37, 36, 20, 20, 20, 35, 35, 20, 20, 20, + 36, 20, 96, 129, 34, 34, 24, 20, 71, 20, + 35, 35, 170, 20, 24, 0, 36, 20, 32, 36, + 0, 36, 24, 39, 36, 21, 24, 36, 36, 35, + 35, 32, 32, 24, 24, 32, 24, 41, 4, 22, + 22, 36, 34, 32, 28, 22, 40, 40, -1, 132 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -480,46 +506,66 @@ static const short yycheck[] = { 16, You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -#ifndef alloca +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ #ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA #include #else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ #include +#endif #else /* not MSDOS, or __TURBOC__ */ #if defined(_AIX) -#include +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include */ #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); -}; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca #endif /* __hpux */ +#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc +#endif /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -529,8 +575,8 @@ void *alloca (); #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the @@ -611,12 +657,12 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ @@ -628,7 +674,7 @@ static void __yy_memcpy (to, from, count) char *to; char *from; - int count; + unsigned int count; { register char *f = from; register char *t = to; @@ -643,10 +689,10 @@ __yy_memcpy (to, from, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *to, char *from, int count) +__yy_memcpy (char *to, char *from, unsigned int count) { - register char *f = from; register char *t = to; + register char *f = from; register int i = count; while (i-- > 0) @@ -656,7 +702,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/lib/bison.simple" +#line 217 "/usr/lib/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -677,6 +723,15 @@ __yy_memcpy (char *to, char *from, int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM +int yyparse (void *); +#else +int yyparse (void); +#endif +#endif + int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL @@ -705,6 +760,7 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -789,18 +845,32 @@ yynewstate: if (yystacksize >= YYMAXDEPTH) { yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } return 2; } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); #ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -961,51 +1031,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; @@ -1013,49 +1083,61 @@ case 9: ; break;} case 10: -#line 210 "parse.y" +#line 228 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 215 "parse.y" +#line 233 "parse.y" { ; ; break;} case 12: -#line 216 "parse.y" +#line 234 "parse.y" { ; ; break;} case 13: -#line 217 "parse.y" +#line 235 "parse.y" { ; ; break;} case 14: -#line 218 "parse.y" +#line 236 "parse.y" { ; ; break;} case 15: -#line 219 "parse.y" +#line 237 "parse.y" { ; ; break;} case 16: -#line 220 "parse.y" +#line 238 "parse.y" { ; ; break;} case 17: -#line 223 "parse.y" +#line 241 "parse.y" { - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); + push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL); ; break;} case 18: -#line 226 "parse.y" +#line 244 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); + push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id); ; break;} case 19: -#line 230 "parse.y" +#line 247 "parse.y" +{ + push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL); + ; + break;} +case 20: +#line 250 "parse.y" +{ + push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ; + break;} +case 21: +#line 254 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1086,8 +1168,8 @@ case 19: } ; break;} -case 20: -#line 259 "parse.y" +case 22: +#line 283 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1113,32 +1195,32 @@ case 20: } ; break;} -case 21: -#line 285 "parse.y" +case 23: +#line 309 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 286 "parse.y" +case 24: +#line 310 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 289 "parse.y" +case 25: +#line 313 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 292 "parse.y" +case 26: +#line 316 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 298 "parse.y" +case 27: +#line 322 "parse.y" { ; ; break;} -case 26: -#line 299 "parse.y" +case 28: +#line 323 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1146,152 +1228,152 @@ case 26: g_free(oldname); ; break;} -case 27: -#line 307 "parse.y" +case 29: +#line 331 "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 30: +#line 335 "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 31: +#line 342 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 30: -#line 321 "parse.y" +case 32: +#line 345 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 31: -#line 324 "parse.y" +case 33: +#line 348 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 32: -#line 327 "parse.y" +case 34: +#line 351 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 33: -#line 330 "parse.y" +case 35: +#line 354 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 34: -#line 333 "parse.y" +case 36: +#line 357 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 35: -#line 336 "parse.y" +case 37: +#line 360 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 36: -#line 339 "parse.y" +case 38: +#line 363 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 37: -#line 342 "parse.y" +case 39: +#line 366 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 345 "parse.y" +case 40: +#line 369 "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 41: +#line 373 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 40: -#line 352 "parse.y" +case 42: +#line 376 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 41: -#line 357 "parse.y" +case 43: +#line 381 "parse.y" { yyval.id = "long int"; ; break;} -case 42: -#line 360 "parse.y" +case 44: +#line 384 "parse.y" { yyval.id = "long"; ; break;} -case 43: -#line 363 "parse.y" +case 45: +#line 387 "parse.y" { yyval.id = "short int"; ; break;} -case 44: -#line 366 "parse.y" +case 46: +#line 390 "parse.y" { yyval.id = "short"; ; break;} -case 45: -#line 369 "parse.y" +case 47: +#line 393 "parse.y" { yyval.id = "int"; ; break;} -case 46: -#line 374 "parse.y" +case 48: +#line 398 "parse.y" { yyval.id = "enum "; ; break;} -case 47: -#line 377 "parse.y" +case 49: +#line 401 "parse.y" { yyval.id = "union "; ; break;} -case 48: -#line 380 "parse.y" +case 50: +#line 404 "parse.y" { yyval.id = "struct "; ; break;} -case 49: -#line 385 "parse.y" +case 51: +#line 409 "parse.y" { stars++; ; break;} -case 50: -#line 386 "parse.y" +case 52: +#line 410 "parse.y" { stars++; ; break;} -case 51: -#line 389 "parse.y" +case 53: +#line 413 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; @@ -1305,8 +1387,8 @@ case 51: g_free(yyvsp[-1].id); ; break;} -case 52: -#line 401 "parse.y" +case 54: +#line 425 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; @@ -1320,14 +1402,14 @@ case 52: g_free(yyvsp[-2].id); ; break;} -case 53: -#line 413 "parse.y" +case 55: +#line 437 "parse.y" { yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; ; break;} -case 54: -#line 416 "parse.y" +case 56: +#line 440 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1341,40 +1423,40 @@ case 54: g_free(yyvsp[-1].id); ; break;} -case 55: -#line 428 "parse.y" +case 57: +#line 452 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 433 "parse.y" +case 58: +#line 457 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 57: -#line 438 "parse.y" +case 59: +#line 462 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 58: -#line 441 "parse.y" +case 60: +#line 465 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 59: -#line 446 "parse.y" +case 61: +#line 470 "parse.y" { yyval.cbuf=yyvsp[0].cbuf; ; break;} -case 60: -#line 447 "parse.y" +case 62: +#line 471 "parse.y" { yyval.cbuf = NULL; ; break;} -case 61: -#line 451 "parse.y" +case 63: +#line 475 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1386,8 +1468,8 @@ case 61: ccode_line,vararg); ; break;} -case 62: -#line 461 "parse.y" +case 64: +#line 485 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1399,8 +1481,8 @@ case 62: ccode_line,vararg); ; break;} -case 63: -#line 471 "parse.y" +case 65: +#line 495 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1412,8 +1494,8 @@ case 63: ccode_line,vararg); ; break;} -case 64: -#line 481 "parse.y" +case 66: +#line 505 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, @@ -1421,24 +1503,24 @@ case 64: vararg); ; break;} -case 65: -#line 487 "parse.y" +case 67: +#line 511 "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 68: +#line 516 "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 69: +#line 521 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1459,40 +1541,35 @@ case 67: } ; break;} -case 68: -#line 518 "parse.y" +case 70: +#line 542 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 69: -#line 519 "parse.y" +case 71: +#line 543 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 70: -#line 523 "parse.y" +case 72: +#line 547 "parse.y" { ; ; break;} -case 71: -#line 524 "parse.y" +case 73: +#line 548 "parse.y" { yyval.id = NULL; ; break;} -case 72: -#line 527 "parse.y" +case 74: +#line 551 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 73: -#line 528 "parse.y" +case 75: +#line 552 "parse.y" { vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[0].id,"this")==0) { - push_self(yyvsp[0].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[0].id,"self")==0) + if(strcmp(yyvsp[0].id,"self")==0) push_self(yyvsp[0].id); else { g_free(yyvsp[0].id); @@ -1501,16 +1578,11 @@ case 73: } ; break;} -case 74: -#line 544 "parse.y" +case 76: +#line 563 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-2].id,"this")==0) { - push_self(yyvsp[-2].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[-2].id,"self")==0) + if(strcmp(yyvsp[-2].id,"self")==0) push_self(yyvsp[-2].id); else { g_free(yyvsp[-2].id); @@ -1519,53 +1591,70 @@ case 74: } ; break;} -case 75: -#line 559 "parse.y" +case 77: +#line 573 "parse.y" { has_self = FALSE; ; break;} -case 76: -#line 562 "parse.y" +case 78: +#line 576 "parse.y" { vararg = TRUE; ; break;} -case 77: -#line 563 "parse.y" +case 79: +#line 577 "parse.y" { vararg = FALSE; ; break;} -case 78: -#line 566 "parse.y" +case 80: +#line 580 "parse.y" { ; ; break;} -case 79: -#line 567 "parse.y" +case 81: +#line 581 "parse.y" { ; ; break;} -case 80: -#line 570 "parse.y" +case 82: +#line 584 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 81: -#line 573 "parse.y" +case 83: +#line 587 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 84: +#line 590 "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 583 "parse.y" +case 85: +#line 598 "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 86: +#line 608 "parse.y" { ; ; break;} -case 83: -#line 584 "parse.y" +case 87: +#line 609 "parse.y" { ; ; break;} -case 84: -#line 587 "parse.y" +case 88: +#line 612 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1580,66 +1669,66 @@ case 84: g_free(yyvsp[0].id); ; break;} -case 85: -#line 600 "parse.y" +case 89: +#line 625 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 604 "parse.y" +case 90: +#line 629 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 608 "parse.y" +case 91: +#line 633 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 88: -#line 612 "parse.y" +case 92: +#line 637 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 89: -#line 616 "parse.y" +case 93: +#line 641 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 90: -#line 620 "parse.y" +case 94: +#line 645 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 91: -#line 626 "parse.y" +case 95: +#line 651 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 92: -#line 627 "parse.y" +case 96: +#line 652 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 93: -#line 631 "parse.y" +case 97: +#line 656 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/lib/bison.simple" +#line 543 "/usr/lib/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1834,6 +1923,30 @@ yyerrhandle: yystate = yyn; goto yynewstate; + + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; + + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 1; } -#line 634 "parse.y" +#line 659 "parse.y"