X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/daead564b9592e78d418deb56a211cd5ea399f76..2310330e7d4d724bf6641339836be8523f95c916:/src/parse.c diff --git a/src/parse.c b/src/parse.c index e50c96b..101d2e6 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,38 +1,37 @@ /* 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 CLASS 257 +#define FROM 258 +#define CONST 259 #define VOID 260 #define STRUCT 261 #define UNION 262 #define ENUM 263 -#define SIGNED 264 -#define UNSIGNED 265 -#define LONG 266 -#define SHORT 267 -#define INT 268 -#define FLOAT 269 -#define DOUBLE 270 -#define CHAR 271 -#define FIRST 272 -#define LAST 273 -#define ONERROR 274 -#define TOKEN 275 -#define NUMBER 276 -#define TYPETOKEN 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 +#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 CCODE 277 +#define HCODE 278 +#define PUBLIC 279 +#define PRIVATE 280 +#define ARGUMENT 281 +#define VIRTUAL 282 +#define SIGNAL 283 +#define OVERRIDE 284 #line 21 "parse.y" @@ -59,6 +58,7 @@ static int stars = 0; static GList *funcargs = NULL; static GList *checks = NULL; static int has_self = FALSE; +static int vararg = FALSE; static GList *gtktypes = NULL; @@ -108,7 +108,7 @@ push_variable(char *name, int scope, int line_no) static void push_function(int scope, char *oid, char *id, char *onerror, - GString *cbuf,int line_no, int ccode_line) + GString *cbuf,int line_no, int ccode_line, int vararg) { Node *node; Type *type; @@ -121,7 +121,7 @@ push_function(int scope, char *oid, char *id, char *onerror, } node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no,ccode_line); + onerror,cbuf,line_no,ccode_line,vararg); gtktypes = NULL; funcargs = NULL; @@ -172,12 +172,13 @@ push_self(char *id) } -#line 159 "parse.y" +#line 160 "parse.y" typedef union { char *id; GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -193,11 +194,11 @@ typedef union { -#define YYFINAL 187 +#define YYFINAL 198 #define YYFLAG -32768 #define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 70) +#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -225,72 +226,76 @@ 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 }; #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, 97, 100, 102, - 105, 108, 110, 112, 114, 116, 119, 121, 123, 126, - 128, 131, 133, 135, 137, 139, 141, 144, 146, 151, - 155, 157, 160, 162, 173, 183, 192, 205, 215, 225, - 231, 238, 241, 245, 248, 249, 251, 253, 257, 259, - 263, 265, 268, 275, 278, 280, 282, 285, 288, 292, - 296, 300, 304, 306, 309 + 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 }; 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, 62, 0, 49, 50, 0, 49, 51, 0, - 62, 0, 50, 0, 51, 0, 25, 54, 20, 33, + 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, - 55, 58, 0, 10, 56, 0, 9, 56, 0, 56, - 0, 10, 16, 0, 9, 16, 0, 16, 0, 15, - 0, 14, 0, 20, 0, 57, 20, 0, 22, 0, - 5, 0, 11, 13, 0, 11, 0, 12, 13, 0, - 12, 0, 13, 0, 8, 0, 7, 0, 6, 0, - 37, 58, 0, 37, 0, 20, 34, 60, 35, 0, - 60, 38, 20, 0, 20, 0, 31, 23, 0, 33, - 0, 29, 20, 59, 54, 20, 34, 64, 35, 63, - 61, 0, 29, 59, 54, 20, 34, 64, 35, 63, - 61, 0, 28, 54, 20, 34, 64, 35, 63, 61, - 0, 30, 34, 22, 35, 54, 20, 34, 64, 35, - 63, 31, 23, 0, 25, 54, 20, 34, 64, 35, - 63, 31, 23, 0, 26, 54, 20, 34, 64, 35, - 63, 31, 23, 0, 20, 34, 20, 35, 33, 0, - 20, 34, 20, 35, 31, 23, 0, 19, 69, 0, - 19, 31, 23, 0, 39, 40, 0, 0, 5, 0, - 20, 0, 20, 38, 65, 0, 65, 0, 65, 38, - 66, 0, 66, 0, 54, 20, 0, 54, 20, 34, - 20, 67, 35, 0, 67, 68, 0, 68, 0, 20, - 0, 41, 69, 0, 42, 69, 0, 41, 39, 69, - 0, 42, 39, 69, 0, 39, 39, 69, 0, 43, - 39, 69, 0, 21, 0, 44, 21, 0, 20, 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 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 177, 178, 179, 180, 183, 187, 191, 195, 201, 208, - 213, 214, 215, 216, 217, 218, 221, 224, 228, 257, - 283, 284, 287, 290, 296, 300, 307, 310, 313, 316, - 319, 322, 325, 328, 331, 334, 338, 341, 346, 349, - 352, 355, 358, 363, 366, 369, 374, 375, 378, 383, - 386, 391, 392, 396, 417, 426, 435, 439, 443, 447, - 463, 484, 485, 489, 490, 495, 496, 511, 526, 529, - 530, 533, 536, 546, 547, 550, 563, 567, 571, 575, - 579, 583, 589, 590, 594 + 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 }; #endif @@ -298,156 +303,167 @@ static const short yyrline[] = { 0, #if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","CLASS", -"FROM","VOID","STRUCT","UNION","ENUM","SIGNED","UNSIGNED","LONG","SHORT","INT", -"FLOAT","DOUBLE","CHAR","FIRST","LAST","ONERROR","TOKEN","NUMBER","TYPETOKEN", +"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","integer","tspecifier","stars","sigtype","tokenlist", -"codenocode","method","onerror","funcargs","arglist","arg","checklist","check", -"numtok", NULL +"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, - 52, 52, 53, 53, 54, 54, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, - 56, 56, 56, 57, 57, 57, 58, 58, 59, 60, - 60, 61, 61, 62, 62, 62, 62, 62, 62, 62, - 62, 63, 63, 63, 63, 64, 64, 64, 64, 65, - 65, 66, 66, 67, 67, 68, 68, 68, 68, 68, - 68, 68, 69, 69, 69 + 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 }; 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, 2, 2, 1, 2, - 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, - 2, 1, 1, 1, 1, 1, 2, 1, 4, 3, - 1, 2, 1, 10, 9, 8, 12, 9, 9, 5, - 6, 2, 3, 2, 0, 1, 1, 3, 1, 3, - 1, 2, 6, 2, 1, 1, 2, 2, 3, 3, - 3, 3, 1, 2, 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, + 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 }; 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, 38, 46, 45, - 44, 0, 0, 40, 42, 43, 34, 33, 32, 35, - 37, 0, 25, 29, 0, 0, 0, 0, 0, 0, - 0, 0, 9, 12, 13, 11, 0, 31, 28, 30, - 27, 39, 41, 0, 48, 26, 36, 0, 24, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, - 47, 18, 0, 0, 21, 0, 0, 51, 0, 0, - 0, 0, 0, 60, 38, 35, 0, 0, 69, 71, - 0, 23, 0, 0, 49, 0, 0, 0, 0, 61, - 0, 72, 65, 0, 65, 0, 65, 50, 0, 0, - 0, 68, 0, 0, 0, 0, 70, 0, 0, 0, - 0, 65, 0, 0, 85, 83, 0, 0, 62, 64, - 0, 0, 0, 20, 0, 53, 56, 65, 0, 0, - 76, 0, 0, 0, 0, 0, 75, 63, 84, 58, - 59, 0, 52, 0, 55, 65, 0, 0, 77, 0, - 78, 0, 73, 74, 0, 54, 0, 81, 79, 80, - 82, 19, 0, 57, 0, 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 }; -static const short yydefgoto[] = { 185, - 4, 5, 6, 22, 23, 24, 48, 70, 97, 43, - 44, 45, 66, 51, 89, 147, 25, 126, 98, 99, - 100, 156, 157, 139 +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 yypact[] = { 26, - -14,-32768,-32768, 37, 51, -6, 43,-32768,-32768, 51, - 98, 99, 8, 98, 20, 72, 72, 24, 72, 52, - 57, 88,-32768,-32768,-32768,-32768, 69,-32768,-32768,-32768, --32768, 119, 125, 94, 96,-32768,-32768,-32768,-32768,-32768, --32768, 91, 86,-32768, 120, 127, 128, 129, 130, 33, - 72, 131,-32768,-32768,-32768,-32768, 116,-32768,-32768,-32768, --32768,-32768,-32768, 100, 86,-32768,-32768, 110, 118, 117, - 135, 122, 123, 138, 72, 139, 126, 31,-32768, 90, --32768,-32768, 90, 128,-32768, 140, 90,-32768, 55, 142, - 132, 72, 141,-32768, 133, 104, 143, 134, 136,-32768, - 137,-32768, 144, 145,-32768, 147, 148, 90, 150,-32768, - 72, 149, -17, 72, -17, 153, -17,-32768, 90, 146, - 151, 136, 157, -11, 152, 155,-32768, 156, 36, 40, - 154, -17, 90, -15,-32768,-32768, 161, 158,-32768,-32768, - 165, 167, 160,-32768, 170,-32768,-32768, -17, 40, 159, --32768, 162, -8, -5, 163, 3,-32768,-32768,-32768,-32768, --32768, 172,-32768, 40,-32768, -17, -3, -3,-32768, -3, --32768, -3,-32768,-32768, 164,-32768, 168,-32768,-32768,-32768, --32768,-32768, 173,-32768, 171, 178,-32768 +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 yypgoto[] = {-32768, - 9, 169,-32768,-32768, 176, 181,-32768, 81, -16,-32768, - 113,-32768, 166, 174,-32768, -101, 182, -111, -76, 89, - 92,-32768, 49, -102 + 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 }; -#define YYLAST 231 - - -static const short yytable[] = { 42, - 46, 124, 49, 128, 151, 130, 101, 7, 135, 136, - 104, 135, 136, 11, 135, 136, 135, 136, 14, 137, - 149, 125, 151, 152, 12, 153, 154, 155, 1, 26, - 168, 120, 138, 170, 76, 138, 164, 173, 138, 1, - 138, 152, 131, 153, 154, 155, 13, 165, 2, 3, - 169, 171, 73, 27, 177, 143, 150, 47, 90, 8, - 9, 93, 176, 94, 178, 179, 74, 180, 144, 181, - 145, 50, 146, 2, 3, 109, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 57, 105, - 52, 40, 106, 41, 95, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 62, 15, 63, 96, - 64, 41, 16, 17, 18, 19, 20, 21, 15, 53, - 8, 9, 65, 16, 17, 18, 19, 20, 21, 34, - 35, 36, 79, 80, 58, 34, 35, 36, -67, 67, - 60, 111, 82, 83, 59, 61, 68, 69, 71, 72, - 78, 85, 77, 84, 86, 87, 74, 88, 91, 103, - 92, 107, 112, 110, 102, 108, 118, -66, 113, 121, - 186, 115, 10, 114, 116, 129, 134, 187, 159, 117, - 132, 119, 123, 158, 133, 141, 142, 160, 148, 161, - 162, 140, 163, 166, 175, 184, 182, 54, 183, 122, - 167, 172, 55, 56, 174, 127, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, - 81 +#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 }; static const short yycheck[] = { 16, - 17, 19, 19, 115, 20, 117, 83, 22, 20, 21, - 87, 20, 21, 5, 20, 21, 20, 21, 10, 31, - 132, 39, 20, 39, 31, 41, 42, 43, 3, 22, - 39, 108, 44, 39, 51, 44, 148, 35, 44, 3, - 44, 39, 119, 41, 42, 43, 4, 149, 23, 24, - 153, 154, 20, 34, 166, 20, 133, 34, 75, 23, - 24, 31, 164, 33, 167, 168, 34, 170, 33, 172, - 31, 20, 33, 23, 24, 92, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 20, 35, - 34, 20, 38, 22, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 13, 20, 13, 20, - 20, 22, 25, 26, 27, 28, 29, 30, 20, 32, - 23, 24, 37, 25, 26, 27, 28, 29, 30, 11, - 12, 13, 33, 34, 16, 11, 12, 13, 35, 20, - 16, 38, 33, 34, 32, 33, 20, 20, 20, 20, - 35, 35, 22, 36, 20, 34, 34, 20, 20, 20, - 35, 20, 20, 23, 84, 34, 20, 35, 35, 20, - 0, 35, 4, 38, 31, 23, 20, 0, 21, 35, - 35, 34, 34, 23, 34, 31, 31, 23, 35, 23, - 31, 40, 23, 35, 23, 23, 33, 22, 31, 111, - 39, 39, 22, 22, 156, 114, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 50, -1, -1, -1, -1, -1, -1, - 65 + 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 }; /* -*-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. @@ -464,46 +480,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 @@ -513,8 +549,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 @@ -595,12 +631,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++ */ @@ -612,7 +648,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; @@ -627,10 +663,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) @@ -640,7 +676,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 *. @@ -661,6 +697,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 @@ -689,6 +734,7 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -773,18 +819,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 */ @@ -945,51 +1005,51 @@ yyreduce: switch (yyn) { case 1: -#line 177 "parse.y" +#line 179 "parse.y" { ; ; break;} case 2: -#line 178 "parse.y" +#line 180 "parse.y" { ; ; break;} case 3: -#line 179 "parse.y" +#line 181 "parse.y" { ; ; break;} case 4: -#line 180 "parse.y" +#line 182 "parse.y" { ; ; break;} case 5: -#line 183 "parse.y" +#line 185 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 6: -#line 187 "parse.y" +#line 189 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 7: -#line 191 "parse.y" +#line 193 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 8: -#line 195 "parse.y" +#line 197 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 9: -#line 201 "parse.y" +#line 203 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -997,49 +1057,49 @@ case 9: ; break;} case 10: -#line 208 "parse.y" +#line 210 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 213 "parse.y" +#line 215 "parse.y" { ; ; break;} case 12: -#line 214 "parse.y" +#line 216 "parse.y" { ; ; break;} case 13: -#line 215 "parse.y" +#line 217 "parse.y" { ; ; break;} case 14: -#line 216 "parse.y" +#line 218 "parse.y" { ; ; break;} case 15: -#line 217 "parse.y" +#line 219 "parse.y" { ; ; break;} case 16: -#line 218 "parse.y" +#line 220 "parse.y" { ; ; break;} case 17: -#line 221 "parse.y" +#line 223 "parse.y" { push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); ; break;} case 18: -#line 224 "parse.y" +#line 226 "parse.y" { push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); ; break;} case 19: -#line 228 "parse.y" +#line 230 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1071,7 +1131,7 @@ case 19: ; break;} case 20: -#line 257 "parse.y" +#line 259 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1098,233 +1158,293 @@ case 20: ; break;} case 21: -#line 283 "parse.y" +#line 285 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 22: -#line 284 "parse.y" +#line 286 "parse.y" { yyval.list = NULL; ; break;} case 23: -#line 287 "parse.y" +#line 289 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 24: -#line 290 "parse.y" +#line 292 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 25: -#line 296 "parse.y" +#line 298 "parse.y" +{ ; ; + break;} +case 26: +#line 299 "parse.y" +{ + Type *type = typestack->data; + char *oldname = type->name; + type->name = g_strconcat("const ",oldname,NULL); + g_free(oldname); + ; + break;} +case 27: +#line 307 "parse.y" { Node *node = new_type(0,yyvsp[0].id); typestack = g_list_prepend(typestack,node); ; break;} -case 26: -#line 300 "parse.y" +case 28: +#line 311 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 27: -#line 307 "parse.y" +case 29: +#line 318 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 28: -#line 310 "parse.y" +case 30: +#line 321 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 29: -#line 313 "parse.y" +case 31: +#line 324 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 30: -#line 316 "parse.y" +case 32: +#line 327 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 31: -#line 319 "parse.y" +case 33: +#line 330 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 32: -#line 322 "parse.y" +case 34: +#line 333 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 33: -#line 325 "parse.y" +case 35: +#line 336 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 34: -#line 328 "parse.y" +case 36: +#line 339 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 35: -#line 331 "parse.y" +case 37: +#line 342 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 36: -#line 334 "parse.y" +case 38: +#line 345 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 37: -#line 338 "parse.y" +case 39: +#line 349 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 341 "parse.y" +case 40: +#line 352 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 39: -#line 346 "parse.y" +case 41: +#line 357 "parse.y" { yyval.id = "long int"; ; break;} -case 40: -#line 349 "parse.y" +case 42: +#line 360 "parse.y" { yyval.id = "long"; ; break;} -case 41: -#line 352 "parse.y" +case 43: +#line 363 "parse.y" { yyval.id = "short int"; ; break;} -case 42: -#line 355 "parse.y" +case 44: +#line 366 "parse.y" { yyval.id = "short"; ; break;} -case 43: -#line 358 "parse.y" +case 45: +#line 369 "parse.y" { yyval.id = "int"; ; break;} -case 44: -#line 363 "parse.y" +case 46: +#line 374 "parse.y" { yyval.id = "enum "; ; break;} -case 45: -#line 366 "parse.y" +case 47: +#line 377 "parse.y" { yyval.id = "union "; ; break;} -case 46: -#line 369 "parse.y" +case 48: +#line 380 "parse.y" { yyval.id = "struct "; ; break;} -case 47: -#line 374 "parse.y" +case 49: +#line 385 "parse.y" { stars++; ; break;} -case 48: -#line 375 "parse.y" +case 50: +#line 386 "parse.y" { stars++; ; break;} -case 49: -#line 378 "parse.y" +case 51: +#line 389 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + 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" +{ + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + ; + break;} +case 54: +#line 416 "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 55: +#line 428 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 56: +#line 433 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 50: -#line 383 "parse.y" +case 57: +#line 438 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 51: -#line 386 "parse.y" +case 58: +#line 441 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 52: -#line 391 "parse.y" +case 59: +#line 446 "parse.y" { yyval.cbuf=yyvsp[0].cbuf; ; break;} -case 53: -#line 392 "parse.y" +case 60: +#line 447 "parse.y" { yyval.cbuf = NULL; ; break;} -case 54: -#line 396 "parse.y" +case 61: +#line 451 "parse.y" { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp(yyvsp[-8].id,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-8].id,"last")==0) - sigtype = SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-8].id); - YYERROR; - } - g_free(yyvsp[-8].id); - if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line,ccode_line); + push_function(yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 55: -#line 417 "parse.y" +case 62: +#line 461 "parse.y" { if(!has_self) { - yyerror(_("signal without 'self' as " + yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,ccode_line); + push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 56: -#line 426 "parse.y" +case 63: +#line 471 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1332,104 +1452,86 @@ case 56: YYERROR; } push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line); + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, + ccode_line,vararg); ; break;} -case 57: -#line 435 "parse.y" +case 64: +#line 481 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line,yyvsp[-1].line); + yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, + yyvsp[-11].line,yyvsp[-1].line, + vararg); ; break;} -case 58: -#line 439 "parse.y" +case 65: +#line 487 "parse.y" { push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 59: -#line 443 "parse.y" +case 66: +#line 492 "parse.y" { push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 60: -#line 447 "parse.y" +case 67: +#line 497 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); - push_function(INIT_METHOD, NULL, yyvsp[-4].id, - NULL, NULL,yyvsp[-3].line,0); + 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_init_arg(yyvsp[-2].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0); + push_function(CLASS_INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, + ccode_line,FALSE); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); + g_string_free(yyvsp[-2].cbuf,TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 61: -#line 463 "parse.y" -{ - if(strcmp(yyvsp[-5].id,"init")==0) { - push_init_arg(yyvsp[-3].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line); - } else if(strcmp(yyvsp[-5].id,"class_init")==0) { - push_init_arg(yyvsp[-3].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line); - } else { - g_free(yyvsp[-5].id); - g_free(yyvsp[-3].id); - g_string_free(yyvsp[-3].cbuf,TRUE); - yyerror(_("parse error")); - YYERROR; - } - ; - break;} -case 62: -#line 484 "parse.y" +case 68: +#line 518 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 63: -#line 485 "parse.y" +case 69: +#line 519 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 64: -#line 489 "parse.y" +case 70: +#line 523 "parse.y" { ; ; break;} -case 65: -#line 490 "parse.y" +case 71: +#line 524 "parse.y" { yyval.id = NULL; ; break;} -case 66: -#line 495 "parse.y" -{ has_self = FALSE; ; +case 72: +#line 527 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 67: -#line 496 "parse.y" +case 73: +#line 528 "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); @@ -1438,16 +1540,11 @@ case 67: } ; break;} -case 68: -#line 511 "parse.y" +case 74: +#line 539 "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); @@ -1456,26 +1553,34 @@ case 68: } ; break;} -case 69: -#line 526 "parse.y" +case 75: +#line 549 "parse.y" { has_self = FALSE; ; break;} -case 70: -#line 529 "parse.y" +case 76: +#line 552 "parse.y" +{ vararg = TRUE; ; + break;} +case 77: +#line 553 "parse.y" +{ vararg = FALSE; ; + break;} +case 78: +#line 556 "parse.y" { ; ; break;} -case 71: -#line 530 "parse.y" +case 79: +#line 557 "parse.y" { ; ; break;} -case 72: -#line 533 "parse.y" +case 80: +#line 560 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 73: -#line 536 "parse.y" +case 81: +#line 563 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1485,16 +1590,16 @@ case 73: push_funcarg(yyvsp[-4].id); ; break;} -case 74: -#line 546 "parse.y" +case 82: +#line 573 "parse.y" { ; ; break;} -case 75: -#line 547 "parse.y" +case 83: +#line 574 "parse.y" { ; ; break;} -case 76: -#line 550 "parse.y" +case 84: +#line 577 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1509,66 +1614,66 @@ case 76: g_free(yyvsp[0].id); ; break;} -case 77: -#line 563 "parse.y" +case 85: +#line 590 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 78: -#line 567 "parse.y" +case 86: +#line 594 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 79: -#line 571 "parse.y" +case 87: +#line 598 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 80: -#line 575 "parse.y" +case 88: +#line 602 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 81: -#line 579 "parse.y" +case 89: +#line 606 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 82: -#line 583 "parse.y" +case 90: +#line 610 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 83: -#line 589 "parse.y" +case 91: +#line 616 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 84: -#line 590 "parse.y" +case 92: +#line 617 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 85: -#line 594 "parse.y" +case 93: +#line 621 "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; @@ -1763,6 +1868,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 597 "parse.y" +#line 624 "parse.y"