X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/774037b15064dcc6e4995c0bba3b24abb1bde35f..e10d6e307623d0952f6e1f5d9fee8720ddab4808:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 783037d..8aa1e4b 100644 --- a/src/parse.c +++ b/src/parse.c @@ -26,14 +26,16 @@ #define TYPETOKEN 276 #define ARRAY_DIM 277 #define CCODE 278 -#define HCODE 279 -#define PUBLIC 280 -#define PRIVATE 281 -#define PROTECTED 282 -#define ARGUMENT 283 -#define VIRTUAL 284 -#define SIGNAL 285 -#define OVERRIDE 286 +#define HTCODE 279 +#define PHCODE 280 +#define HCODE 281 +#define PUBLIC 282 +#define PRIVATE 283 +#define PROTECTED 284 +#define ARGUMENT 285 +#define VIRTUAL 286 +#define SIGNAL 287 +#define OVERRIDE 288 #line 21 "parse.y" @@ -45,11 +47,10 @@ #include "tree.h" #include "main.h" +#include "util.h" #define _(x) (x) -extern char *filename; - GList *nodes = NULL; static GList *class_nodes = NULL; @@ -216,7 +217,7 @@ push_self(char *id) } -#line 202 "parse.y" +#line 201 "parse.y" typedef union { char *id; GString *cbuf; @@ -238,26 +239,26 @@ typedef union { -#define YYFINAL 219 +#define YYFINAL 221 #define YYFLAG -32768 -#define YYNTBASE 46 +#define YYNTBASE 48 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 77) +#define YYTRANSLATE(x) ((unsigned)(x) <= 288 ? yytranslate[x] : 80) 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, 44, 2, 2, 2, 2, 2, 2, 36, - 37, 39, 2, 40, 45, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 35, 42, - 43, 41, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 46, 2, 2, 2, 2, 2, 2, 38, + 39, 41, 2, 42, 47, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 37, 44, + 45, 43, 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, 33, 38, 34, 2, 2, 2, 2, 2, + 2, 2, 35, 40, 36, 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, @@ -273,79 +274,80 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32 + 27, 28, 29, 30, 31, 32, 33, 34 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, - 0, 4, 7, 10, 12, 15, 18, 20, 22, 27, - 31, 36, 39, 42, 45, 47, 49, 51, 53, 55, - 57, 62, 68, 80, 89, 95, 97, 101, 102, 106, - 108, 110, 113, 115, 118, 121, 124, 126, 129, 132, - 134, 136, 138, 140, 143, 145, 147, 150, 152, 155, - 157, 159, 161, 163, 165, 168, 170, 173, 175, 179, - 183, 186, 188, 193, 197, 199, 202, 204, 214, 225, - 235, 245, 254, 266, 275, 281, 284, 288, 289, 291, - 293, 297, 299, 303, 305, 309, 311, 314, 318, 325, - 333, 336, 338, 340, 343, 346, 350, 354, 358, 362, - 364, 367 + 0, 4, 7, 10, 12, 14, 16, 18, 20, 23, + 25, 30, 34, 39, 42, 45, 48, 50, 52, 54, + 56, 58, 60, 65, 71, 83, 92, 98, 100, 104, + 105, 109, 111, 113, 116, 118, 121, 124, 127, 129, + 132, 135, 137, 139, 141, 143, 146, 148, 150, 153, + 155, 158, 160, 162, 164, 166, 168, 171, 173, 176, + 178, 182, 186, 189, 191, 196, 200, 202, 205, 207, + 217, 228, 238, 248, 257, 269, 278, 284, 287, 291, + 292, 294, 296, 300, 302, 306, 308, 312, 314, 317, + 321, 328, 336, 339, 341, 343, 346, 349, 353, 357, + 361, 365, 367, 370 }; -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, 33, 50, 34, 0, 49, 33, 34, 0, - 3, 22, 4, 22, 0, 50, 68, 0, 50, 52, - 0, 50, 53, 0, 68, 0, 52, 0, 53, 0, - 26, 0, 27, 0, 28, 0, 51, 57, 20, 35, - 0, 51, 57, 20, 23, 35, 0, 29, 55, 54, - 20, 20, 33, 24, 20, 33, 24, 35, 0, 29, - 55, 54, 20, 20, 33, 24, 35, 0, 20, 36, - 20, 57, 37, 0, 20, 0, 36, 56, 37, 0, - 0, 20, 38, 56, 0, 20, 0, 58, 0, 5, - 58, 0, 59, 0, 59, 62, 0, 12, 60, 0, - 11, 60, 0, 60, 0, 12, 18, 0, 11, 18, - 0, 18, 0, 17, 0, 16, 0, 20, 0, 61, - 20, 0, 22, 0, 6, 0, 13, 15, 0, 13, - 0, 14, 15, 0, 14, 0, 15, 0, 9, 0, - 8, 0, 7, 0, 39, 62, 0, 39, 0, 20, - 65, 0, 65, 0, 51, 20, 65, 0, 20, 51, - 65, 0, 51, 65, 0, 63, 0, 20, 36, 66, - 37, 0, 66, 40, 20, 0, 20, 0, 33, 24, - 0, 35, 0, 31, 64, 57, 20, 36, 70, 37, - 69, 67, 0, 51, 31, 63, 57, 20, 36, 70, - 37, 69, 67, 0, 30, 51, 57, 20, 36, 70, - 37, 69, 67, 0, 51, 30, 57, 20, 36, 70, - 37, 69, 67, 0, 30, 57, 20, 36, 70, 37, - 69, 67, 0, 32, 36, 22, 37, 57, 20, 36, - 70, 37, 69, 67, 0, 51, 57, 20, 36, 70, - 37, 69, 67, 0, 20, 36, 20, 37, 67, 0, - 19, 76, 0, 19, 33, 24, 0, 0, 6, 0, - 20, 0, 20, 40, 71, 0, 71, 0, 72, 40, - 10, 0, 72, 0, 72, 40, 73, 0, 73, 0, - 57, 20, 0, 57, 20, 23, 0, 57, 20, 36, - 20, 74, 37, 0, 57, 20, 23, 36, 20, 74, - 37, 0, 74, 75, 0, 75, 0, 20, 0, 41, - 76, 0, 42, 76, 0, 41, 43, 76, 0, 42, - 43, 76, 0, 43, 43, 76, 0, 44, 43, 76, - 0, 21, 0, 45, 21, 0, 20, 0 +static const short yyrhs[] = { 50, + 51, 50, 0, 51, 50, 0, 50, 51, 0, 51, + 0, 24, 0, 27, 0, 25, 0, 26, 0, 50, + 49, 0, 49, 0, 52, 35, 53, 36, 0, 52, + 35, 36, 0, 3, 22, 4, 22, 0, 53, 71, + 0, 53, 55, 0, 53, 56, 0, 71, 0, 55, + 0, 56, 0, 28, 0, 29, 0, 30, 0, 54, + 60, 20, 37, 0, 54, 60, 20, 23, 37, 0, + 31, 58, 57, 20, 20, 35, 24, 20, 35, 24, + 37, 0, 31, 58, 57, 20, 20, 35, 24, 37, + 0, 20, 38, 20, 60, 39, 0, 20, 0, 38, + 59, 39, 0, 0, 20, 40, 59, 0, 20, 0, + 61, 0, 5, 61, 0, 62, 0, 62, 65, 0, + 12, 63, 0, 11, 63, 0, 63, 0, 12, 18, + 0, 11, 18, 0, 18, 0, 17, 0, 16, 0, + 20, 0, 64, 20, 0, 22, 0, 6, 0, 13, + 15, 0, 13, 0, 14, 15, 0, 14, 0, 15, + 0, 9, 0, 8, 0, 7, 0, 41, 65, 0, + 41, 0, 20, 68, 0, 68, 0, 54, 20, 68, + 0, 20, 54, 68, 0, 54, 68, 0, 66, 0, + 20, 38, 69, 39, 0, 69, 42, 20, 0, 20, + 0, 35, 24, 0, 37, 0, 33, 67, 60, 20, + 38, 73, 39, 72, 70, 0, 54, 33, 66, 60, + 20, 38, 73, 39, 72, 70, 0, 32, 54, 60, + 20, 38, 73, 39, 72, 70, 0, 54, 32, 60, + 20, 38, 73, 39, 72, 70, 0, 32, 60, 20, + 38, 73, 39, 72, 70, 0, 34, 38, 22, 39, + 60, 20, 38, 73, 39, 72, 70, 0, 54, 60, + 20, 38, 73, 39, 72, 70, 0, 20, 38, 20, + 39, 70, 0, 19, 79, 0, 19, 35, 24, 0, + 0, 6, 0, 20, 0, 20, 42, 74, 0, 74, + 0, 75, 42, 10, 0, 75, 0, 75, 42, 76, + 0, 76, 0, 60, 20, 0, 60, 20, 23, 0, + 60, 20, 38, 20, 77, 39, 0, 60, 20, 23, + 38, 20, 77, 39, 0, 77, 78, 0, 78, 0, + 20, 0, 43, 79, 0, 44, 79, 0, 43, 45, + 79, 0, 44, 45, 79, 0, 45, 45, 79, 0, + 46, 45, 79, 0, 21, 0, 47, 21, 0, 20, + 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 221, 222, 223, 224, 227, 233, 238, 244, 251, 256, - 263, 268, 269, 270, 271, 272, 273, 276, 277, 278, - 281, 284, 288, 323, 353, 362, 368, 369, 372, 375, - 381, 382, 390, 394, 401, 404, 407, 410, 413, 416, - 419, 422, 425, 428, 432, 435, 440, 443, 446, 449, - 452, 457, 460, 463, 468, 469, 473, 485, 491, 503, - 515, 518, 524, 529, 532, 537, 538, 542, 552, 562, - 572, 582, 592, 598, 603, 624, 625, 629, 632, 633, - 644, 654, 657, 658, 661, 662, 665, 668, 671, 679, - 689, 690, 693, 706, 710, 714, 718, 722, 726, 732, - 733, 737 + 220, 221, 222, 223, 226, 232, 238, 244, 252, 253, + 256, 261, 268, 273, 274, 275, 276, 277, 278, 281, + 282, 283, 286, 289, 293, 328, 358, 367, 373, 374, + 377, 380, 386, 387, 395, 399, 406, 409, 412, 415, + 418, 421, 424, 427, 430, 433, 437, 440, 445, 448, + 451, 454, 457, 462, 465, 468, 473, 474, 478, 490, + 496, 508, 520, 523, 529, 534, 537, 542, 543, 547, + 557, 567, 577, 587, 597, 603, 608, 629, 630, 634, + 637, 638, 649, 659, 662, 663, 666, 667, 670, 673, + 676, 684, 694, 695, 698, 711, 715, 719, 723, 727, + 731, 737, 738, 742 }; #endif @@ -355,178 +357,188 @@ 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", -"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","PROTECTED","ARGUMENT","VIRTUAL", -"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'", -"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable", -"argument","argtype","argflags","flaglist","type","type1","type2","integer", -"tspecifier","stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode", -"method","onerror","funcargs","arglist","arglist1","arg","checklist","check", -"numtok", NULL +"ARRAY_DIM","CCODE","HTCODE","PHCODE","HCODE","PUBLIC","PRIVATE","PROTECTED", +"ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'", +"'*'","','","'>'","'<'","'='","'!'","'-'","prog","ccode","ccodes","class","classdec", +"classcode","scope","variable","argument","argtype","argflags","flaglist","type", +"type1","type2","integer","tspecifier","stars","simplesigtype","fullsigtype", +"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1", +"arg","checklist","check","numtok", NULL }; #endif static const short yyr1[] = { 0, - 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, - 49, 50, 50, 50, 50, 50, 50, 51, 51, 51, - 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, - 57, 57, 58, 58, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 60, 60, 60, 60, - 60, 61, 61, 61, 62, 62, 63, 63, 64, 64, - 64, 64, 65, 66, 66, 67, 67, 68, 68, 68, - 68, 68, 68, 68, 68, 69, 69, 69, 70, 70, - 70, 70, 71, 71, 72, 72, 73, 73, 73, 73, - 74, 74, 75, 75, 75, 75, 75, 75, 75, 76, - 76, 76 + 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, + 51, 51, 52, 53, 53, 53, 53, 53, 53, 54, + 54, 54, 55, 55, 56, 56, 57, 57, 58, 58, + 59, 59, 60, 60, 61, 61, 62, 62, 62, 62, + 62, 62, 62, 62, 62, 62, 62, 62, 63, 63, + 63, 63, 63, 64, 64, 64, 65, 65, 66, 66, + 67, 67, 67, 67, 68, 69, 69, 70, 70, 71, + 71, 71, 71, 71, 71, 71, 71, 72, 72, 72, + 73, 73, 73, 73, 74, 74, 75, 75, 76, 76, + 76, 76, 77, 77, 78, 78, 78, 78, 78, 78, + 78, 79, 79, 79 }; static const short yyr2[] = { 0, - 3, 2, 2, 1, 2, 2, 1, 1, 4, 3, - 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 4, 5, 11, 8, 5, 1, 3, 0, 3, 1, - 1, 2, 1, 2, 2, 2, 1, 2, 2, 1, - 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, - 1, 1, 1, 1, 2, 1, 2, 1, 3, 3, - 2, 1, 4, 3, 1, 2, 1, 9, 10, 9, - 9, 8, 11, 8, 5, 2, 3, 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 + 3, 2, 2, 1, 1, 1, 1, 1, 2, 1, + 4, 3, 4, 2, 2, 2, 1, 1, 1, 1, + 1, 1, 4, 5, 11, 8, 5, 1, 3, 0, + 3, 1, 1, 2, 1, 2, 2, 2, 1, 2, + 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, + 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, + 3, 3, 2, 1, 4, 3, 1, 2, 1, 9, + 10, 9, 9, 8, 11, 8, 5, 2, 3, 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, 18, 19, 20, 28, 0, - 0, 0, 10, 0, 0, 16, 17, 15, 11, 0, - 0, 0, 0, 46, 54, 53, 52, 0, 0, 48, - 50, 51, 42, 41, 40, 43, 45, 0, 0, 31, - 33, 37, 0, 0, 0, 62, 0, 58, 0, 9, - 13, 14, 12, 0, 0, 0, 0, 30, 0, 26, - 0, 32, 39, 36, 38, 35, 47, 49, 0, 0, - 56, 34, 44, 0, 0, 0, 57, 0, 61, 0, - 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, - 0, 0, 55, 65, 0, 60, 59, 0, 0, 0, - 0, 0, 21, 0, 0, 67, 75, 29, 0, 0, - 0, 46, 43, 0, 0, 82, 84, 86, 63, 0, - 0, 0, 0, 0, 22, 0, 66, 0, 0, 0, - 0, 87, 78, 0, 64, 0, 0, 0, 0, 78, - 25, 0, 78, 81, 88, 0, 0, 0, 83, 85, - 78, 0, 78, 0, 0, 0, 24, 0, 0, 0, - 102, 100, 0, 0, 76, 72, 0, 0, 0, 78, - 74, 0, 70, 0, 93, 0, 0, 0, 0, 0, - 92, 77, 101, 68, 78, 71, 0, 0, 0, 0, - 94, 0, 95, 0, 0, 89, 91, 0, 69, 23, - 90, 96, 97, 98, 99, 73, 0, 0, 0 + 0, 5, 7, 8, 6, 10, 0, 4, 0, 0, + 9, 3, 2, 0, 0, 1, 0, 20, 21, 22, + 30, 0, 0, 0, 12, 0, 0, 18, 19, 17, + 13, 0, 0, 0, 0, 48, 56, 55, 54, 0, + 0, 50, 52, 53, 44, 43, 42, 45, 47, 0, + 0, 33, 35, 39, 0, 0, 0, 64, 0, 60, + 0, 11, 15, 16, 14, 0, 0, 0, 0, 32, + 0, 28, 0, 34, 41, 38, 40, 37, 49, 51, + 0, 0, 58, 36, 46, 0, 0, 0, 59, 0, + 63, 0, 0, 0, 0, 0, 0, 0, 0, 29, + 0, 0, 0, 0, 57, 67, 0, 62, 61, 0, + 0, 0, 0, 0, 23, 0, 0, 69, 77, 31, + 0, 0, 0, 48, 45, 0, 0, 84, 86, 88, + 65, 0, 0, 0, 0, 0, 24, 0, 68, 0, + 0, 0, 0, 89, 80, 0, 66, 0, 0, 0, + 0, 80, 27, 0, 80, 83, 90, 0, 0, 0, + 85, 87, 80, 0, 80, 0, 0, 0, 26, 0, + 0, 0, 104, 102, 0, 0, 78, 74, 0, 0, + 0, 80, 76, 0, 72, 0, 95, 0, 0, 0, + 0, 0, 94, 79, 103, 70, 80, 73, 0, 0, + 0, 0, 96, 0, 97, 0, 0, 91, 93, 0, + 71, 25, 92, 98, 99, 100, 101, 75, 0, 0, + 0 }; -static const short yydefgoto[] = { 217, - 4, 5, 6, 24, 25, 26, 27, 71, 32, 69, - 124, 50, 51, 52, 53, 82, 56, 57, 58, 105, - 117, 28, 158, 125, 126, 127, 128, 190, 191, 175 +static const short yydefgoto[] = { 219, + 6, 7, 8, 9, 26, 27, 28, 29, 73, 34, + 71, 126, 52, 53, 54, 55, 84, 58, 59, 60, + 107, 119, 30, 160, 127, 128, 129, 130, 192, 193, + 177 }; -static const short yypact[] = { 69, - -13,-32768,-32768, 73, 89, -19, 17,-32768,-32768, 89, - 125, 216, 11, 125, 6,-32768,-32768,-32768, 46, 115, - 120, 50,-32768, 229, 53,-32768,-32768,-32768,-32768, 68, - 76, 81, 206,-32768,-32768,-32768,-32768, 251, 257, 92, - 110,-32768,-32768,-32768,-32768,-32768,-32768, 171, 131,-32768, - 114,-32768, 135, 205, 152,-32768, 171,-32768, 159,-32768, --32768,-32768,-32768, 171, 154, 170, 155, 161, 173, 172, - 196,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 207, 193, - 114,-32768,-32768, 194, 214, 215,-32768, -10,-32768, 217, - 201, 219, -10, 171, 56, 101, 76,-32768, 220, 231, - 218, 189,-32768,-32768, -5,-32768,-32768, 226, 171, 232, - 233, 238,-32768, 189, 228,-32768,-32768,-32768, 171, 234, - 189, 237, 16, 256, 240,-32768, 239,-32768,-32768, 258, - 189, 260, 189, 245,-32768, 246,-32768, 247, 261, 249, - 171, -7, 263, 153,-32768, 250, 252, 253, 189, 263, --32768, -8, 263,-32768, 255, 269, 10, 101,-32768,-32768, - 263, 189, 263, 259, 101, 262,-32768, 101, 272, 4, --32768,-32768, 270, 276,-32768,-32768, 101, 264, 101, 263, --32768, 274,-32768, 4,-32768, 57, 60, 265, 266, 67, --32768,-32768,-32768,-32768, 263,-32768, 101, 267, 75, 18, --32768, 18,-32768, 18, 18,-32768,-32768, 101,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 293, 299,-32768 +static const short yypact[] = { 21, + -12,-32768,-32768,-32768,-32768,-32768, 21, 238, 0, 39, +-32768, 238, 238, 202, 41, 238, 84,-32768,-32768,-32768, + 100, 112, 117, 101,-32768, 217, 53,-32768,-32768,-32768, +-32768, 74, 81, 123, 203,-32768,-32768,-32768,-32768, 226, + 241, 129, 133,-32768,-32768,-32768,-32768,-32768,-32768, 168, + 130,-32768, 111,-32768, 149, 1, 151,-32768, 168,-32768, + 156,-32768,-32768,-32768,-32768, 168, 167, 169, 157, 165, + 174, 188, 187,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 208, 191, 111,-32768,-32768, 204, 223, 237,-32768, -6, +-32768, 240, 227, 247, -6, 168, 55, 96, 81,-32768, + 248, 249, 232, 186,-32768,-32768, -30,-32768,-32768, 233, + 168, 234, 253, 239,-32768, 186, 250,-32768,-32768,-32768, + 168, 242, 186, 236, 185, 258, 243,-32768, 244,-32768, +-32768, 259, 186, 260, 186, 246,-32768, 251,-32768, 252, + 257, 254, 168, 64, 264, 150,-32768, 255, 261, 256, + 186, 264,-32768, -4, 264,-32768, 262, 265, 56, 96, +-32768,-32768, 264, 186, 264, 263, 96, 266,-32768, 96, + 267, 52,-32768,-32768, 268, 275,-32768,-32768, 96, 269, + 96, 264,-32768, 273,-32768, 52,-32768, 35, 63, 270, + 271, 61,-32768,-32768,-32768,-32768, 264,-32768, 96, 272, + 70, 6,-32768, 6,-32768, 6, 6,-32768,-32768, 96, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 288, 289, +-32768 }; static const short yypgoto[] = {-32768, - 80, 296,-32768,-32768, -18, 279, 280,-32768,-32768, 208, - -20, 273,-32768, 106,-32768, 230, 242,-32768, -36,-32768, - -157, 286, -146, -108, 174,-32768, 168, 129, -84, -48 + 245, 30, 291,-32768,-32768, -20, 277, 278,-32768,-32768, + 206, -22, 276,-32768, 71,-32768, 224, 274,-32768, -38, +-32768, -159, 280, -148, -110, 170,-32768, 164, 126, -113, + -53 }; -#define YYLAST 315 - - -static const short yytable[] = { 49, - 176, 48, 55, 165, 66, 136, 168, 181, 7, 84, - 183, 166, 140, 12, 177, 155, 179, 87, 89, 194, - 13, 196, 146, 185, 148, 85, 167, 79, 156, 171, - 172, 129, 29, 197, 130, 86, 90, 171, 172, 209, - 164, 30, 173, 92, 186, 187, 188, 189, 208, 106, - 216, 107, -80, 178, 174, 141, 87, 33, 34, 35, - 36, 37, 174, 38, 39, 40, 41, 42, 43, 44, - 45, 1, 46, 111, 47, 1, 171, 172, 112, 171, - 172, 31, 64, 65, 11, 59, 185, 67, 132, 14, - 113, 114, 2, 3, 185, 68, 8, 9, 138, 200, - 70, 174, 202, 206, 174, 207, 77, 186, 187, 188, - 189, 211, 2, 3, 207, 186, 187, 188, 189, 33, - 34, 35, 36, 37, 78, 38, 39, 40, 41, 42, - 43, 44, 45, 115, 46, 116, 47, 201, 203, 54, - 16, 17, 18, 74, 76, 16, 17, 18, 8, 9, - 80, 212, 81, 213, 83, 214, 215, 33, 34, 35, - 36, 37, 159, 38, 39, 40, 41, 42, 43, 44, - 45, 88, 46, 93, 47, 33, 34, 35, 36, 37, - 91, 38, 39, 40, 41, 42, 43, 44, 45, 95, - 46, 96, 47, 33, 122, 35, 36, 37, 97, 38, - 39, 40, 41, 42, 43, 44, 45, 99, 123, 98, - 47, 34, 35, 36, 37, 100, 38, 39, 40, 41, - 42, 43, 44, 45, 84, 46, 101, 47, 102, 85, - 16, 17, 18, 104, 84, 15, 108, 109, 110, 119, - 85, 16, 17, 18, 19, 20, 21, 22, 15, 23, - 120, 137, 134, 121, 16, 17, 18, 19, 20, 21, - 22, 131, 60, 40, 41, 42, 139, 133, 73, 40, - 41, 42, 135, -79, 75, 142, 143, 145, 144, 147, - 149, 157, 150, 151, 152, 153, 161, 162, 170, 163, - 169, 184, 218, 192, 182, 180, 193, 198, 219, 10, - 195, 210, 61, 62, 118, 72, 94, 204, 205, 63, - 103, 160, 199, 0, 154 +#define YYLAST 341 + + +static const short yytable[] = { 51, + 178, 50, 57, 167, 68, 138, 170, 183, 131, 10, + 185, 132, 142, 86, 179, 168, 181, 89, 91, 196, + 86, 198, 148, 1, 150, 173, 174, 81, 18, 19, + 20, 87, 169, 199, 14, 88, 92, 13, 87, 211, + 166, 16, 15, 94, 2, 3, 4, 5, 210, 108, + 218, 109, 176, 180, 173, 174, 89, 35, 36, 37, + 38, 39, 31, 40, 41, 42, 43, 44, 45, 46, + 47, 187, 48, 113, 49, 173, 174, 114, 209, 202, + 187, 176, 173, 174, 66, 67, 157, 209, 134, 187, + 175, 115, 116, 69, 188, 189, 190, 191, 140, 208, + 70, 158, 176, 188, 189, 190, 191, 204, 213, 176, + 76, 78, 188, 189, 190, 191, 35, 36, 37, 38, + 39, 32, 40, 41, 42, 43, 44, 45, 46, 47, + 117, 48, 118, 49, 203, 205, 56, 33, 61, 18, + 19, 20, 72, 79, 18, 19, 20, 80, 214, 82, + 215, 83, 216, 217, 35, 36, 37, 38, 39, 161, + 40, 41, 42, 43, 44, 45, 46, 47, 85, 48, + 90, 49, 35, 36, 37, 38, 39, 93, 40, 41, + 42, 43, 44, 45, 46, 47, 95, 48, 97, 49, + 35, 124, 37, 38, 39, 98, 40, 41, 42, 43, + 44, 45, 46, 47, 99, 125, 102, 49, 36, 37, + 38, 39, 100, 40, 41, 42, 43, 44, 45, 46, + 47, 17, 48, -82, 49, 101, 143, 103, 104, 18, + 19, 20, 21, 22, 23, 24, 17, 25, 42, 43, + 44, 87, 106, 75, 18, 19, 20, 21, 22, 23, + 24, 11, 62, 42, 43, 44, 86, 11, 77, 110, + 11, 2, 3, 4, 5, 111, 112, 121, 122, 123, + 133, 135, 136, 139, -81, 137, 141, 144, 147, 149, + 154, 145, 159, 151, 172, 146, 186, 220, 221, 152, + 153, 194, 155, 163, 165, 195, 200, 12, 164, 171, + 184, 182, 63, 64, 120, 65, 105, 197, 212, 162, + 74, 201, 156, 0, 206, 207, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 96 }; -static const short yycheck[] = { 20, - 158, 20, 21, 150, 25, 114, 153, 165, 22, 20, - 168, 20, 121, 33, 161, 23, 163, 54, 55, 177, - 4, 179, 131, 20, 133, 36, 35, 48, 36, 20, - 21, 37, 22, 180, 40, 54, 57, 20, 21, 197, - 149, 36, 33, 64, 41, 42, 43, 44, 195, 86, - 208, 88, 37, 162, 45, 40, 93, 5, 6, 7, - 8, 9, 45, 11, 12, 13, 14, 15, 16, 17, - 18, 3, 20, 94, 22, 3, 20, 21, 23, 20, - 21, 36, 30, 31, 5, 36, 20, 20, 109, 10, - 35, 36, 24, 25, 20, 20, 24, 25, 119, 43, - 20, 45, 43, 37, 45, 190, 15, 41, 42, 43, - 44, 37, 24, 25, 199, 41, 42, 43, 44, 5, - 6, 7, 8, 9, 15, 11, 12, 13, 14, 15, - 16, 17, 18, 33, 20, 35, 22, 186, 187, 20, - 26, 27, 28, 38, 39, 26, 27, 28, 24, 25, - 20, 200, 39, 202, 20, 204, 205, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 20, 20, 20, 22, 5, 6, 7, 8, 9, - 22, 11, 12, 13, 14, 15, 16, 17, 18, 20, - 20, 37, 22, 5, 6, 7, 8, 9, 38, 11, - 12, 13, 14, 15, 16, 17, 18, 36, 20, 37, - 22, 6, 7, 8, 9, 20, 11, 12, 13, 14, - 15, 16, 17, 18, 20, 20, 20, 22, 36, 36, - 26, 27, 28, 20, 20, 20, 20, 37, 20, 20, - 36, 26, 27, 28, 29, 30, 31, 32, 20, 34, - 20, 24, 20, 36, 26, 27, 28, 29, 30, 31, - 32, 36, 34, 13, 14, 15, 33, 36, 18, 13, - 14, 15, 35, 37, 18, 20, 37, 20, 40, 20, - 36, 19, 37, 37, 24, 37, 37, 36, 20, 37, - 36, 20, 0, 24, 33, 37, 21, 24, 0, 4, - 37, 35, 24, 24, 97, 33, 65, 43, 43, 24, - 81, 144, 184, -1, 141 +static const short yycheck[] = { 22, + 160, 22, 23, 152, 27, 116, 155, 167, 39, 22, + 170, 42, 123, 20, 163, 20, 165, 56, 57, 179, + 20, 181, 133, 3, 135, 20, 21, 50, 28, 29, + 30, 38, 37, 182, 35, 56, 59, 8, 38, 199, + 151, 12, 4, 66, 24, 25, 26, 27, 197, 88, + 210, 90, 47, 164, 20, 21, 95, 5, 6, 7, + 8, 9, 22, 11, 12, 13, 14, 15, 16, 17, + 18, 20, 20, 96, 22, 20, 21, 23, 192, 45, + 20, 47, 20, 21, 32, 33, 23, 201, 111, 20, + 35, 37, 38, 20, 43, 44, 45, 46, 121, 39, + 20, 38, 47, 43, 44, 45, 46, 45, 39, 47, + 40, 41, 43, 44, 45, 46, 5, 6, 7, 8, + 9, 38, 11, 12, 13, 14, 15, 16, 17, 18, + 35, 20, 37, 22, 188, 189, 20, 38, 38, 28, + 29, 30, 20, 15, 28, 29, 30, 15, 202, 20, + 204, 41, 206, 207, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 20, 20, + 20, 22, 5, 6, 7, 8, 9, 22, 11, 12, + 13, 14, 15, 16, 17, 18, 20, 20, 20, 22, + 5, 6, 7, 8, 9, 39, 11, 12, 13, 14, + 15, 16, 17, 18, 40, 20, 20, 22, 6, 7, + 8, 9, 39, 11, 12, 13, 14, 15, 16, 17, + 18, 20, 20, 39, 22, 38, 42, 20, 38, 28, + 29, 30, 31, 32, 33, 34, 20, 36, 13, 14, + 15, 38, 20, 18, 28, 29, 30, 31, 32, 33, + 34, 7, 36, 13, 14, 15, 20, 13, 18, 20, + 16, 24, 25, 26, 27, 39, 20, 20, 20, 38, + 38, 38, 20, 24, 39, 37, 35, 20, 20, 20, + 24, 39, 19, 38, 20, 42, 20, 0, 0, 39, + 39, 24, 39, 39, 39, 21, 24, 7, 38, 38, + 35, 39, 26, 26, 99, 26, 83, 39, 37, 146, + 35, 186, 143, -1, 45, 45, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 67 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1072,34 +1084,35 @@ yyreduce: switch (yyn) { case 1: -#line 221 "parse.y" +#line 220 "parse.y" { ; ; break;} case 2: -#line 222 "parse.y" +#line 221 "parse.y" { ; ; break;} case 3: -#line 223 "parse.y" +#line 222 "parse.y" { ; ; break;} case 4: -#line 224 "parse.y" +#line 223 "parse.y" { ; ; break;} case 5: -#line 227 "parse.y" +#line 226 "parse.y" { - Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str, + Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 6: -#line 233 "parse.y" +#line 232 "parse.y" { - Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line); + Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; @@ -1107,7 +1120,7 @@ case 6: case 7: #line 238 "parse.y" { - Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str, + Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); @@ -1116,83 +1129,92 @@ case 7: case 8: #line 244 "parse.y" { - Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line); + Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 9: -#line 251 "parse.y" +#line 252 "parse.y" +{ ; ; + break;} +case 10: +#line 253 "parse.y" +{ ; ; + break;} +case 11: +#line 256 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 10: -#line 256 "parse.y" +case 12: +#line 261 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 11: -#line 263 "parse.y" +case 13: +#line 268 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} -case 12: -#line 268 "parse.y" -{ ; ; - break;} -case 13: -#line 269 "parse.y" -{ ; ; - break;} case 14: -#line 270 "parse.y" +#line 273 "parse.y" { ; ; break;} case 15: -#line 271 "parse.y" +#line 274 "parse.y" { ; ; break;} case 16: -#line 272 "parse.y" +#line 275 "parse.y" { ; ; break;} case 17: -#line 273 "parse.y" +#line 276 "parse.y" { ; ; break;} case 18: -#line 276 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 277 "parse.y" +{ ; ; break;} case 19: -#line 277 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 278 "parse.y" +{ ; ; break;} case 20: -#line 278 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 281 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 21: -#line 281 "parse.y" +#line 282 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 22: +#line 283 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 23: +#line 286 "parse.y" { push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL); ; break;} -case 22: -#line 284 "parse.y" +case 24: +#line 289 "parse.y" { push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id); ; break;} -case 23: -#line 288 "parse.y" +case 25: +#line 293 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1229,8 +1251,8 @@ case 23: } ; break;} -case 24: -#line 323 "parse.y" +case 26: +#line 328 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1260,8 +1282,8 @@ case 24: } ; break;} -case 25: -#line 353 "parse.y" +case 27: +#line 358 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1272,39 +1294,39 @@ case 25: yyval.id = yyvsp[-4].id; ; break;} -case 26: -#line 362 "parse.y" +case 28: +#line 367 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 27: -#line 368 "parse.y" +case 29: +#line 373 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 28: -#line 369 "parse.y" +case 30: +#line 374 "parse.y" { yyval.list = NULL; ; break;} -case 29: -#line 372 "parse.y" +case 31: +#line 377 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 30: -#line 375 "parse.y" +case 32: +#line 380 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 31: -#line 381 "parse.y" +case 33: +#line 386 "parse.y" { ; ; break;} -case 32: -#line 382 "parse.y" +case 34: +#line 387 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1312,152 +1334,152 @@ case 32: g_free(oldname); ; break;} -case 33: -#line 390 "parse.y" +case 35: +#line 395 "parse.y" { Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} -case 34: -#line 394 "parse.y" +case 36: +#line 399 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id,NULL); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 35: -#line 401 "parse.y" +case 37: +#line 406 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 36: -#line 404 "parse.y" +case 38: +#line 409 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 37: -#line 407 "parse.y" +case 39: +#line 412 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 38: -#line 410 "parse.y" +case 40: +#line 415 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 39: -#line 413 "parse.y" +case 41: +#line 418 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 40: -#line 416 "parse.y" +case 42: +#line 421 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 41: -#line 419 "parse.y" +case 43: +#line 424 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 42: -#line 422 "parse.y" +case 44: +#line 427 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 43: -#line 425 "parse.y" +case 45: +#line 430 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 44: -#line 428 "parse.y" +case 46: +#line 433 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 45: -#line 432 "parse.y" +case 47: +#line 437 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 46: -#line 435 "parse.y" +case 48: +#line 440 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 47: -#line 440 "parse.y" +case 49: +#line 445 "parse.y" { yyval.id = "long int"; ; break;} -case 48: -#line 443 "parse.y" +case 50: +#line 448 "parse.y" { yyval.id = "long"; ; break;} -case 49: -#line 446 "parse.y" +case 51: +#line 451 "parse.y" { yyval.id = "short int"; ; break;} -case 50: -#line 449 "parse.y" +case 52: +#line 454 "parse.y" { yyval.id = "short"; ; break;} -case 51: -#line 452 "parse.y" +case 53: +#line 457 "parse.y" { yyval.id = "int"; ; break;} -case 52: -#line 457 "parse.y" +case 54: +#line 462 "parse.y" { yyval.id = "enum "; ; break;} -case 53: -#line 460 "parse.y" +case 55: +#line 465 "parse.y" { yyval.id = "union "; ; break;} -case 54: -#line 463 "parse.y" +case 56: +#line 468 "parse.y" { yyval.id = "struct "; ; break;} -case 55: -#line 468 "parse.y" +case 57: +#line 473 "parse.y" { stars++; ; break;} -case 56: -#line 469 "parse.y" +case 58: +#line 474 "parse.y" { stars++; ; break;} -case 57: -#line 473 "parse.y" +case 59: +#line 478 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1471,14 +1493,14 @@ case 57: g_free(yyvsp[-1].id); ; break;} -case 58: -#line 485 "parse.y" +case 60: +#line 490 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 59: -#line 491 "parse.y" +case 61: +#line 496 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1492,8 +1514,8 @@ case 59: g_free(yyvsp[-1].id); ; break;} -case 60: -#line 503 "parse.y" +case 62: +#line 508 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1507,47 +1529,47 @@ case 60: g_free(yyvsp[-2].id); ; break;} -case 61: -#line 515 "parse.y" +case 63: +#line 520 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 62: -#line 518 "parse.y" +case 64: +#line 523 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 63: -#line 524 "parse.y" +case 65: +#line 529 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 64: -#line 529 "parse.y" +case 66: +#line 534 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 65: -#line 532 "parse.y" +case 67: +#line 537 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 66: -#line 537 "parse.y" +case 68: +#line 542 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 67: -#line 538 "parse.y" +case 69: +#line 543 "parse.y" { yyval.cbuf = NULL; ; break;} -case 68: -#line 542 "parse.y" +case 70: +#line 547 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1559,8 +1581,8 @@ case 68: ccode_line,vararg); ; break;} -case 69: -#line 552 "parse.y" +case 71: +#line 557 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1572,8 +1594,8 @@ case 69: ccode_line,vararg); ; break;} -case 70: -#line 562 "parse.y" +case 72: +#line 567 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1585,8 +1607,8 @@ case 70: ccode_line,vararg); ; break;} -case 71: -#line 572 "parse.y" +case 73: +#line 577 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1598,8 +1620,8 @@ case 71: ccode_line,vararg); ; break;} -case 72: -#line 582 "parse.y" +case 74: +#line 587 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1611,8 +1633,8 @@ case 72: ccode_line,vararg); ; break;} -case 73: -#line 592 "parse.y" +case 75: +#line 597 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, @@ -1620,16 +1642,16 @@ case 73: vararg); ; break;} -case 74: -#line 598 "parse.y" +case 76: +#line 603 "parse.y" { push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line, vararg); ; break;} -case 75: -#line 603 "parse.y" +case 77: +#line 608 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1650,27 +1672,27 @@ case 75: } ; break;} -case 76: -#line 624 "parse.y" +case 78: +#line 629 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 77: -#line 625 "parse.y" +case 79: +#line 630 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 78: -#line 629 "parse.y" +case 80: +#line 634 "parse.y" { yyval.id = NULL; ; break;} -case 79: -#line 632 "parse.y" +case 81: +#line 637 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 80: -#line 633 "parse.y" +case 82: +#line 638 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1683,8 +1705,8 @@ case 80: } ; break;} -case 81: -#line 644 "parse.y" +case 83: +#line 649 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1696,40 +1718,40 @@ case 81: } ; break;} -case 82: -#line 654 "parse.y" +case 84: +#line 659 "parse.y" { has_self = FALSE; ; break;} -case 83: -#line 657 "parse.y" +case 85: +#line 662 "parse.y" { vararg = TRUE; ; break;} -case 84: -#line 658 "parse.y" +case 86: +#line 663 "parse.y" { vararg = FALSE; ; break;} -case 85: -#line 661 "parse.y" +case 87: +#line 666 "parse.y" { ; ; break;} -case 86: -#line 662 "parse.y" +case 88: +#line 667 "parse.y" { ; ; break;} -case 87: -#line 665 "parse.y" +case 89: +#line 670 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 88: -#line 668 "parse.y" +case 90: +#line 673 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 89: -#line 671 "parse.y" +case 91: +#line 676 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1739,8 +1761,8 @@ case 89: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 90: -#line 679 "parse.y" +case 92: +#line 684 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1750,16 +1772,16 @@ case 90: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 91: -#line 689 "parse.y" +case 93: +#line 694 "parse.y" { ; ; break;} -case 92: -#line 690 "parse.y" +case 94: +#line 695 "parse.y" { ; ; break;} -case 93: -#line 693 "parse.y" +case 95: +#line 698 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1774,61 +1796,61 @@ case 93: g_free(yyvsp[0].id); ; break;} -case 94: -#line 706 "parse.y" +case 96: +#line 711 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 95: -#line 710 "parse.y" +case 97: +#line 715 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 96: -#line 714 "parse.y" +case 98: +#line 719 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 97: -#line 718 "parse.y" +case 99: +#line 723 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 98: -#line 722 "parse.y" +case 100: +#line 727 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 99: -#line 726 "parse.y" +case 101: +#line 731 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 100: -#line 732 "parse.y" +case 102: +#line 737 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 101: -#line 733 "parse.y" +case 103: +#line 738 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 102: -#line 737 "parse.y" +case 104: +#line 742 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2053,5 +2075,5 @@ yyerrhandle: } return 1; } -#line 740 "parse.y" +#line 745 "parse.y"