X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/dd11885aadcfaafae2d6268c381b0aac94cbc149..refs/tags/v1.0.0:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 7b6e9eb..a3b796c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -33,10 +33,11 @@ #define PUBLIC 283 #define PRIVATE 284 #define PROTECTED 285 -#define ARGUMENT 286 -#define VIRTUAL 287 -#define SIGNAL 288 -#define OVERRIDE 289 +#define CLASSWIDE 286 +#define ARGUMENT 287 +#define VIRTUAL 288 +#define SIGNAL 289 +#define OVERRIDE 290 #line 21 "parse.y" @@ -144,6 +145,8 @@ push_function(int scope, int method, char *oid, char *id, Node *node; Type *type; char *c_cbuf; + + g_assert(scope != CLASS_SCOPE); if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) { type = pop_type(); @@ -186,7 +189,7 @@ push_function(int scope, int method, char *oid, char *id, node = new_method(scope, method, type, oid, gtktypes, flags, id, funcargs, onerror, defreturn, c_cbuf, line_no, - ccode_line, vararg); + ccode_line, vararg, method_unique_id++); if(cbuf) g_string_free(cbuf, @@ -305,7 +308,7 @@ set_return_value(char *type, char *val) } -#line 288 "parse.y" +#line 290 "parse.y" typedef union { char *id; GString *cbuf; @@ -327,26 +330,26 @@ typedef union { -#define YYFINAL 242 +#define YYFINAL 243 #define YYFLAG -32768 -#define YYNTBASE 49 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 87) 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, 47, 2, 2, 2, 2, 2, 2, 40, - 41, 43, 2, 44, 48, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 38, 46, - 39, 45, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 48, 2, 2, 2, 2, 2, 2, 41, + 42, 44, 2, 45, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 39, 47, + 40, 46, 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, 36, 42, 37, 2, 2, 2, 2, 2, + 2, 2, 37, 43, 38, 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, @@ -362,86 +365,86 @@ 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, 33, 34, 35 + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, 24, 27, 29, 34, 38, 43, 46, 48, 50, 52, - 54, 56, 58, 60, 62, 65, 69, 72, 76, 79, - 82, 84, 86, 87, 93, 100, 112, 121, 127, 133, - 135, 139, 140, 144, 146, 148, 151, 153, 156, 159, - 162, 164, 167, 170, 172, 174, 176, 178, 181, 183, - 185, 188, 190, 193, 195, 197, 199, 201, 203, 206, - 208, 211, 213, 217, 221, 224, 226, 231, 235, 237, - 240, 242, 253, 265, 275, 285, 294, 306, 315, 321, - 324, 329, 330, 332, 335, 337, 339, 343, 345, 349, - 351, 355, 357, 360, 364, 371, 379, 382, 384, 386, - 389, 392, 396, 400, 404, 408, 410, 413 + 54, 56, 58, 60, 62, 64, 67, 71, 74, 78, + 81, 84, 86, 88, 89, 95, 102, 114, 123, 129, + 135, 137, 141, 142, 146, 148, 150, 153, 155, 158, + 161, 164, 166, 169, 172, 174, 176, 178, 180, 183, + 185, 187, 190, 192, 195, 197, 199, 201, 203, 205, + 208, 210, 213, 215, 219, 223, 226, 228, 233, 237, + 239, 242, 244, 255, 267, 277, 287, 296, 308, 317, + 323, 326, 331, 332, 334, 337, 339, 341, 345, 347, + 351, 353, 357, 359, 362, 366, 373, 381, 384, 386, + 388, 391, 394, 398, 402, 406, 410, 412, 415 }; -static const short yyrhs[] = { 51, - 52, 51, 0, 52, 51, 0, 51, 52, 0, 52, +static const short yyrhs[] = { 52, + 53, 52, 0, 53, 52, 0, 52, 53, 0, 53, 0, 23, 0, 26, 0, 24, 0, 25, 0, 27, - 0, 28, 0, 51, 50, 0, 50, 0, 53, 36, - 54, 37, 0, 53, 36, 37, 0, 3, 21, 4, - 21, 0, 54, 55, 0, 55, 0, 76, 0, 60, - 0, 61, 0, 38, 0, 29, 0, 30, 0, 31, - 0, 19, 19, 0, 19, 36, 23, 0, 39, 85, - 0, 39, 36, 23, 0, 57, 58, 0, 58, 57, - 0, 58, 0, 57, 0, 0, 56, 65, 19, 59, - 38, 0, 56, 65, 19, 22, 59, 38, 0, 32, - 63, 62, 19, 19, 36, 23, 19, 36, 23, 38, - 0, 32, 63, 62, 19, 19, 36, 23, 38, 0, - 32, 63, 62, 19, 19, 0, 19, 40, 19, 65, - 41, 0, 19, 0, 40, 64, 41, 0, 0, 19, - 42, 64, 0, 19, 0, 66, 0, 5, 66, 0, - 67, 0, 67, 70, 0, 12, 68, 0, 11, 68, - 0, 68, 0, 12, 18, 0, 11, 18, 0, 18, - 0, 17, 0, 16, 0, 19, 0, 69, 19, 0, - 21, 0, 6, 0, 13, 15, 0, 13, 0, 14, - 15, 0, 14, 0, 15, 0, 9, 0, 8, 0, - 7, 0, 43, 70, 0, 43, 0, 19, 73, 0, - 73, 0, 56, 19, 73, 0, 19, 56, 73, 0, - 56, 73, 0, 71, 0, 19, 40, 74, 41, 0, - 74, 44, 19, 0, 19, 0, 36, 23, 0, 38, - 0, 34, 63, 72, 65, 19, 40, 79, 41, 77, - 75, 0, 56, 34, 63, 71, 65, 19, 40, 79, - 41, 77, 75, 0, 33, 56, 65, 19, 40, 79, - 41, 77, 75, 0, 56, 33, 65, 19, 40, 79, - 41, 77, 75, 0, 33, 65, 19, 40, 79, 41, - 77, 75, 0, 35, 40, 21, 41, 65, 19, 40, - 79, 41, 77, 75, 0, 56, 65, 19, 40, 79, - 41, 77, 75, 0, 19, 40, 19, 41, 75, 0, - 19, 78, 0, 19, 78, 19, 78, 0, 0, 85, - 0, 36, 23, 0, 6, 0, 19, 0, 19, 44, - 80, 0, 80, 0, 81, 44, 10, 0, 81, 0, - 81, 44, 82, 0, 82, 0, 65, 19, 0, 65, - 19, 22, 0, 65, 19, 40, 19, 83, 41, 0, - 65, 19, 22, 40, 19, 83, 41, 0, 83, 84, - 0, 84, 0, 19, 0, 45, 85, 0, 46, 85, - 0, 45, 39, 85, 0, 46, 39, 85, 0, 39, - 39, 85, 0, 47, 39, 85, 0, 20, 0, 48, - 20, 0, 19, 0 + 0, 28, 0, 52, 51, 0, 51, 0, 54, 37, + 55, 38, 0, 54, 37, 38, 0, 3, 21, 4, + 21, 0, 55, 56, 0, 56, 0, 77, 0, 61, + 0, 62, 0, 39, 0, 29, 0, 30, 0, 31, + 0, 32, 0, 19, 19, 0, 19, 37, 23, 0, + 40, 86, 0, 40, 37, 23, 0, 58, 59, 0, + 59, 58, 0, 59, 0, 58, 0, 0, 57, 66, + 19, 60, 39, 0, 57, 66, 19, 22, 60, 39, + 0, 33, 64, 63, 19, 19, 37, 23, 19, 37, + 23, 39, 0, 33, 64, 63, 19, 19, 37, 23, + 39, 0, 33, 64, 63, 19, 19, 0, 19, 41, + 19, 66, 42, 0, 19, 0, 41, 65, 42, 0, + 0, 19, 43, 65, 0, 19, 0, 67, 0, 5, + 67, 0, 68, 0, 68, 71, 0, 12, 69, 0, + 11, 69, 0, 69, 0, 12, 18, 0, 11, 18, + 0, 18, 0, 17, 0, 16, 0, 19, 0, 70, + 19, 0, 21, 0, 6, 0, 13, 15, 0, 13, + 0, 14, 15, 0, 14, 0, 15, 0, 9, 0, + 8, 0, 7, 0, 44, 71, 0, 44, 0, 19, + 74, 0, 74, 0, 57, 19, 74, 0, 19, 57, + 74, 0, 57, 74, 0, 72, 0, 19, 41, 75, + 42, 0, 75, 45, 19, 0, 19, 0, 37, 23, + 0, 39, 0, 35, 64, 73, 66, 19, 41, 80, + 42, 78, 76, 0, 57, 35, 64, 72, 66, 19, + 41, 80, 42, 78, 76, 0, 34, 57, 66, 19, + 41, 80, 42, 78, 76, 0, 57, 34, 66, 19, + 41, 80, 42, 78, 76, 0, 34, 66, 19, 41, + 80, 42, 78, 76, 0, 36, 41, 21, 42, 66, + 19, 41, 80, 42, 78, 76, 0, 57, 66, 19, + 41, 80, 42, 78, 76, 0, 19, 41, 19, 42, + 76, 0, 19, 79, 0, 19, 79, 19, 79, 0, + 0, 86, 0, 37, 23, 0, 6, 0, 19, 0, + 19, 45, 81, 0, 81, 0, 82, 45, 10, 0, + 82, 0, 82, 45, 83, 0, 83, 0, 66, 19, + 0, 66, 19, 22, 0, 66, 19, 41, 19, 84, + 42, 0, 66, 19, 22, 41, 19, 84, 42, 0, + 84, 85, 0, 85, 0, 19, 0, 46, 86, 0, + 47, 86, 0, 46, 40, 86, 0, 47, 40, 86, + 0, 40, 40, 86, 0, 48, 40, 86, 0, 20, + 0, 49, 20, 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 306, 307, 308, 309, 312, 318, 324, 330, 336, 342, - 350, 351, 354, 359, 366, 371, 372, 375, 376, 377, - 378, 381, 382, 383, 386, 399, 415, 419, 427, 428, - 429, 430, 431, 437, 440, 444, 479, 507, 572, 581, - 587, 588, 591, 594, 600, 601, 609, 613, 620, 623, - 626, 629, 632, 635, 638, 641, 644, 647, 651, 654, - 659, 662, 665, 668, 671, 676, 679, 682, 687, 688, - 692, 704, 710, 722, 734, 737, 743, 748, 751, 756, - 757, 761, 772, 783, 794, 805, 816, 822, 827, 848, - 859, 878, 884, 885, 891, 892, 903, 913, 916, 917, - 920, 921, 924, 927, 930, 938, 948, 949, 952, 965, - 969, 973, 977, 981, 985, 991, 992, 996 + 308, 309, 310, 311, 314, 320, 326, 332, 338, 344, + 352, 353, 356, 361, 368, 373, 374, 377, 378, 379, + 380, 383, 384, 385, 386, 389, 402, 418, 422, 430, + 431, 432, 433, 434, 440, 443, 447, 482, 510, 580, + 589, 595, 596, 599, 602, 608, 609, 617, 621, 628, + 631, 634, 637, 640, 643, 646, 649, 652, 655, 659, + 662, 667, 670, 673, 676, 679, 684, 687, 690, 695, + 696, 700, 712, 718, 730, 742, 745, 751, 756, 759, + 764, 765, 769, 785, 801, 817, 833, 844, 850, 860, + 883, 894, 913, 919, 920, 926, 927, 938, 948, 951, + 952, 955, 956, 959, 962, 965, 973, 983, 984, 987, + 1000, 1004, 1008, 1012, 1016, 1020, 1026, 1027, 1031 }; #endif @@ -452,194 +455,194 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED", "LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", "CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", -"ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='","'('","')'", -"'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes","class","classdec", -"classcode","thing","scope","destructor","initializer","varoptions","variable", -"argument","argtype","flags","flaglist","type","type1","type2","integer","tspecifier", -"stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode","method", -"returnvals","retcode","funcargs","arglist","arglist1","arg","checklist","check", -"numtok", NULL +"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='", +"'('","')'","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes", +"class","classdec","classcode","thing","scope","destructor","initializer","varoptions", +"variable","argument","argtype","flags","flaglist","type","type1","type2","integer", +"tspecifier","stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode", +"method","returnvals","retcode","funcargs","arglist","arglist1","arg","checklist", +"check","numtok", NULL }; #endif static const short yyr1[] = { 0, - 49, 49, 49, 49, 50, 50, 50, 50, 50, 50, - 51, 51, 52, 52, 53, 54, 54, 55, 55, 55, - 55, 56, 56, 56, 57, 57, 58, 58, 59, 59, - 59, 59, 59, 60, 60, 61, 61, 61, 62, 62, - 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 68, 68, 68, 68, 68, 69, 69, 69, 70, 70, - 71, 71, 72, 72, 72, 72, 73, 74, 74, 75, - 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, - 77, 77, 78, 78, 79, 79, 79, 79, 80, 80, - 81, 81, 82, 82, 82, 82, 83, 83, 84, 84, - 84, 84, 84, 84, 84, 85, 85, 85 + 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, + 52, 52, 53, 53, 54, 55, 55, 56, 56, 56, + 56, 57, 57, 57, 57, 58, 58, 59, 59, 60, + 60, 60, 60, 60, 61, 61, 62, 62, 62, 63, + 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 69, 69, 69, 69, 69, 70, 70, 70, 71, + 71, 72, 72, 73, 73, 73, 73, 74, 75, 75, + 76, 76, 77, 77, 77, 77, 77, 77, 77, 77, + 78, 78, 78, 79, 79, 80, 80, 80, 80, 81, + 81, 82, 82, 83, 83, 83, 83, 84, 84, 85, + 85, 85, 85, 85, 85, 85, 86, 86, 86 }; static const short yyr2[] = { 0, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 3, 4, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 3, 2, 3, 2, 2, - 1, 1, 0, 5, 6, 11, 8, 5, 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, 10, 11, 9, 9, 8, 11, 8, 5, 2, - 4, 0, 1, 2, 1, 1, 3, 1, 3, 1, - 3, 1, 2, 3, 6, 7, 2, 1, 1, 2, - 2, 3, 3, 3, 3, 1, 2, 1 + 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, + 2, 1, 1, 0, 5, 6, 11, 8, 5, 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, 10, 11, 9, 9, 8, 11, 8, 5, + 2, 4, 0, 1, 2, 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, 5, 7, 8, 6, 9, 10, 12, 0, 4, 0, 0, 11, 3, 2, 0, 0, 1, 0, 22, - 23, 24, 42, 0, 42, 0, 14, 21, 0, 17, - 0, 19, 20, 18, 15, 0, 0, 0, 0, 60, - 68, 67, 66, 0, 0, 62, 64, 65, 56, 55, - 54, 57, 59, 0, 0, 45, 47, 51, 0, 0, - 0, 13, 16, 0, 42, 0, 0, 44, 0, 40, - 0, 46, 53, 50, 52, 49, 61, 63, 0, 0, - 70, 48, 58, 0, 0, 76, 0, 72, 0, 0, - 0, 33, 0, 0, 41, 0, 0, 0, 0, 69, - 0, 0, 0, 71, 0, 75, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 32, 31, 0, 0, 81, - 89, 43, 0, 38, 0, 60, 57, 0, 0, 98, - 100, 102, 79, 0, 74, 73, 0, 0, 0, 0, - 25, 0, 0, 118, 116, 0, 0, 27, 0, 29, - 30, 34, 80, 0, 0, 0, 0, 103, 92, 0, - 77, 0, 0, 0, 0, 0, 26, 35, 28, 117, - 92, 39, 0, 92, 97, 104, 0, 0, 0, 99, - 101, 78, 0, 0, 92, 0, 0, 0, 37, 0, - 0, 0, 0, 90, 93, 86, 92, 0, 0, 0, - 88, 0, 84, 0, 109, 0, 0, 0, 0, 0, - 108, 94, 0, 0, 92, 85, 92, 0, 0, 0, - 0, 110, 0, 111, 0, 105, 107, 91, 82, 0, - 0, 36, 106, 114, 112, 113, 115, 87, 83, 0, - 0, 0 + 23, 24, 25, 43, 0, 43, 0, 14, 21, 0, + 17, 0, 19, 20, 18, 15, 0, 0, 0, 0, + 61, 69, 68, 67, 0, 0, 63, 65, 66, 57, + 56, 55, 58, 60, 0, 0, 46, 48, 52, 0, + 0, 0, 13, 16, 0, 43, 0, 0, 45, 0, + 41, 0, 47, 54, 51, 53, 50, 62, 64, 0, + 0, 71, 49, 59, 0, 0, 77, 0, 73, 0, + 0, 0, 34, 0, 0, 42, 0, 0, 0, 0, + 70, 0, 0, 0, 72, 0, 76, 0, 0, 0, + 0, 0, 0, 34, 0, 0, 33, 32, 0, 0, + 82, 90, 44, 0, 39, 0, 61, 58, 0, 0, + 99, 101, 103, 80, 0, 75, 74, 0, 0, 0, + 0, 26, 0, 0, 119, 117, 0, 0, 28, 0, + 30, 31, 35, 81, 0, 0, 0, 0, 104, 93, + 0, 78, 0, 0, 0, 0, 0, 27, 36, 29, + 118, 93, 40, 0, 93, 98, 105, 0, 0, 0, + 100, 102, 79, 0, 0, 93, 0, 0, 0, 38, + 0, 0, 0, 0, 91, 94, 87, 93, 0, 0, + 0, 89, 0, 85, 0, 110, 0, 0, 0, 0, + 0, 109, 95, 0, 0, 93, 86, 93, 0, 0, + 0, 0, 111, 0, 112, 0, 106, 108, 92, 83, + 0, 0, 37, 107, 115, 113, 114, 116, 88, 84, + 0, 0, 0 }; -static const short yydefgoto[] = { 240, - 8, 9, 10, 11, 29, 30, 31, 116, 117, 118, - 32, 33, 71, 38, 69, 128, 56, 57, 58, 59, - 82, 86, 87, 88, 134, 121, 34, 179, 194, 129, - 130, 131, 132, 210, 211, 195 +static const short yydefgoto[] = { 241, + 8, 9, 10, 11, 30, 31, 32, 117, 118, 119, + 33, 34, 72, 39, 70, 129, 57, 58, 59, 60, + 83, 87, 88, 89, 135, 122, 35, 180, 195, 130, + 131, 132, 133, 211, 212, 196 }; -static const short yypact[] = { 136, - -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 167, - -16, 13,-32768, 167, 167, 150, 15, 167, 19,-32768, --32768,-32768, 27, 137, 27, 37,-32768,-32768, 170,-32768, - 107,-32768,-32768,-32768,-32768, 25, 61, 98, 254,-32768, --32768,-32768,-32768, 263, 269, 114, 118,-32768,-32768,-32768, --32768,-32768,-32768, 221, 116,-32768, 104,-32768, 138, 73, - 151,-32768,-32768, 221, 27, 154, 133, 155, 157, 156, - 159,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 187, 184, - 104,-32768,-32768, 146, 212,-32768, 221,-32768, 200, 229, - 239, 43, 96, 61,-32768, 245, 255, 240, 238,-32768, - 246, 260, 266,-32768, -8,-32768, 270, 221, 248, -8, - 221, 36, 3, -1, 238, 251, 272, 256, 273,-32768, --32768,-32768, 221, 257, 238, 258, 57, 276, 259,-32768, - 253,-32768,-32768, 64,-32768,-32768, 252, 279, 238, 282, --32768, 280, 264,-32768,-32768, 281, 285,-32768, 265,-32768, --32768,-32768,-32768, 267, 284, 268, 221, 5, 291, 204, --32768, 292, 238, 274, 271, 275,-32768,-32768,-32768,-32768, - 291,-32768, -10, 291,-32768, 277, 294, 18, 96,-32768, --32768,-32768, 278, 238, 291, 238, 96, 286,-32768, 96, - 297, 91, 295, 301,-32768,-32768, 291, 283, 96, 287, --32768, 298,-32768, 91,-32768, 288, -5, 10, 290, 29, --32768,-32768, 18, 96, 291,-32768, 291, 293, 50, 4, - 4,-32768, 4,-32768, 4,-32768,-32768,-32768,-32768, 96, - 96,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 323, - 325,-32768 +static const short yypact[] = { 158, + 13,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 158, 185, + -26, 44,-32768, 185, 185, 168, 51, 185, 33,-32768, +-32768,-32768,-32768, 43, 138, 43, 46,-32768,-32768, 186, +-32768, 107,-32768,-32768,-32768,-32768, 67, 71, 82, 271, +-32768,-32768,-32768,-32768, 176, 280, 95, 102,-32768,-32768, +-32768,-32768,-32768,-32768, 238, 108,-32768, 86,-32768, 112, + 73, 111,-32768,-32768, 238, 43, 114, 92, 105, 96, + 121, 144,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 145, + 131, 86,-32768,-32768, 147, 154,-32768, 238,-32768, 133, + 161, 177, 152, 41, 71,-32768, 195, 204, 200, 255, +-32768, 207, 239, 246,-32768, 1,-32768, 256, 238, 240, + 1, 238, 8, -10, -5, 255, 155, 272, 257, 274, +-32768,-32768,-32768, 238, 262, 255, 258, 20, 282, 260, +-32768, 259,-32768,-32768, 34,-32768,-32768, 264, 284, 255, + 287,-32768, 285, 268,-32768,-32768, 286, 290,-32768, 269, +-32768,-32768,-32768,-32768, 270, 291, 273, 238, -3, 294, + 221,-32768, 297, 255, 276, 277, 279,-32768,-32768,-32768, +-32768, 294,-32768, -15, 294,-32768, 281, 299, -2, 41, +-32768,-32768,-32768, 283, 255, 294, 255, 41, 289,-32768, + 41, 302, 89, 300, 305,-32768,-32768, 294, 288, 41, + 292,-32768, 304,-32768, 89,-32768, 293, 3, 9, 295, + 35,-32768,-32768, -2, 41, 294,-32768, 294, 298, 49, + 17, 17,-32768, 17,-32768, 17,-32768,-32768,-32768,-32768, + 41, 41,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 328, 329,-32768 }; static const short yypgoto[] = {-32768, - 69, 117, 317,-32768,-32768, 303, -21, 213, 217, 222, --32768,-32768,-32768, -19, 242, -23, 299,-32768, 126,-32768, - 261, 243,-32768, -24,-32768, -174,-32768, -164, 124, -113, - 182,-32768, 180, 139, -120, -114 + 52, 45, 322,-32768,-32768, 306, -22, 214, 222, 224, +-32768,-32768,-32768, -20, 245, -24, 301,-32768, 53,-32768, + 261, 250,-32768, 54,-32768, -175,-32768, -165, 130, -114, + 187,-32768, 188, 141, -151, -115 }; -#define YYLAST 343 - - -static const short yytable[] = { 148, - 55, 149, 54, 12, 196, 60, 187, 66, 188, 190, - 101, 156, 201, 144, 145, 203, 17, 144, 145, 16, - 199, 112, 144, 145, 216, 165, 176, 189, 144, 145, - 79, 102, 214, 221, 146, 35, 144, 145, 85, 229, - 90, 114, 147, 67, 177, 91, 147, 205, 223, 183, - 230, 147, 231, 193, 141, 238, 239, 147, 36, 104, - 106, 112, 103, 107, 113, 147, 37, 206, 205, 226, - 198, 142, 200, 207, 208, 209, 61, 13, 135, 68, - 136, 114, 115, 13, 138, 104, 13, 140, 206, 227, - 233, 84, 222, 224, 207, 208, 209, -96, 227, 154, - 157, 20, 21, 22, 161, 234, 235, 162, 236, 205, - 237, 39, 40, 41, 42, 43, 70, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 15, 53, 77, 206, - 18, 119, 78, 120, 80, 207, 208, 209, 1, 64, - 65, 39, 40, 41, 42, 43, 81, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 83, 53, 2, 3, - 4, 5, 6, 7, 101, 20, 21, 22, 19, 74, - 76, 89, 92, 93, 20, 21, 22, 97, 20, 21, - 22, 23, 24, 25, 26, 102, 27, 28, 19, 2, - 3, 4, 5, 6, 7, 96, 94, 95, 20, 21, - 22, 23, 24, 25, 26, 98, 62, 28, 39, 40, - 41, 42, 43, 180, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 99, 53, 39, 40, 41, 42, 43, - 105, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 108, 53, 39, 126, 41, 42, 43, 109, 44, 45, - 46, 47, 48, 49, 50, 51, 127, 110, 53, 40, - 41, 42, 43, 123, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 124, 53, 46, 47, 48, 133, 125, - 73, 46, 47, 48, 101, 102, 75, 139, 137, 114, - 112, 163, 155, 152, 158, 153, 160, 164, -95, 159, - 166, 168, 167, 169, 170, 171, 173, 172, 174, 178, - 182, 185, 192, 184, 186, 204, 191, 212, 197, 213, - 218, 202, 241, 215, 242, 14, 220, 217, 225, 151, - 232, 63, 150, 111, 143, 122, 228, 72, 175, 181, - 0, 100, 219 +#define YYLAST 349 + + +static const short yytable[] = { 149, + 56, 150, 55, 189, 197, 61, 188, 67, 113, 191, + 16, 157, 202, 145, 146, 204, 145, 146, 177, 102, + 200, 145, 146, 190, 217, 166, 142, 145, 146, 115, + 80, 147, 215, 12, 194, 145, 146, 178, 86, 230, + 91, 103, 222, 148, 143, 92, 148, 17, 224, 184, + 231, 148, 232, 206, 15, 239, 240, 148, 18, 228, + 13, -97, 104, 108, 158, 148, 13, 206, 228, 13, + 199, 36, 201, 37, 207, 162, 227, 120, 163, 121, + 208, 209, 210, 38, 139, 68, 62, 141, 207, 69, + 234, 85, 223, 225, 208, 209, 210, 75, 77, 155, + 71, 20, 21, 22, 23, 235, 236, 206, 237, 78, + 238, 40, 41, 42, 43, 44, 79, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 81, 54, 207, 82, + 84, 90, 93, 94, 208, 209, 210, 96, 105, 107, + 65, 66, 40, 41, 42, 43, 44, 95, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 136, 54, 137, + 1, 97, 98, 99, 105, 102, 20, 21, 22, 23, + 113, 100, 106, 114, 109, 20, 21, 22, 23, 110, + 2, 3, 4, 5, 6, 7, 19, 103, 47, 48, + 49, 115, 116, 74, 115, 111, 20, 21, 22, 23, + 24, 25, 26, 27, 19, 28, 29, 2, 3, 4, + 5, 6, 7, 124, 20, 21, 22, 23, 24, 25, + 26, 27, 125, 63, 29, 40, 41, 42, 43, 44, + 181, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 126, 54, 40, 41, 42, 43, 44, 103, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 134, 54, 40, + 127, 42, 43, 44, 102, 45, 46, 47, 48, 49, + 50, 51, 52, 128, 138, 54, 41, 42, 43, 44, + 140, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 113, 54, 47, 48, 49, 153, 154, 76, 156, -96, + 159, 160, 165, 161, 164, 167, 169, 168, 170, 171, + 172, 173, 179, 174, 175, 183, 185, 193, 186, 187, + 205, 192, 213, 214, 198, 203, 219, 242, 243, 216, + 14, 152, 221, 218, 226, 64, 233, 144, 151, 123, + 73, 112, 101, 229, 176, 220, 0, 0, 182 }; -static const short yycheck[] = { 114, - 24, 115, 24, 21, 179, 25, 171, 31, 19, 174, - 19, 125, 187, 19, 20, 190, 4, 19, 20, 36, - 185, 19, 19, 20, 199, 139, 22, 38, 19, 20, - 54, 40, 197, 39, 36, 21, 19, 20, 60, 214, - 64, 39, 48, 19, 40, 65, 48, 19, 39, 163, - 215, 48, 217, 36, 19, 230, 231, 48, 40, 84, - 85, 19, 84, 87, 22, 48, 40, 39, 19, 41, - 184, 36, 186, 45, 46, 47, 40, 9, 103, 19, - 105, 39, 40, 15, 108, 110, 18, 111, 39, 210, - 41, 19, 207, 208, 45, 46, 47, 41, 219, 123, - 44, 29, 30, 31, 41, 220, 221, 44, 223, 19, - 225, 5, 6, 7, 8, 9, 19, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 10, 21, 15, 39, - 14, 36, 15, 38, 19, 45, 46, 47, 3, 33, - 34, 5, 6, 7, 8, 9, 43, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 23, 24, - 25, 26, 27, 28, 19, 29, 30, 31, 19, 44, - 45, 21, 19, 41, 29, 30, 31, 19, 29, 30, - 31, 32, 33, 34, 35, 40, 37, 38, 19, 23, - 24, 25, 26, 27, 28, 40, 42, 41, 29, 30, - 31, 32, 33, 34, 35, 19, 37, 38, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 40, 21, 5, 6, 7, 8, 9, - 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 41, 21, 5, 6, 7, 8, 9, 19, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 19, 21, 6, - 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 19, 21, 13, 14, 15, 19, 40, - 18, 13, 14, 15, 19, 40, 18, 40, 19, 39, - 19, 40, 36, 38, 19, 23, 44, 19, 41, 41, - 19, 38, 23, 23, 20, 41, 23, 41, 41, 19, - 19, 41, 19, 40, 40, 19, 40, 23, 41, 19, - 23, 36, 0, 41, 0, 9, 39, 41, 39, 117, - 38, 29, 116, 91, 113, 94, 213, 39, 157, 160, - -1, 81, 204 +static const short yycheck[] = { 115, + 25, 116, 25, 19, 180, 26, 172, 32, 19, 175, + 37, 126, 188, 19, 20, 191, 19, 20, 22, 19, + 186, 19, 20, 39, 200, 140, 19, 19, 20, 40, + 55, 37, 198, 21, 37, 19, 20, 41, 61, 215, + 65, 41, 40, 49, 37, 66, 49, 4, 40, 164, + 216, 49, 218, 19, 10, 231, 232, 49, 14, 211, + 9, 42, 85, 88, 45, 49, 15, 19, 220, 18, + 185, 21, 187, 41, 40, 42, 42, 37, 45, 39, + 46, 47, 48, 41, 109, 19, 41, 112, 40, 19, + 42, 19, 208, 209, 46, 47, 48, 45, 46, 124, + 19, 29, 30, 31, 32, 221, 222, 19, 224, 15, + 226, 5, 6, 7, 8, 9, 15, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 19, 21, 40, 44, + 19, 21, 19, 42, 46, 47, 48, 42, 85, 86, + 34, 35, 5, 6, 7, 8, 9, 43, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 104, 21, 106, + 3, 41, 19, 19, 111, 19, 29, 30, 31, 32, + 19, 41, 19, 22, 42, 29, 30, 31, 32, 19, + 23, 24, 25, 26, 27, 28, 19, 41, 13, 14, + 15, 40, 41, 18, 40, 19, 29, 30, 31, 32, + 33, 34, 35, 36, 19, 38, 39, 23, 24, 25, + 26, 27, 28, 19, 29, 30, 31, 32, 33, 34, + 35, 36, 19, 38, 39, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 41, 21, 5, 6, 7, 8, 9, 41, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 19, 21, 6, 7, 8, 9, + 41, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 19, 21, 13, 14, 15, 39, 23, 18, 37, 42, + 19, 42, 19, 45, 41, 19, 39, 23, 23, 20, + 42, 42, 19, 23, 42, 19, 41, 19, 42, 41, + 19, 41, 23, 19, 42, 37, 23, 0, 0, 42, + 9, 118, 40, 42, 40, 30, 39, 114, 117, 95, + 40, 92, 82, 214, 158, 205, -1, -1, 161 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1185,23 +1188,23 @@ yyreduce: switch (yyn) { case 1: -#line 306 "parse.y" +#line 308 "parse.y" { ; ; break;} case 2: -#line 307 "parse.y" +#line 309 "parse.y" { ; ; break;} case 3: -#line 308 "parse.y" +#line 310 "parse.y" { ; ; break;} case 4: -#line 309 "parse.y" +#line 311 "parse.y" { ; ; break;} case 5: -#line 312 "parse.y" +#line 314 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1210,7 +1213,7 @@ case 5: ; break;} case 6: -#line 318 "parse.y" +#line 320 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1219,7 +1222,7 @@ case 6: ; break;} case 7: -#line 324 "parse.y" +#line 326 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1228,7 +1231,7 @@ case 7: ; break;} case 8: -#line 330 "parse.y" +#line 332 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1237,7 +1240,7 @@ case 8: ; break;} case 9: -#line 336 "parse.y" +#line 338 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1246,7 +1249,7 @@ case 9: ; break;} case 10: -#line 342 "parse.y" +#line 344 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1255,15 +1258,15 @@ case 10: ; break;} case 11: -#line 350 "parse.y" +#line 352 "parse.y" { ; ; break;} case 12: -#line 351 "parse.y" +#line 353 "parse.y" { ; ; break;} case 13: -#line 354 "parse.y" +#line 356 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1271,7 +1274,7 @@ case 13: ; break;} case 14: -#line 359 "parse.y" +#line 361 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1279,49 +1282,53 @@ case 14: ; break;} case 15: -#line 366 "parse.y" +#line 368 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 16: -#line 371 "parse.y" +#line 373 "parse.y" { ; ; break;} case 17: -#line 372 "parse.y" +#line 374 "parse.y" { ; ; break;} case 18: -#line 375 "parse.y" +#line 377 "parse.y" { ; ; break;} case 19: -#line 376 "parse.y" +#line 378 "parse.y" { ; ; break;} case 20: -#line 377 "parse.y" +#line 379 "parse.y" { ; ; break;} case 21: -#line 378 "parse.y" +#line 380 "parse.y" { ; ; break;} case 22: -#line 381 "parse.y" +#line 383 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} case 23: -#line 382 "parse.y" +#line 384 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} case 24: -#line 383 "parse.y" +#line 385 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} case 25: #line 386 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 26: +#line 389 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1336,8 +1343,8 @@ case 25: } ; break;} -case 26: -#line 399 "parse.y" +case 27: +#line 402 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1353,58 +1360,58 @@ case 26: } ; break;} -case 27: -#line 415 "parse.y" +case 28: +#line 418 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 419 "parse.y" +case 29: +#line 422 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 29: -#line 427 "parse.y" -{ ; ; - break;} case 30: -#line 428 "parse.y" +#line 430 "parse.y" { ; ; break;} case 31: -#line 429 "parse.y" -{ destructor = NULL; ; +#line 431 "parse.y" +{ ; ; break;} case 32: -#line 430 "parse.y" -{ initializer = NULL; ; +#line 432 "parse.y" +{ destructor = NULL; ; break;} case 33: -#line 431 "parse.y" +#line 433 "parse.y" +{ initializer = NULL; ; + break;} +case 34: +#line 434 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 437 "parse.y" +case 35: +#line 440 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 440 "parse.y" +case 36: +#line 443 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 36: -#line 444 "parse.y" +case 37: +#line 447 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1441,8 +1448,8 @@ case 36: } ; break;} -case 37: -#line 479 "parse.y" +case 38: +#line 482 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1472,8 +1479,8 @@ case 37: } ; break;} -case 38: -#line 507 "parse.y" +case 39: +#line 510 "parse.y" { Node *node; char *get, *set = NULL; @@ -1481,9 +1488,9 @@ case 38: Type *type; char *root; - if(strcmp(yyvsp[0].id,"link")!=0 && - strcmp(yyvsp[0].id,"stringlink")!=0 && - strcmp(yyvsp[0].id,"objectlink")!=0) { + if(strcmp(yyvsp[0].id, "link")!=0 && + strcmp(yyvsp[0].id, "stringlink")!=0 && + strcmp(yyvsp[0].id, "objectlink")!=0) { g_free(yyvsp[0].id); g_free(yyvsp[-2].id); g_free(yyvsp[-1].id); g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL); @@ -1496,24 +1503,29 @@ case 38: var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); if(var->scope == PRIVATE_SCOPE) root = "self->_priv"; + else if(var->scope == CLASS_SCOPE) + root = "SELF_CLASS(GTK_OBJECT(self)->klass)"; else root = "self"; - if(strcmp(yyvsp[0].id,"link")==0) { + if(strcmp(yyvsp[0].id, "link")==0) { set = g_strdup_printf("%s->%s = ARG;", root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"stringlink")==0) { + } else if(strcmp(yyvsp[0].id, "stringlink")==0) { set = g_strdup_printf("g_free(%s->%s); " "%s->%s = g_strdup(ARG);", root, yyvsp[-1].id, root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"objectlink")==0) { + } else if(strcmp(yyvsp[0].id, "objectlink")==0) { set = g_strdup_printf( "if(%s->%s) " "gtk_object_unref(GTK_OBJECT(%s->%s)); " "%s->%s = ARG; " "if(%s->%s) " - "gtk_object_ref(GTK_OBJECT(%s->%s)); ", + "gtk_object_ref(GTK_OBJECT(%s->%s));", + root, yyvsp[-1].id, + root, yyvsp[-1].id, + root, yyvsp[-1].id, root, yyvsp[-1].id, root, yyvsp[-1].id, root, yyvsp[-1].id, @@ -1538,8 +1550,8 @@ case 38: class_nodes = g_list_append(class_nodes,node); ; break;} -case 39: -#line 572 "parse.y" +case 40: +#line 580 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1550,39 +1562,39 @@ case 39: yyval.id = yyvsp[-4].id; ; break;} -case 40: -#line 581 "parse.y" +case 41: +#line 589 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 41: -#line 587 "parse.y" +case 42: +#line 595 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 42: -#line 588 "parse.y" +case 43: +#line 596 "parse.y" { yyval.list = NULL; ; break;} -case 43: -#line 591 "parse.y" +case 44: +#line 599 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 44: -#line 594 "parse.y" +case 45: +#line 602 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 45: -#line 600 "parse.y" +case 46: +#line 608 "parse.y" { ; ; break;} -case 46: -#line 601 "parse.y" +case 47: +#line 609 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1590,152 +1602,152 @@ case 46: g_free(oldname); ; break;} -case 47: -#line 609 "parse.y" +case 48: +#line 617 "parse.y" { Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} -case 48: -#line 613 "parse.y" +case 49: +#line 621 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id,NULL); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 49: -#line 620 "parse.y" +case 50: +#line 628 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 50: -#line 623 "parse.y" +case 51: +#line 631 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 51: -#line 626 "parse.y" +case 52: +#line 634 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 52: -#line 629 "parse.y" +case 53: +#line 637 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 53: -#line 632 "parse.y" +case 54: +#line 640 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 54: -#line 635 "parse.y" +case 55: +#line 643 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 55: -#line 638 "parse.y" +case 56: +#line 646 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 56: -#line 641 "parse.y" +case 57: +#line 649 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 57: -#line 644 "parse.y" +case 58: +#line 652 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 58: -#line 647 "parse.y" +case 59: +#line 655 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 59: -#line 651 "parse.y" +case 60: +#line 659 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 60: -#line 654 "parse.y" +case 61: +#line 662 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 61: -#line 659 "parse.y" +case 62: +#line 667 "parse.y" { yyval.id = "long int"; ; break;} -case 62: -#line 662 "parse.y" +case 63: +#line 670 "parse.y" { yyval.id = "long"; ; break;} -case 63: -#line 665 "parse.y" +case 64: +#line 673 "parse.y" { yyval.id = "short int"; ; break;} -case 64: -#line 668 "parse.y" +case 65: +#line 676 "parse.y" { yyval.id = "short"; ; break;} -case 65: -#line 671 "parse.y" +case 66: +#line 679 "parse.y" { yyval.id = "int"; ; break;} -case 66: -#line 676 "parse.y" +case 67: +#line 684 "parse.y" { yyval.id = "enum "; ; break;} -case 67: -#line 679 "parse.y" +case 68: +#line 687 "parse.y" { yyval.id = "union "; ; break;} -case 68: -#line 682 "parse.y" +case 69: +#line 690 "parse.y" { yyval.id = "struct "; ; break;} -case 69: -#line 687 "parse.y" -{ stars++; ; - break;} case 70: -#line 688 "parse.y" +#line 695 "parse.y" { stars++; ; break;} case 71: -#line 692 "parse.y" +#line 696 "parse.y" +{ stars++; ; + break;} +case 72: +#line 700 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1749,14 +1761,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 704 "parse.y" +case 73: +#line 712 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 710 "parse.y" +case 74: +#line 718 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1770,8 +1782,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 722 "parse.y" +case 75: +#line 730 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1785,47 +1797,47 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 734 "parse.y" +case 76: +#line 742 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 737 "parse.y" +case 77: +#line 745 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 743 "parse.y" +case 78: +#line 751 "parse.y" { gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 78: -#line 748 "parse.y" +case 79: +#line 756 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 79: -#line 751 "parse.y" +case 80: +#line 759 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 80: -#line 756 "parse.y" +case 81: +#line 764 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 757 "parse.y" +case 82: +#line 765 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 761 "parse.y" +case 83: +#line 769 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1833,13 +1845,18 @@ case 82: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, yyvsp[-7].sigtype,NULL, yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 83: -#line 772 "parse.y" +case 84: +#line 785 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1847,13 +1864,18 @@ case 83: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, yyvsp[-7].sigtype, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 783 "parse.y" +case 85: +#line 801 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1861,13 +1883,18 @@ case 84: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-8].line, ccode_line, vararg, NULL); ; break;} -case 85: -#line 794 "parse.y" +case 86: +#line 817 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1875,13 +1902,18 @@ case 85: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 86: -#line 805 "parse.y" +case 87: +#line 833 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1894,8 +1926,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 816 "parse.y" +case 88: +#line 844 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1903,16 +1935,21 @@ case 87: vararg, NULL); ; break;} -case 88: -#line 822 "parse.y" +case 89: +#line 850 "parse.y" { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 89: -#line 827 "parse.y" +case 90: +#line 860 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1927,14 +1964,16 @@ case 89: } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); - g_string_free(yyvsp[-2].cbuf,TRUE); - yyerror(_("parse error")); + g_string_free(yyvsp[0].cbuf,TRUE); + yyerror(_("parse error " + "(untyped blocks must be init or " + "class_init)")); YYERROR; } ; break;} -case 90: -#line 848 "parse.y" +case 91: +#line 883 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1947,8 +1986,8 @@ case 90: g_free(yyvsp[-1].id); ; break;} -case 91: -#line 859 "parse.y" +case 92: +#line 894 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1969,30 +2008,30 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 878 "parse.y" +case 93: +#line 913 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 93: -#line 884 "parse.y" +case 94: +#line 919 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 94: -#line 885 "parse.y" +case 95: +#line 920 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 95: -#line 891 "parse.y" +case 96: +#line 926 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 96: -#line 892 "parse.y" +case 97: +#line 927 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -2005,8 +2044,8 @@ case 96: } ; break;} -case 97: -#line 903 "parse.y" +case 98: +#line 938 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -2018,40 +2057,40 @@ case 97: } ; break;} -case 98: -#line 913 "parse.y" -{ has_self = FALSE; ; - break;} case 99: -#line 916 "parse.y" -{ vararg = TRUE; ; +#line 948 "parse.y" +{ has_self = FALSE; ; break;} case 100: -#line 917 "parse.y" -{ vararg = FALSE; ; +#line 951 "parse.y" +{ vararg = TRUE; ; break;} case 101: -#line 920 "parse.y" -{ ; ; +#line 952 "parse.y" +{ vararg = FALSE; ; break;} case 102: -#line 921 "parse.y" +#line 955 "parse.y" { ; ; break;} case 103: -#line 924 "parse.y" +#line 956 "parse.y" +{ ; ; + break;} +case 104: +#line 959 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 104: -#line 927 "parse.y" +case 105: +#line 962 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 105: -#line 930 "parse.y" +case 106: +#line 965 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2061,8 +2100,8 @@ case 105: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 106: -#line 938 "parse.y" +case 107: +#line 973 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2072,16 +2111,16 @@ case 106: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 107: -#line 948 "parse.y" -{ ; ; - break;} case 108: -#line 949 "parse.y" +#line 983 "parse.y" { ; ; break;} case 109: -#line 952 "parse.y" +#line 984 "parse.y" +{ ; ; + break;} +case 110: +#line 987 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -2096,61 +2135,61 @@ case 109: g_free(yyvsp[0].id); ; break;} -case 110: -#line 965 "parse.y" +case 111: +#line 1000 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 111: -#line 969 "parse.y" +case 112: +#line 1004 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 973 "parse.y" +case 113: +#line 1008 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 977 "parse.y" +case 114: +#line 1012 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 981 "parse.y" +case 115: +#line 1016 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 115: -#line 985 "parse.y" +case 116: +#line 1020 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 116: -#line 991 "parse.y" +case 117: +#line 1026 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 117: -#line 992 "parse.y" +case 118: +#line 1027 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 118: -#line 996 "parse.y" +case 119: +#line 1031 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2375,5 +2414,5 @@ yyerrhandle: } return 1; } -#line 999 "parse.y" +#line 1034 "parse.y"