X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/774037b15064dcc6e4995c0bba3b24abb1bde35f..b17287deb56775a49030d738d8c8c0e9cd15f9fe:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 783037d..b70b550 100644 --- a/src/parse.c +++ b/src/parse.c @@ -26,14 +26,18 @@ #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 ACODE 282 +#define ATCODE 283 +#define PUBLIC 284 +#define PRIVATE 285 +#define PROTECTED 286 +#define ARGUMENT 287 +#define VIRTUAL 288 +#define SIGNAL 289 +#define OVERRIDE 290 #line 21 "parse.y" @@ -45,11 +49,10 @@ #include "tree.h" #include "main.h" +#include "util.h" #define _(x) (x) -extern char *filename; - GList *nodes = NULL; static GList *class_nodes = NULL; @@ -123,7 +126,8 @@ push_variable(char *name, int scope, int line_no, char *postfix) static void push_function(int scope, int method, char *oid, char *id, char *onerror, - GString *cbuf,int line_no, int ccode_line, int vararg) + GString *cbuf, int line_no, int ccode_line, gboolean vararg, + GList *flags) { Node *node; Type *type; @@ -157,8 +161,9 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, } else c_cbuf = NULL; - node = new_method(scope,method,type,oid,gtktypes,id,funcargs, - onerror,c_cbuf,line_no,ccode_line,vararg); + node = new_method(scope, method, type, oid, gtktypes, flags, + id, funcargs, onerror, c_cbuf, line_no, + ccode_line, vararg); if(cbuf) g_string_free(cbuf, @@ -216,7 +221,7 @@ push_self(char *id) } -#line 202 "parse.y" +#line 203 "parse.y" typedef union { char *id; GString *cbuf; @@ -238,26 +243,26 @@ typedef union { -#define YYFINAL 219 +#define YYFINAL 225 #define YYFLAG -32768 -#define YYNTBASE 46 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 77) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 82) 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, 48, 2, 2, 2, 2, 2, 2, 40, + 41, 43, 2, 44, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 39, 46, + 47, 45, 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, 37, 42, 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, @@ -273,79 +278,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, 35, 36 }; #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, 22, + 24, 27, 29, 34, 38, 43, 46, 49, 52, 54, + 56, 58, 60, 62, 64, 69, 75, 87, 96, 102, + 104, 108, 109, 113, 115, 117, 120, 122, 125, 128, + 131, 133, 136, 139, 141, 143, 145, 147, 150, 152, + 154, 157, 159, 162, 164, 166, 168, 170, 172, 175, + 177, 180, 182, 186, 190, 193, 195, 200, 204, 206, + 209, 211, 222, 234, 244, 254, 263, 275, 284, 290, + 293, 297, 298, 300, 302, 306, 308, 312, 314, 318, + 320, 323, 327, 334, 342, 345, 347, 349, 352, 355, + 359, 363, 367, 371, 373, 376 }; -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[] = { 52, + 53, 52, 0, 53, 52, 0, 52, 53, 0, 53, + 0, 24, 0, 27, 0, 25, 0, 26, 0, 28, + 0, 29, 0, 52, 51, 0, 51, 0, 54, 37, + 55, 38, 0, 54, 37, 38, 0, 3, 22, 4, + 22, 0, 55, 73, 0, 55, 57, 0, 55, 58, + 0, 73, 0, 57, 0, 58, 0, 30, 0, 31, + 0, 32, 0, 56, 62, 20, 39, 0, 56, 62, + 20, 23, 39, 0, 33, 60, 59, 20, 20, 37, + 24, 20, 37, 24, 39, 0, 33, 60, 59, 20, + 20, 37, 24, 39, 0, 20, 40, 20, 62, 41, + 0, 20, 0, 40, 61, 41, 0, 0, 20, 42, + 61, 0, 20, 0, 63, 0, 5, 63, 0, 64, + 0, 64, 67, 0, 12, 65, 0, 11, 65, 0, + 65, 0, 12, 18, 0, 11, 18, 0, 18, 0, + 17, 0, 16, 0, 20, 0, 66, 20, 0, 22, + 0, 6, 0, 13, 15, 0, 13, 0, 14, 15, + 0, 14, 0, 15, 0, 9, 0, 8, 0, 7, + 0, 43, 67, 0, 43, 0, 20, 70, 0, 70, + 0, 56, 20, 70, 0, 20, 56, 70, 0, 56, + 70, 0, 68, 0, 20, 40, 71, 41, 0, 71, + 44, 20, 0, 20, 0, 37, 24, 0, 39, 0, + 35, 60, 69, 62, 20, 40, 75, 41, 74, 72, + 0, 56, 35, 60, 68, 62, 20, 40, 75, 41, + 74, 72, 0, 34, 56, 62, 20, 40, 75, 41, + 74, 72, 0, 56, 34, 62, 20, 40, 75, 41, + 74, 72, 0, 34, 62, 20, 40, 75, 41, 74, + 72, 0, 36, 40, 22, 41, 62, 20, 40, 75, + 41, 74, 72, 0, 56, 62, 20, 40, 75, 41, + 74, 72, 0, 20, 40, 20, 41, 72, 0, 19, + 81, 0, 19, 37, 24, 0, 0, 6, 0, 20, + 0, 20, 44, 76, 0, 76, 0, 77, 44, 10, + 0, 77, 0, 77, 44, 78, 0, 78, 0, 62, + 20, 0, 62, 20, 23, 0, 62, 20, 40, 20, + 79, 41, 0, 62, 20, 23, 40, 20, 79, 41, + 0, 79, 80, 0, 80, 0, 20, 0, 45, 81, + 0, 46, 81, 0, 45, 47, 81, 0, 46, 47, + 81, 0, 47, 47, 81, 0, 48, 47, 81, 0, + 21, 0, 49, 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 + 222, 223, 224, 225, 228, 234, 240, 246, 252, 258, + 266, 267, 270, 275, 282, 287, 288, 289, 290, 291, + 292, 295, 296, 297, 300, 303, 307, 342, 372, 381, + 387, 388, 391, 394, 400, 401, 409, 413, 420, 423, + 426, 429, 432, 435, 438, 441, 444, 447, 451, 454, + 459, 462, 465, 468, 471, 476, 479, 482, 487, 488, + 492, 504, 510, 522, 534, 537, 543, 548, 551, 556, + 557, 561, 571, 581, 591, 601, 611, 617, 622, 643, + 644, 648, 651, 652, 663, 673, 676, 677, 680, 681, + 684, 687, 690, 698, 708, 709, 712, 725, 729, 733, + 737, 741, 745, 751, 752, 756 }; #endif @@ -355,178 +361,184 @@ 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","ACODE","ATCODE","PUBLIC","PRIVATE", +"PROTECTED","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'('", +"')'","'|'","'*'","','","'>'","'<'","'='","'!'","'-'","prog","ccode","ccodes", +"class","classdec","classcode","scope","variable","argument","argtype","flags", +"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 + 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, + 52, 52, 53, 53, 54, 55, 55, 55, 55, 55, + 55, 56, 56, 56, 57, 57, 58, 58, 59, 59, + 60, 60, 61, 61, 62, 62, 63, 63, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 65, 65, 65, 65, 65, 66, 66, 66, 67, 67, + 68, 68, 69, 69, 69, 69, 70, 71, 71, 72, + 72, 73, 73, 73, 73, 73, 73, 73, 73, 74, + 74, 74, 75, 75, 75, 75, 76, 76, 77, 77, + 78, 78, 78, 78, 79, 79, 80, 80, 80, 80, + 80, 80, 80, 81, 81, 81 }; 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, 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, 10, 11, 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, 9, 10, 12, 0, 4, + 0, 0, 11, 3, 2, 0, 0, 1, 0, 22, + 23, 24, 32, 0, 32, 0, 14, 0, 0, 20, + 21, 19, 15, 0, 0, 0, 0, 50, 58, 57, + 56, 0, 0, 52, 54, 55, 46, 45, 44, 47, + 49, 0, 0, 35, 37, 41, 0, 0, 0, 13, + 17, 18, 16, 0, 32, 0, 0, 34, 0, 30, + 0, 36, 43, 40, 42, 39, 51, 53, 0, 0, + 60, 38, 48, 0, 0, 66, 0, 62, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 59, + 0, 0, 0, 61, 0, 65, 0, 0, 0, 0, + 0, 0, 25, 0, 0, 71, 79, 33, 0, 0, + 0, 50, 47, 0, 0, 86, 88, 90, 69, 0, + 64, 63, 0, 0, 0, 0, 26, 0, 70, 0, + 0, 0, 0, 91, 82, 0, 67, 0, 0, 0, + 0, 0, 82, 29, 0, 82, 85, 92, 0, 0, + 0, 87, 89, 68, 0, 0, 82, 0, 0, 0, + 28, 0, 0, 0, 106, 104, 0, 0, 80, 76, + 82, 0, 0, 0, 78, 0, 74, 0, 97, 0, + 0, 0, 0, 0, 96, 81, 105, 0, 82, 75, + 82, 0, 0, 0, 98, 0, 99, 0, 0, 93, + 95, 72, 0, 0, 27, 94, 100, 101, 102, 103, + 77, 73, 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[] = { 223, + 8, 9, 10, 11, 28, 29, 30, 31, 71, 36, + 69, 124, 54, 55, 56, 57, 82, 86, 87, 88, + 130, 117, 32, 161, 125, 126, 127, 128, 194, 195, + 179 }; -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[] = { 136, + 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 119, + 32, 10,-32768, 119, 119, 146, 67, 119, 40,-32768, +-32768,-32768, 57, 120, 57, 68,-32768, 155, 59,-32768, +-32768,-32768,-32768, 78, 95, 96, 242,-32768,-32768,-32768, +-32768, 252, 258, 115, 126,-32768,-32768,-32768,-32768,-32768, +-32768, 207, 129,-32768, 113,-32768, 137, 70, 151,-32768, +-32768,-32768,-32768, 207, 57, 138, 133, 141, 167, 152, + 190,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 197, 186, + 113,-32768,-32768, 2, 208,-32768, 207,-32768, 194, 224, + 226, -19, 131, 95,-32768, 232, 241, 223, 225,-32768, + 228, 249, 254,-32768, -4,-32768, 255, 207, 237, -4, + 207, 239,-32768, 225, 256,-32768,-32768,-32768, 207, 244, + 225, 238, 47, 262, 243,-32768, 245,-32768,-32768, 66, +-32768,-32768, 246, 263, 225, 265,-32768, 247,-32768, 250, + 266, 251, 207, 7, 268, 189,-32768, 273, 225, 257, + 253, 259, 268,-32768, -1, 268,-32768, 260, 275, -10, + 131,-32768,-32768,-32768, 261, 225, 268, 225, 131, 264, +-32768, 131, 276, 76,-32768,-32768, 274, 282,-32768,-32768, + 268, 267, 131, 269,-32768, 280,-32768, 76,-32768, 62, + 65, 270, 271, 58,-32768,-32768,-32768, 131, 268,-32768, + 268, 272, 72, -8,-32768, -8,-32768, -8, -8,-32768, +-32768,-32768, 131, 131,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 305, 306,-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 + 37, 145, 298,-32768,-32768, -23, 281, 284,-32768, -17, + 219, -24, 277,-32768, 15,-32768, 234, 229,-32768, -60, +-32768, -154, 288, -150, -112, 176,-32768, 175, 134, -141, + -37 }; -#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 322 + + +static const short yytable[] = { 53, + 52, 138, 169, 112, 66, 172, 180, 58, 142, 175, + 176, 175, 176, 17, 185, 101, 183, 187, 170, 113, + 114, 101, 151, 104, 106, 12, 177, 79, 200, 158, + 198, 20, 21, 22, 85, 102, 165, 171, 178, 90, + 178, 102, 131, 212, 132, 13, 159, 91, 213, 104, + 214, 13, 211, 182, 13, 184, 74, 76, 221, 222, + 103, 211, 107, 37, 38, 39, 40, 41, 16, 42, + 43, 44, 45, 46, 47, 48, 49, 189, 50, 34, + 51, 175, 176, 134, 175, 176, 136, -84, 33, 84, + 143, 189, 64, 65, 140, 189, 35, 67, 210, 20, + 21, 22, 190, 191, 192, 193, 147, 59, 204, 148, + 178, 206, 216, 178, 68, 70, 190, 191, 192, 193, + 190, 191, 192, 193, 37, 38, 39, 40, 41, 77, + 42, 43, 44, 45, 46, 47, 48, 49, 1, 50, + 78, 51, 2, 3, 4, 5, 6, 7, 80, 20, + 21, 22, 205, 207, 15, 81, 83, 92, 18, 2, + 3, 4, 5, 6, 7, 19, 217, 115, 218, 116, + 219, 220, 89, 93, 19, 20, 21, 22, 23, 24, + 25, 26, 94, 27, 20, 21, 22, 23, 24, 25, + 26, 96, 60, 37, 38, 39, 40, 41, 162, 42, + 43, 44, 45, 46, 47, 48, 49, 95, 50, 97, + 51, 37, 38, 39, 40, 41, 98, 42, 43, 44, + 45, 46, 47, 48, 49, 99, 50, 105, 51, 37, + 122, 39, 40, 41, 108, 42, 43, 44, 45, 46, + 47, 48, 49, 109, 123, 110, 51, 38, 39, 40, + 41, 119, 42, 43, 44, 45, 46, 47, 48, 49, + 120, 50, 121, 51, 44, 45, 46, 102, 129, 73, + 44, 45, 46, 101, 133, 75, 135, 137, -83, 139, + 141, 144, 150, 145, 152, 149, 160, 153, 146, 155, + 154, 156, 164, 167, 174, 188, 166, 196, 168, 173, + 186, 181, 197, 202, 224, 225, 14, 199, 61, 201, + 215, 62, 118, 72, 100, 63, 208, 209, 157, 111, + 163, 203 }; -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[] = { 24, + 24, 114, 153, 23, 29, 156, 161, 25, 121, 20, + 21, 20, 21, 4, 169, 20, 167, 172, 20, 39, + 40, 20, 135, 84, 85, 22, 37, 52, 183, 23, + 181, 30, 31, 32, 58, 40, 149, 39, 49, 64, + 49, 40, 103, 198, 105, 9, 40, 65, 199, 110, + 201, 15, 194, 166, 18, 168, 42, 43, 213, 214, + 84, 203, 87, 5, 6, 7, 8, 9, 37, 11, + 12, 13, 14, 15, 16, 17, 18, 20, 20, 40, + 22, 20, 21, 108, 20, 21, 111, 41, 22, 20, + 44, 20, 34, 35, 119, 20, 40, 20, 41, 30, + 31, 32, 45, 46, 47, 48, 41, 40, 47, 44, + 49, 47, 41, 49, 20, 20, 45, 46, 47, 48, + 45, 46, 47, 48, 5, 6, 7, 8, 9, 15, + 11, 12, 13, 14, 15, 16, 17, 18, 3, 20, + 15, 22, 24, 25, 26, 27, 28, 29, 20, 30, + 31, 32, 190, 191, 10, 43, 20, 20, 14, 24, + 25, 26, 27, 28, 29, 20, 204, 37, 206, 39, + 208, 209, 22, 41, 20, 30, 31, 32, 33, 34, + 35, 36, 42, 38, 30, 31, 32, 33, 34, 35, + 36, 40, 38, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 41, 20, 20, + 22, 5, 6, 7, 8, 9, 20, 11, 12, 13, + 14, 15, 16, 17, 18, 40, 20, 20, 22, 5, + 6, 7, 8, 9, 41, 11, 12, 13, 14, 15, + 16, 17, 18, 20, 20, 20, 22, 6, 7, 8, + 9, 20, 11, 12, 13, 14, 15, 16, 17, 18, + 20, 20, 40, 22, 13, 14, 15, 40, 20, 18, + 13, 14, 15, 20, 20, 18, 40, 39, 41, 24, + 37, 20, 20, 41, 20, 40, 19, 41, 44, 24, + 41, 41, 20, 41, 20, 20, 40, 24, 40, 40, + 37, 41, 21, 24, 0, 0, 9, 41, 28, 41, + 39, 28, 94, 37, 81, 28, 47, 47, 143, 91, + 146, 188 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1072,127 +1084,155 @@ yyreduce: switch (yyn) { case 1: -#line 221 "parse.y" +#line 222 "parse.y" { ; ; break;} case 2: -#line 222 "parse.y" +#line 223 "parse.y" { ; ; break;} case 3: -#line 223 "parse.y" +#line 224 "parse.y" { ; ; break;} case 4: -#line 224 "parse.y" +#line 225 "parse.y" { ; ; break;} case 5: -#line 227 "parse.y" +#line 228 "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 234 "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); ; break;} case 7: -#line 238 "parse.y" +#line 240 "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); ; break;} case 8: -#line 244 "parse.y" +#line 246 "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" +{ + Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 10: +#line 258 "parse.y" +{ + Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 11: +#line 266 "parse.y" +{ ; ; + break;} +case 12: +#line 267 "parse.y" +{ ; ; + break;} +case 13: +#line 270 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 10: -#line 256 "parse.y" +case 14: +#line 275 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 11: -#line 263 "parse.y" +case 15: +#line 282 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} -case 12: -#line 268 "parse.y" +case 16: +#line 287 "parse.y" { ; ; break;} -case 13: -#line 269 "parse.y" +case 17: +#line 288 "parse.y" { ; ; break;} -case 14: -#line 270 "parse.y" +case 18: +#line 289 "parse.y" { ; ; break;} -case 15: -#line 271 "parse.y" +case 19: +#line 290 "parse.y" { ; ; break;} -case 16: -#line 272 "parse.y" +case 20: +#line 291 "parse.y" { ; ; break;} -case 17: -#line 273 "parse.y" +case 21: +#line 292 "parse.y" { ; ; break;} -case 18: -#line 276 "parse.y" +case 22: +#line 295 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} -case 19: -#line 277 "parse.y" +case 23: +#line 296 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} -case 20: -#line 278 "parse.y" +case 24: +#line 297 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} -case 21: -#line 281 "parse.y" +case 25: +#line 300 "parse.y" { push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL); ; break;} -case 22: -#line 284 "parse.y" +case 26: +#line 303 "parse.y" { push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id); ; break;} -case 23: -#line 288 "parse.y" +case 27: +#line 307 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1229,8 +1269,8 @@ case 23: } ; break;} -case 24: -#line 323 "parse.y" +case 28: +#line 342 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1260,8 +1300,8 @@ case 24: } ; break;} -case 25: -#line 353 "parse.y" +case 29: +#line 372 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1272,39 +1312,39 @@ case 25: yyval.id = yyvsp[-4].id; ; break;} -case 26: -#line 362 "parse.y" +case 30: +#line 381 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 27: -#line 368 "parse.y" +case 31: +#line 387 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 28: -#line 369 "parse.y" +case 32: +#line 388 "parse.y" { yyval.list = NULL; ; break;} -case 29: -#line 372 "parse.y" +case 33: +#line 391 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 30: -#line 375 "parse.y" +case 34: +#line 394 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 31: -#line 381 "parse.y" +case 35: +#line 400 "parse.y" { ; ; break;} -case 32: -#line 382 "parse.y" +case 36: +#line 401 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1312,152 +1352,152 @@ case 32: g_free(oldname); ; break;} -case 33: -#line 390 "parse.y" +case 37: +#line 409 "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 38: +#line 413 "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 39: +#line 420 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 36: -#line 404 "parse.y" +case 40: +#line 423 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 37: -#line 407 "parse.y" +case 41: +#line 426 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 38: -#line 410 "parse.y" +case 42: +#line 429 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 39: -#line 413 "parse.y" +case 43: +#line 432 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 40: -#line 416 "parse.y" +case 44: +#line 435 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 41: -#line 419 "parse.y" +case 45: +#line 438 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 42: -#line 422 "parse.y" +case 46: +#line 441 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 43: -#line 425 "parse.y" +case 47: +#line 444 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 44: -#line 428 "parse.y" +case 48: +#line 447 "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 49: +#line 451 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 46: -#line 435 "parse.y" +case 50: +#line 454 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 47: -#line 440 "parse.y" +case 51: +#line 459 "parse.y" { yyval.id = "long int"; ; break;} -case 48: -#line 443 "parse.y" +case 52: +#line 462 "parse.y" { yyval.id = "long"; ; break;} -case 49: -#line 446 "parse.y" +case 53: +#line 465 "parse.y" { yyval.id = "short int"; ; break;} -case 50: -#line 449 "parse.y" +case 54: +#line 468 "parse.y" { yyval.id = "short"; ; break;} -case 51: -#line 452 "parse.y" +case 55: +#line 471 "parse.y" { yyval.id = "int"; ; break;} -case 52: -#line 457 "parse.y" +case 56: +#line 476 "parse.y" { yyval.id = "enum "; ; break;} -case 53: -#line 460 "parse.y" +case 57: +#line 479 "parse.y" { yyval.id = "union "; ; break;} -case 54: -#line 463 "parse.y" +case 58: +#line 482 "parse.y" { yyval.id = "struct "; ; break;} -case 55: -#line 468 "parse.y" +case 59: +#line 487 "parse.y" { stars++; ; break;} -case 56: -#line 469 "parse.y" +case 60: +#line 488 "parse.y" { stars++; ; break;} -case 57: -#line 473 "parse.y" +case 61: +#line 492 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1471,14 +1511,14 @@ case 57: g_free(yyvsp[-1].id); ; break;} -case 58: -#line 485 "parse.y" +case 62: +#line 504 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 59: -#line 491 "parse.y" +case 63: +#line 510 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1492,8 +1532,8 @@ case 59: g_free(yyvsp[-1].id); ; break;} -case 60: -#line 503 "parse.y" +case 64: +#line 522 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1507,47 +1547,47 @@ case 60: g_free(yyvsp[-2].id); ; break;} -case 61: -#line 515 "parse.y" +case 65: +#line 534 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 62: -#line 518 "parse.y" +case 66: +#line 537 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 63: -#line 524 "parse.y" +case 67: +#line 543 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 64: -#line 529 "parse.y" +case 68: +#line 548 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 65: -#line 532 "parse.y" +case 69: +#line 551 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 66: -#line 537 "parse.y" +case 70: +#line 556 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 67: -#line 538 "parse.y" +case 71: +#line 557 "parse.y" { yyval.cbuf = NULL; ; break;} -case 68: -#line 542 "parse.y" +case 72: +#line 561 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1555,25 +1595,25 @@ case 68: YYERROR; } push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 69: -#line 552 "parse.y" +case 73: +#line 571 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + push_function(the_scope, yyvsp[-7].sigtype, NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 70: -#line 562 "parse.y" +case 74: +#line 581 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1581,12 +1621,12 @@ case 70: YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + ccode_line, vararg, NULL); ; break;} -case 71: -#line 572 "parse.y" +case 75: +#line 591 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1594,12 +1634,12 @@ case 71: YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 72: -#line 582 "parse.y" +case 76: +#line 601 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1607,40 +1647,40 @@ case 72: YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 73: -#line 592 "parse.y" +case 77: +#line 611 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, - yyvsp[-10].line,ccode_line, - vararg); + yyvsp[-10].line, ccode_line, + vararg, NULL); ; break;} -case 74: -#line 598 "parse.y" +case 78: +#line 617 "parse.y" { push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line, - vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + vararg, NULL); ; break;} -case 75: -#line 603 "parse.y" +case 79: +#line 622 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); } else if(strcmp(yyvsp[-4].id,"class_init")==0) { push_init_arg(yyvsp[-2].id,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); @@ -1650,27 +1690,27 @@ case 75: } ; break;} -case 76: -#line 624 "parse.y" +case 80: +#line 643 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 77: -#line 625 "parse.y" +case 81: +#line 644 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 78: -#line 629 "parse.y" +case 82: +#line 648 "parse.y" { yyval.id = NULL; ; break;} -case 79: -#line 632 "parse.y" +case 83: +#line 651 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 80: -#line 633 "parse.y" +case 84: +#line 652 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1683,8 +1723,8 @@ case 80: } ; break;} -case 81: -#line 644 "parse.y" +case 85: +#line 663 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1696,40 +1736,40 @@ case 81: } ; break;} -case 82: -#line 654 "parse.y" +case 86: +#line 673 "parse.y" { has_self = FALSE; ; break;} -case 83: -#line 657 "parse.y" +case 87: +#line 676 "parse.y" { vararg = TRUE; ; break;} -case 84: -#line 658 "parse.y" +case 88: +#line 677 "parse.y" { vararg = FALSE; ; break;} -case 85: -#line 661 "parse.y" +case 89: +#line 680 "parse.y" { ; ; break;} -case 86: -#line 662 "parse.y" +case 90: +#line 681 "parse.y" { ; ; break;} -case 87: -#line 665 "parse.y" +case 91: +#line 684 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 88: -#line 668 "parse.y" +case 92: +#line 687 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 89: -#line 671 "parse.y" +case 93: +#line 690 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1739,8 +1779,8 @@ case 89: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 90: -#line 679 "parse.y" +case 94: +#line 698 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1750,16 +1790,16 @@ case 90: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 91: -#line 689 "parse.y" +case 95: +#line 708 "parse.y" { ; ; break;} -case 92: -#line 690 "parse.y" +case 96: +#line 709 "parse.y" { ; ; break;} -case 93: -#line 693 "parse.y" +case 97: +#line 712 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1774,61 +1814,61 @@ case 93: g_free(yyvsp[0].id); ; break;} -case 94: -#line 706 "parse.y" +case 98: +#line 725 "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 99: +#line 729 "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 100: +#line 733 "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 101: +#line 737 "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 102: +#line 741 "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 103: +#line 745 "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 104: +#line 751 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 101: -#line 733 "parse.y" +case 105: +#line 752 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 102: -#line 737 "parse.y" +case 106: +#line 756 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2053,5 +2093,5 @@ yyerrhandle: } return 1; } -#line 740 "parse.y" +#line 759 "parse.y"