X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/daead564b9592e78d418deb56a211cd5ea399f76..64034bc2613afefb289d1450411e69a0de4bce4e:/src/parse.c?ds=sidebyside diff --git a/src/parse.c b/src/parse.c index e50c96b..83fc42c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -7,20 +7,20 @@ #define CLASS 258 #define FROM 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 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 @@ -59,6 +59,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 +109,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 +122,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,7 +173,7 @@ push_self(char *id) } -#line 159 "parse.y" +#line 160 "parse.y" typedef union { char *id; GString *cbuf; @@ -193,11 +194,11 @@ typedef union { -#define YYFINAL 187 +#define YYFINAL 192 #define YYFLAG -32768 #define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 70) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 72) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -235,62 +236,64 @@ static const char yytranslate[] = { 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, 156, 160, 162, 165, 167, 178, 188, 197, 210, + 220, 230, 236, 243, 246, 250, 253, 254, 256, 258, + 262, 264, 268, 270, 274, 276, 279, 286, 289, 291, + 293, 296, 299, 303, 307, 311, 315, 317, 320 }; 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, 63, 0, 49, 50, 0, 49, 51, 0, + 63, 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, + 20, 34, 61, 35, 0, 61, 38, 20, 0, 20, + 0, 31, 23, 0, 33, 0, 29, 20, 60, 54, + 20, 34, 65, 35, 64, 62, 0, 29, 60, 54, + 20, 34, 65, 35, 64, 62, 0, 28, 54, 20, + 34, 65, 35, 64, 62, 0, 30, 34, 22, 35, + 54, 20, 34, 65, 35, 64, 31, 23, 0, 25, + 54, 20, 34, 65, 35, 64, 31, 23, 0, 26, + 54, 20, 34, 65, 35, 64, 31, 23, 0, 20, + 34, 20, 35, 33, 0, 20, 34, 20, 35, 31, + 23, 0, 19, 71, 0, 19, 31, 23, 0, 39, + 40, 0, 0, 6, 0, 20, 0, 20, 38, 66, + 0, 66, 0, 67, 38, 10, 0, 67, 0, 67, + 38, 68, 0, 68, 0, 54, 20, 0, 54, 20, + 34, 20, 69, 35, 0, 69, 70, 0, 70, 0, + 20, 0, 41, 71, 0, 42, 71, 0, 41, 39, + 71, 0, 42, 39, 71, 0, 39, 39, 71, 0, + 43, 39, 71, 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 + 178, 179, 180, 181, 184, 188, 192, 196, 202, 209, + 214, 215, 216, 217, 218, 219, 222, 225, 229, 258, + 284, 285, 288, 291, 297, 298, 306, 310, 317, 320, + 323, 326, 329, 332, 335, 338, 341, 344, 348, 351, + 356, 359, 362, 365, 368, 373, 376, 379, 384, 385, + 388, 393, 396, 401, 402, 406, 428, 438, 448, 454, + 459, 464, 482, 503, 504, 508, 509, 512, 513, 528, + 543, 546, 547, 550, 551, 554, 557, 567, 568, 571, + 584, 588, 592, 596, 600, 604, 610, 611, 615 }; #endif @@ -298,153 +301,157 @@ 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","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, 61, 61, 62, 62, 63, 63, 63, 63, 63, + 63, 63, 63, 64, 64, 64, 64, 65, 65, 65, + 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, + 70, 70, 70, 70, 70, 70, 71, 71, 71 }; 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, + 4, 3, 1, 2, 1, 10, 9, 8, 12, 9, + 9, 5, 6, 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, 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, 0, + 0, 17, 0, 49, 18, 0, 0, 21, 0, 0, + 53, 0, 0, 0, 0, 0, 62, 40, 37, 0, + 0, 71, 73, 75, 0, 23, 0, 0, 51, 0, + 0, 0, 0, 63, 0, 76, 67, 0, 67, 0, + 67, 52, 0, 0, 0, 70, 0, 0, 0, 0, + 72, 74, 0, 0, 0, 0, 67, 0, 0, 89, + 87, 0, 0, 64, 66, 0, 0, 0, 20, 0, + 55, 58, 67, 0, 0, 80, 0, 0, 0, 0, + 0, 79, 65, 88, 60, 61, 0, 54, 0, 57, + 67, 0, 0, 81, 0, 82, 0, 77, 78, 0, + 56, 0, 85, 83, 84, 86, 19, 0, 59, 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[] = { 190, + 4, 5, 6, 22, 23, 24, 50, 73, 100, 44, + 45, 46, 47, 69, 53, 92, 152, 25, 130, 101, + 102, 103, 104, 161, 162, 144 }; -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[] = { 32, + 81,-32768,-32768, 36, 53, -15, 108,-32768,-32768, 53, + 137, 138, 92, 137, 87, 93, 93, 96, 93, 3, + 98, 127,-32768,-32768,-32768,-32768, 118, 128,-32768,-32768, +-32768,-32768, 60, 156, 134, 136,-32768,-32768,-32768,-32768, +-32768,-32768, 157,-32768, 125,-32768, 158, 159, 160, 161, + 162, -2, 93, 163,-32768,-32768,-32768,-32768, 148,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 19, 125,-32768,-32768, + 139, 150, 149, 167, 154, 155, 170, 93, 171, 164, + 10,-32768, 111,-32768,-32768, 111, 160,-32768, 172, 111, +-32768, 23, 173, 166, 93, 174,-32768, 168, 28, 175, + 169,-32768, 176,-32768, 177,-32768, 165, 178,-32768, 181, + 182, 111, 185,-32768, 93, 183, -11, 75, -11, 179, + -11,-32768, 111, 180, 184,-32768, 186, -14, 187, 188, +-32768,-32768, 189, -7, 63, 190, -11, 111, 29,-32768, +-32768, 198, 201,-32768,-32768, 200, 203, 193,-32768, 205, +-32768,-32768, -11, 63, 194,-32768, 191, -10, -6, 192, + 5,-32768,-32768,-32768,-32768,-32768, 209,-32768, 63,-32768, + -11, 1, 1,-32768, 1,-32768, 1,-32768,-32768, 202, +-32768, 206,-32768,-32768,-32768,-32768,-32768, 210,-32768, 207, + 208,-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 + 14, 230,-32768,-32768, 214, 216,-32768, 107, -16, 211, +-32768, 142,-32768, 130, 195,-32768, -142, 218, -117, -81, + 94,-32768, 123,-32768, 49, -108 }; -#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 247 + + +static const short yytable[] = { 43, + 48, 133, 51, 135, 105, 140, 141, 128, 108, 140, + 141, 170, 148, 140, 141, 12, 142, 76, 11, 154, + 140, 141, 52, 14, 156, 149, 181, 129, 173, 143, + 124, 77, 175, 143, 1, 169, 79, 143, 1, 178, + 96, 136, 97, 157, 143, 158, 159, 160, 156, 174, + 176, 82, 83, 182, 2, 3, 155, 109, 8, 9, + 110, 93, -69, 183, 184, 115, 185, 157, 186, 158, + 159, 160, 35, 36, 37, 2, 3, 61, 113, 28, + 29, 30, 31, 32, 131, 33, 34, 35, 36, 37, + 38, 39, 40, 150, 41, 151, 42, 28, 29, 30, + 31, 32, 7, 33, 34, 35, 36, 37, 38, 39, + 40, 13, 41, 26, 42, 28, 98, 30, 31, 32, + 27, 33, 34, 35, 36, 37, 38, 39, 40, 49, + 99, 54, 42, 29, 30, 31, 32, 59, 33, 34, + 35, 36, 37, 38, 39, 40, 15, 41, 65, 42, + 66, 16, 17, 18, 19, 20, 21, 15, 55, 8, + 9, 68, 16, 17, 18, 19, 20, 21, 35, 36, + 37, 85, 86, 63, 62, 64, 67, 70, 71, 72, + 74, 75, 81, 88, 80, 87, 89, 90, 77, 91, + 94, 107, 111, 106, 116, 120, 114, 84, 95, 112, + 122, 134, -68, 117, 125, 139, 191, 192, 126, 179, + 0, 119, 121, 118, 137, 123, 127, 138, 146, 147, + 163, 164, 165, 167, 153, 166, 145, 168, 171, 172, + 177, 180, 189, 10, 187, 56, 188, 57, 60, 58, + 132, 0, 0, 0, 0, 0, 78 }; 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, 119, 19, 121, 86, 20, 21, 19, 90, 20, + 21, 154, 20, 20, 21, 31, 31, 20, 5, 137, + 20, 21, 20, 10, 20, 33, 169, 39, 39, 44, + 112, 34, 39, 44, 3, 153, 53, 44, 3, 35, + 31, 123, 33, 39, 44, 41, 42, 43, 20, 158, + 159, 33, 34, 171, 23, 24, 138, 35, 23, 24, + 38, 78, 35, 172, 173, 38, 175, 39, 177, 41, + 42, 43, 13, 14, 15, 23, 24, 18, 95, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 31, 20, 33, 22, 5, 6, 7, + 8, 9, 22, 11, 12, 13, 14, 15, 16, 17, + 18, 4, 20, 22, 22, 5, 6, 7, 8, 9, + 34, 11, 12, 13, 14, 15, 16, 17, 18, 34, + 20, 34, 22, 6, 7, 8, 9, 20, 11, 12, + 13, 14, 15, 16, 17, 18, 20, 20, 15, 22, + 15, 25, 26, 27, 28, 29, 30, 20, 32, 23, + 24, 37, 25, 26, 27, 28, 29, 30, 13, 14, + 15, 33, 34, 18, 33, 34, 20, 20, 20, 20, + 20, 20, 35, 35, 22, 36, 20, 34, 34, 20, + 20, 20, 20, 87, 20, 31, 23, 68, 35, 34, + 20, 23, 35, 35, 20, 20, 0, 0, 115, 161, + -1, 35, 35, 38, 35, 34, 34, 34, 31, 31, + 23, 21, 23, 31, 35, 23, 40, 23, 35, 39, + 39, 23, 23, 4, 33, 22, 31, 22, 28, 22, + 118, -1, -1, -1, -1, -1, 52 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -945,51 +952,51 @@ yyreduce: switch (yyn) { case 1: -#line 177 "parse.y" +#line 178 "parse.y" { ; ; break;} case 2: -#line 178 "parse.y" +#line 179 "parse.y" { ; ; break;} case 3: -#line 179 "parse.y" +#line 180 "parse.y" { ; ; break;} case 4: -#line 180 "parse.y" +#line 181 "parse.y" { ; ; break;} case 5: -#line 183 "parse.y" +#line 184 "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 188 "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 192 "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 196 "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 202 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -997,49 +1004,49 @@ case 9: ; break;} case 10: -#line 208 "parse.y" +#line 209 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 213 "parse.y" +#line 214 "parse.y" { ; ; break;} case 12: -#line 214 "parse.y" +#line 215 "parse.y" { ; ; break;} case 13: -#line 215 "parse.y" +#line 216 "parse.y" { ; ; break;} case 14: -#line 216 "parse.y" +#line 217 "parse.y" { ; ; break;} case 15: -#line 217 "parse.y" +#line 218 "parse.y" { ; ; break;} case 16: -#line 218 "parse.y" +#line 219 "parse.y" { ; ; break;} case 17: -#line 221 "parse.y" +#line 222 "parse.y" { push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); ; break;} case 18: -#line 224 "parse.y" +#line 225 "parse.y" { push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); ; break;} case 19: -#line 228 "parse.y" +#line 229 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1071,7 +1078,7 @@ case 19: ; break;} case 20: -#line 257 "parse.y" +#line 258 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1098,197 +1105,210 @@ case 20: ; break;} case 21: -#line 283 "parse.y" +#line 284 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 22: -#line 284 "parse.y" +#line 285 "parse.y" { yyval.list = NULL; ; break;} case 23: -#line 287 "parse.y" +#line 288 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 24: -#line 290 "parse.y" +#line 291 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 25: -#line 296 "parse.y" +#line 297 "parse.y" +{ ; ; + break;} +case 26: +#line 298 "parse.y" +{ + Type *type = typestack->data; + char *oldname = type->name; + type->name = g_strconcat("const ",oldname,NULL); + g_free(oldname); + ; + break;} +case 27: +#line 306 "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 310 "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 317 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 28: -#line 310 "parse.y" +case 30: +#line 320 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 29: -#line 313 "parse.y" +case 31: +#line 323 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 30: -#line 316 "parse.y" +case 32: +#line 326 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 31: -#line 319 "parse.y" +case 33: +#line 329 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 32: -#line 322 "parse.y" +case 34: +#line 332 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 33: -#line 325 "parse.y" +case 35: +#line 335 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 34: -#line 328 "parse.y" +case 36: +#line 338 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 35: -#line 331 "parse.y" +case 37: +#line 341 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 36: -#line 334 "parse.y" +case 38: +#line 344 "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 348 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 341 "parse.y" +case 40: +#line 351 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 39: -#line 346 "parse.y" +case 41: +#line 356 "parse.y" { yyval.id = "long int"; ; break;} -case 40: -#line 349 "parse.y" +case 42: +#line 359 "parse.y" { yyval.id = "long"; ; break;} -case 41: -#line 352 "parse.y" +case 43: +#line 362 "parse.y" { yyval.id = "short int"; ; break;} -case 42: -#line 355 "parse.y" +case 44: +#line 365 "parse.y" { yyval.id = "short"; ; break;} -case 43: -#line 358 "parse.y" +case 45: +#line 368 "parse.y" { yyval.id = "int"; ; break;} -case 44: -#line 363 "parse.y" +case 46: +#line 373 "parse.y" { yyval.id = "enum "; ; break;} -case 45: -#line 366 "parse.y" +case 47: +#line 376 "parse.y" { yyval.id = "union "; ; break;} -case 46: -#line 369 "parse.y" +case 48: +#line 379 "parse.y" { yyval.id = "struct "; ; break;} -case 47: -#line 374 "parse.y" +case 49: +#line 384 "parse.y" { stars++; ; break;} -case 48: -#line 375 "parse.y" +case 50: +#line 385 "parse.y" { stars++; ; break;} -case 49: -#line 378 "parse.y" +case 51: +#line 388 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 50: -#line 383 "parse.y" +case 52: +#line 393 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 51: -#line 386 "parse.y" +case 53: +#line 396 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 52: -#line 391 "parse.y" +case 54: +#line 401 "parse.y" { yyval.cbuf=yyvsp[0].cbuf; ; break;} -case 53: -#line 392 "parse.y" +case 55: +#line 402 "parse.y" { yyval.cbuf = NULL; ; break;} -case 54: -#line 396 "parse.y" +case 56: +#line 406 "parse.y" { int sigtype = SIGNAL_LAST_METHOD; if(strcmp(yyvsp[-8].id,"first")==0) @@ -1308,11 +1328,12 @@ case 54: YYERROR; } push_function(sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line,ccode_line); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + ccode_line,vararg); ; break;} -case 55: -#line 417 "parse.y" +case 57: +#line 428 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1320,11 +1341,12 @@ case 55: YYERROR; } push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,ccode_line); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 56: -#line 426 "parse.y" +case 58: +#line 438 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1332,41 +1354,48 @@ 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 59: +#line 448 "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 60: +#line 454 "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 61: +#line 459 "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 62: +#line 464 "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); + NULL, NULL,yyvsp[-3].line,0, + 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); + yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0, + FALSE); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); @@ -1375,19 +1404,19 @@ case 60: } ; break;} -case 61: -#line 463 "parse.y" +case 63: +#line 482 "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); + yyvsp[-1].line,FALSE); } 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); + yyvsp[-1].line,FALSE); } else { g_free(yyvsp[-5].id); g_free(yyvsp[-3].id); @@ -1397,31 +1426,31 @@ case 61: } ; break;} -case 62: -#line 484 "parse.y" +case 64: +#line 503 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 63: -#line 485 "parse.y" +case 65: +#line 504 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 64: -#line 489 "parse.y" +case 66: +#line 508 "parse.y" { ; ; break;} -case 65: -#line 490 "parse.y" +case 67: +#line 509 "parse.y" { yyval.id = NULL; ; break;} -case 66: -#line 495 "parse.y" +case 68: +#line 512 "parse.y" { has_self = FALSE; ; break;} -case 67: -#line 496 "parse.y" +case 69: +#line 513 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[0].id,"this")==0) { @@ -1438,8 +1467,8 @@ case 67: } ; break;} -case 68: -#line 511 "parse.y" +case 70: +#line 528 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"this")==0) { @@ -1456,26 +1485,34 @@ case 68: } ; break;} -case 69: -#line 526 "parse.y" +case 71: +#line 543 "parse.y" { has_self = FALSE; ; break;} -case 70: -#line 529 "parse.y" +case 72: +#line 546 "parse.y" +{ vararg = TRUE; ; + break;} +case 73: +#line 547 "parse.y" +{ vararg = FALSE; ; + break;} +case 74: +#line 550 "parse.y" { ; ; break;} -case 71: -#line 530 "parse.y" +case 75: +#line 551 "parse.y" { ; ; break;} -case 72: -#line 533 "parse.y" +case 76: +#line 554 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 73: -#line 536 "parse.y" +case 77: +#line 557 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1485,16 +1522,16 @@ case 73: push_funcarg(yyvsp[-4].id); ; break;} -case 74: -#line 546 "parse.y" +case 78: +#line 567 "parse.y" { ; ; break;} -case 75: -#line 547 "parse.y" +case 79: +#line 568 "parse.y" { ; ; break;} -case 76: -#line 550 "parse.y" +case 80: +#line 571 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1509,61 +1546,61 @@ case 76: g_free(yyvsp[0].id); ; break;} -case 77: -#line 563 "parse.y" +case 81: +#line 584 "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 82: +#line 588 "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 83: +#line 592 "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 84: +#line 596 "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 85: +#line 600 "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 86: +#line 604 "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 87: +#line 610 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 84: -#line 590 "parse.y" +case 88: +#line 611 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 85: -#line 594 "parse.y" +case 89: +#line 615 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1764,5 +1801,5 @@ yyerrhandle: yystate = yyn; goto yynewstate; } -#line 597 "parse.y" +#line 618 "parse.y"