X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/5b42e9400440d86723a27747b2191ab8cd59c2ee..3379dcdfd0872947d761053c61d773add94d38c2:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 3eeb82b..480d236 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,24 +20,23 @@ #define FLOAT 270 #define DOUBLE 271 #define CHAR 272 -#define ONERROR 273 -#define TOKEN 274 -#define NUMBER 275 -#define TYPETOKEN 276 -#define ARRAY_DIM 277 -#define CCODE 278 -#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 +#define TOKEN 273 +#define NUMBER 274 +#define TYPETOKEN 275 +#define ARRAY_DIM 276 +#define CCODE 277 +#define HTCODE 278 +#define PHCODE 279 +#define HCODE 280 +#define ACODE 281 +#define ATCODE 282 +#define PUBLIC 283 +#define PRIVATE 284 +#define PROTECTED 285 +#define ARGUMENT 286 +#define VIRTUAL 287 +#define SIGNAL 288 +#define OVERRIDE 289 #line 21 "parse.y" @@ -47,7 +46,7 @@ #include #include -#include "tree.h" +#include "treefuncs.h" #include "main.h" #include "util.h" @@ -72,6 +71,9 @@ static gboolean destructor_simple = TRUE; static char *initializer = NULL; static int initializer_line = 0; +static char *onerror = NULL; +static char *defreturn = NULL; + static GList *gtktypes = NULL; /* this can be a global as we will only do one function at a time @@ -135,9 +137,9 @@ 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, gboolean vararg, - GList *flags) +push_function(int scope, int method, char *oid, char *id, + GString *cbuf, int line_no, int ccode_line, + gboolean vararg, GList *flags) { Node *node; Type *type; @@ -172,7 +174,7 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, c_cbuf = NULL; node = new_method(scope, method, type, oid, gtktypes, flags, - id, funcargs, onerror, c_cbuf, line_no, + id, funcargs, onerror, defreturn, c_cbuf, line_no, ccode_line, vararg); if(cbuf) @@ -183,9 +185,28 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, gtktypes = NULL; funcargs = NULL; + onerror = NULL; + defreturn = NULL; + class_nodes = g_list_append(class_nodes, node); } +static void +free_all_global_state(void) +{ + g_free(onerror); + onerror = NULL; + g_free(defreturn); + defreturn = NULL; + + g_list_foreach(gtktypes, (GFunc)g_free, NULL); + g_list_free(gtktypes); + gtktypes = NULL; + + free_node_list(funcargs); + funcargs = NULL; +} + static void push_funcarg(char *name, char *postfix) { @@ -194,7 +215,7 @@ push_funcarg(char *name, char *postfix) type->postfix = postfix; - node = new_funcarg(type,name,checks); + node = new_funcarg(type, name, checks); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -253,8 +274,27 @@ find_var_or_die(const char *id, int line) return NULL; } +static gboolean +set_return_value(char *type, char *val) +{ + if(strcmp(type, "onerror")==0) { + if(!onerror) { + onerror = val; + return TRUE; + } else + return FALSE; + } else if(strcmp(type, "defreturn")==0) { + if(!defreturn) { + defreturn = val; + return TRUE; + } else + return FALSE; + } + return FALSE; +} + -#line 236 "parse.y" +#line 277 "parse.y" typedef union { char *id; GString *cbuf; @@ -276,26 +316,26 @@ typedef union { -#define YYFINAL 239 +#define YYFINAL 242 #define YYFLAG -32768 -#define YYNTBASE 50 +#define YYNTBASE 49 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 86) +#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86) 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, 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, 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, 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, 37, 43, 38, 2, 2, 2, 2, 2, + 2, 2, 36, 42, 37, 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, @@ -311,7 +351,7 @@ 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, 36 + 27, 28, 29, 30, 31, 32, 33, 34, 35 }; #if YYDEBUG != 0 @@ -325,71 +365,72 @@ static const short yyprhs[] = { 0, 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, 328, 329, 331, 333, 337, 339, 343, 345, 349, - 351, 354, 358, 365, 373, 376, 378, 380, 383, 386, - 390, 394, 398, 402, 404, 407 + 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 }; -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, 56, 0, 56, 0, 77, 0, 61, - 0, 62, 0, 39, 0, 30, 0, 31, 0, 32, - 0, 20, 20, 0, 20, 37, 24, 0, 40, 85, - 0, 40, 37, 24, 0, 58, 59, 0, 59, 58, - 0, 59, 0, 58, 0, 0, 57, 66, 20, 60, - 39, 0, 57, 66, 20, 23, 60, 39, 0, 33, - 64, 63, 20, 20, 37, 24, 20, 37, 24, 39, - 0, 33, 64, 63, 20, 20, 37, 24, 39, 0, - 33, 64, 63, 20, 20, 0, 20, 41, 20, 66, - 42, 0, 20, 0, 41, 65, 42, 0, 0, 20, - 43, 65, 0, 20, 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, 20, 0, 70, 20, 0, - 22, 0, 6, 0, 13, 15, 0, 13, 0, 14, +static const short yyrhs[] = { 51, + 52, 51, 0, 52, 51, 0, 51, 52, 0, 52, + 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, 44, 71, 0, 44, 0, 20, 74, 0, - 74, 0, 57, 20, 74, 0, 20, 57, 74, 0, - 57, 74, 0, 72, 0, 20, 41, 75, 42, 0, - 75, 45, 20, 0, 20, 0, 37, 24, 0, 39, - 0, 35, 64, 73, 66, 20, 41, 79, 42, 78, - 76, 0, 57, 35, 64, 72, 66, 20, 41, 79, - 42, 78, 76, 0, 34, 57, 66, 20, 41, 79, - 42, 78, 76, 0, 57, 34, 66, 20, 41, 79, - 42, 78, 76, 0, 34, 66, 20, 41, 79, 42, - 78, 76, 0, 36, 41, 22, 42, 66, 20, 41, - 79, 42, 78, 76, 0, 57, 66, 20, 41, 79, - 42, 78, 76, 0, 20, 41, 20, 42, 76, 0, - 19, 85, 0, 19, 37, 24, 0, 0, 6, 0, - 20, 0, 20, 45, 80, 0, 80, 0, 81, 45, - 10, 0, 81, 0, 81, 45, 82, 0, 82, 0, - 66, 20, 0, 66, 20, 23, 0, 66, 20, 41, - 20, 83, 42, 0, 66, 20, 23, 41, 20, 83, - 42, 0, 83, 84, 0, 84, 0, 20, 0, 46, - 85, 0, 47, 85, 0, 46, 40, 85, 0, 47, - 40, 85, 0, 40, 40, 85, 0, 48, 40, 85, - 0, 21, 0, 49, 21, 0, 20, 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 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 255, 256, 257, 258, 261, 267, 273, 279, 285, 291, - 299, 300, 303, 308, 315, 320, 321, 324, 325, 326, - 327, 330, 331, 332, 335, 348, 364, 368, 376, 377, - 378, 379, 380, 386, 389, 393, 428, 456, 521, 530, - 536, 537, 540, 543, 549, 550, 558, 562, 569, 572, - 575, 578, 581, 584, 587, 590, 593, 596, 600, 603, - 608, 611, 614, 617, 620, 625, 628, 631, 636, 637, - 641, 653, 659, 671, 683, 686, 692, 697, 700, 705, - 706, 710, 720, 730, 740, 750, 760, 766, 771, 792, - 793, 797, 800, 801, 812, 822, 825, 826, 829, 830, - 833, 836, 839, 847, 857, 858, 861, 874, 878, 882, - 886, 890, 894, 900, 901, 905 + 295, 296, 297, 298, 301, 307, 313, 319, 325, 331, + 339, 340, 343, 348, 355, 360, 361, 364, 365, 366, + 367, 370, 371, 372, 375, 388, 404, 408, 416, 417, + 418, 419, 420, 426, 429, 433, 468, 496, 561, 570, + 576, 577, 580, 583, 589, 590, 598, 602, 609, 612, + 615, 618, 621, 624, 627, 630, 633, 636, 640, 643, + 648, 651, 654, 657, 660, 665, 668, 671, 676, 677, + 681, 693, 699, 711, 723, 726, 732, 737, 740, 745, + 746, 750, 761, 772, 783, 794, 805, 811, 816, 837, + 848, 867, 873, 874, 880, 881, 892, 902, 905, 906, + 909, 910, 913, 916, 919, 927, 937, 938, 941, 954, + 958, 962, 966, 970, 974, 980, 981, 985 }; #endif @@ -398,31 +439,31 @@ 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","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","onerror","funcargs","arglist","arglist1","arg","checklist","check", +"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 }; #endif static const short yyr1[] = { 0, - 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, - 52, 52, 53, 53, 54, 55, 55, 56, 56, 56, - 56, 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, 79, 79, 80, 80, 81, 81, - 82, 82, 82, 82, 83, 83, 84, 84, 84, 84, - 84, 84, 84, 85, 85, 85 + 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 }; static const short yyr2[] = { 0, @@ -435,9 +476,9 @@ static const short yyr2[] = { 0, 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 + 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, @@ -453,139 +494,141 @@ static const short yydefact[] = { 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, 96, - 98, 100, 79, 0, 74, 73, 0, 0, 0, 0, - 25, 0, 0, 116, 114, 0, 0, 27, 0, 29, - 30, 34, 80, 0, 0, 0, 0, 101, 92, 0, - 77, 0, 0, 0, 0, 0, 26, 35, 28, 115, - 92, 39, 0, 92, 95, 102, 0, 0, 0, 97, - 99, 78, 0, 0, 92, 0, 0, 0, 37, 0, - 0, 0, 0, 90, 86, 92, 0, 0, 0, 88, - 0, 84, 0, 107, 0, 0, 0, 0, 0, 106, - 91, 0, 92, 85, 92, 0, 0, 0, 0, 108, - 0, 109, 0, 103, 105, 82, 0, 0, 36, 104, - 112, 110, 111, 113, 87, 83, 0, 0, 0 + 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 }; -static const short yydefgoto[] = { 237, +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, 129, 130, - 131, 132, 209, 210, 148 + 82, 86, 87, 88, 134, 121, 34, 179, 194, 129, + 130, 131, 132, 210, 211, 195 }; -static const short yypact[] = { 54, - -16,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 54, 156, - -19, 38,-32768, 156, 156, 140, 29, 156, 25,-32768, --32768,-32768, 35, 137, 35, 47,-32768,-32768, 157,-32768, - 89,-32768,-32768,-32768,-32768, 102, 127, 142, 245,-32768, --32768,-32768,-32768, 261, 267, 150, 151,-32768,-32768,-32768, --32768,-32768,-32768, 210, 166,-32768, 167,-32768, 174, 95, - 191,-32768,-32768, 210, 35, 200, 187, 188, 196, 206, - 229,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 235, 225, - 167,-32768,-32768, -10, 248,-32768, 210,-32768, 227, 251, - 252, 45, 92, 127,-32768, 257, 258, 242, 228,-32768, - 243, 266, 268,-32768, -17,-32768, 269, 210, 246, -17, - 210, 34, -11, 6, 228, 250, 271, 253, 270,-32768, --32768,-32768, 210, 256, 228, 254, -1, 275, 259,-32768, - 260,-32768,-32768, 119,-32768,-32768, 262, 277, 228, 278, --32768, 276, 263,-32768,-32768, 280, 285,-32768, 265,-32768, --32768,-32768,-32768, 272, 284, 273, 210, 91, 290, 192, --32768, 279, 228, 281, 274, 282,-32768,-32768,-32768,-32768, - 290,-32768, -7, 290,-32768, 283, 291, 40, 92,-32768, --32768,-32768, 286, 228, 290, 228, 92, 288,-32768, 92, - 292, 93, 289,-32768,-32768, 290, 287, 92, 293,-32768, - 294,-32768, 93,-32768, 296, 70, 72, 297, 27,-32768, --32768, 92, 290,-32768, 290, 295, 88, 15, 15,-32768, - 15,-32768, 15,-32768,-32768,-32768, 92, 92,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 310, 317,-32768 +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 yypgoto[] = {-32768, - 255, 106, 311,-32768,-32768, 298, -22, 202, 205, 213, --32768,-32768,-32768, -6, 236, -24, 299,-32768, 73,-32768, - 264, 240,-32768, 53,-32768, -175,-32768, -157, -114, 175, --32768, 173, 136, -201, -173 + 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 }; -#define YYLAST 345 - - -static const short yytable[] = { 55, - 149, 54, 101, 195, 194, 12, 66, 225, 112, 101, - 156, 200, 188, 187, 202, 225, 190, 16, 60, 20, - 21, 22, 214, 102, 165, 144, 145, 198, 114, 79, - 102, 189, 220, 222, 144, 145, 226, 85, 212, 90, - -94, 17, 146, 157, 231, 232, 204, 233, 183, 234, - 35, 235, 236, 141, 147, 227, 1, 228, 91, 144, - 145, 103, 107, 147, 112, 36, 205, 113, 224, 197, - 142, 199, 206, 207, 208, 37, 193, 2, 3, 4, - 5, 6, 7, 138, 114, 115, 140, 61, 147, 144, - 145, 144, 145, 39, 40, 41, 42, 43, 154, 44, - 45, 46, 47, 48, 49, 50, 51, 204, 52, 219, - 53, 221, 204, 176, 84, 15, 74, 76, 147, 18, - 147, 67, 64, 65, 20, 21, 22, 205, 119, 230, - 120, 177, 205, 206, 207, 208, 104, 106, 206, 207, - 208, 39, 40, 41, 42, 43, 68, 44, 45, 46, - 47, 48, 49, 50, 51, 135, 52, 136, 53, 19, - 161, 70, 104, 162, 77, 78, 20, 21, 22, 20, - 21, 22, 23, 24, 25, 26, 19, 27, 28, 2, - 3, 4, 5, 6, 7, 80, 20, 21, 22, 23, - 24, 25, 26, 83, 62, 28, 39, 40, 41, 42, - 43, 180, 44, 45, 46, 47, 48, 49, 50, 51, - 81, 52, 89, 53, 39, 40, 41, 42, 43, 92, - 44, 45, 46, 47, 48, 49, 50, 51, 93, 52, - 94, 53, 39, 126, 41, 42, 43, 95, 44, 45, - 46, 47, 48, 49, 50, 51, 96, 127, 97, 53, - 40, 41, 42, 43, 98, 44, 45, 46, 47, 48, - 49, 50, 51, 13, 52, 99, 53, 105, 108, 13, - 109, 110, 13, 46, 47, 48, 123, 124, 73, 46, - 47, 48, 125, 102, 75, 133, 139, 101, 137, 114, - 112, 152, 155, 153, 158, -93, 164, 166, 182, 167, - 159, 168, 163, 169, 160, 170, 171, 173, 178, 238, - 192, 203, 211, 172, 174, 185, 239, 216, 151, 14, - 150, 184, 186, 191, 201, 143, 63, 196, 213, 122, - 111, 175, 181, 229, 215, 218, 223, 72, 217, 0, - 0, 0, 0, 0, 100 +#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 }; -static const short yycheck[] = { 24, - 115, 24, 20, 179, 178, 22, 31, 209, 20, 20, - 125, 187, 20, 171, 190, 217, 174, 37, 25, 30, - 31, 32, 198, 41, 139, 20, 21, 185, 40, 54, - 41, 39, 206, 207, 20, 21, 212, 60, 196, 64, - 42, 4, 37, 45, 218, 219, 20, 221, 163, 223, - 22, 227, 228, 20, 49, 213, 3, 215, 65, 20, - 21, 84, 87, 49, 20, 41, 40, 23, 42, 184, - 37, 186, 46, 47, 48, 41, 37, 24, 25, 26, - 27, 28, 29, 108, 40, 41, 111, 41, 49, 20, - 21, 20, 21, 5, 6, 7, 8, 9, 123, 11, - 12, 13, 14, 15, 16, 17, 18, 20, 20, 40, - 22, 40, 20, 23, 20, 10, 44, 45, 49, 14, - 49, 20, 34, 35, 30, 31, 32, 40, 37, 42, - 39, 41, 40, 46, 47, 48, 84, 85, 46, 47, - 48, 5, 6, 7, 8, 9, 20, 11, 12, 13, - 14, 15, 16, 17, 18, 103, 20, 105, 22, 20, - 42, 20, 110, 45, 15, 15, 30, 31, 32, 30, - 31, 32, 33, 34, 35, 36, 20, 38, 39, 24, - 25, 26, 27, 28, 29, 20, 30, 31, 32, 33, - 34, 35, 36, 20, 38, 39, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 44, 20, 22, 22, 5, 6, 7, 8, 9, 20, - 11, 12, 13, 14, 15, 16, 17, 18, 42, 20, - 43, 22, 5, 6, 7, 8, 9, 42, 11, 12, - 13, 14, 15, 16, 17, 18, 41, 20, 20, 22, - 6, 7, 8, 9, 20, 11, 12, 13, 14, 15, - 16, 17, 18, 9, 20, 41, 22, 20, 42, 15, - 20, 20, 18, 13, 14, 15, 20, 20, 18, 13, - 14, 15, 41, 41, 18, 20, 41, 20, 20, 40, - 20, 39, 37, 24, 20, 42, 20, 20, 20, 24, - 42, 39, 41, 24, 45, 21, 42, 24, 19, 0, - 20, 20, 24, 42, 42, 42, 0, 24, 117, 9, - 116, 41, 41, 41, 37, 113, 29, 42, 42, 94, - 91, 157, 160, 39, 42, 40, 40, 39, 203, -1, - -1, -1, -1, -1, 81 +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 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1131,23 +1174,23 @@ yyreduce: switch (yyn) { case 1: -#line 255 "parse.y" +#line 295 "parse.y" { ; ; break;} case 2: -#line 256 "parse.y" +#line 296 "parse.y" { ; ; break;} case 3: -#line 257 "parse.y" +#line 297 "parse.y" { ; ; break;} case 4: -#line 258 "parse.y" +#line 298 "parse.y" { ; ; break;} case 5: -#line 261 "parse.y" +#line 301 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1156,7 +1199,7 @@ case 5: ; break;} case 6: -#line 267 "parse.y" +#line 307 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1165,7 +1208,7 @@ case 6: ; break;} case 7: -#line 273 "parse.y" +#line 313 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1174,7 +1217,7 @@ case 7: ; break;} case 8: -#line 279 "parse.y" +#line 319 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1183,7 +1226,7 @@ case 8: ; break;} case 9: -#line 285 "parse.y" +#line 325 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1192,7 +1235,7 @@ case 9: ; break;} case 10: -#line 291 "parse.y" +#line 331 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1201,15 +1244,15 @@ case 10: ; break;} case 11: -#line 299 "parse.y" +#line 339 "parse.y" { ; ; break;} case 12: -#line 300 "parse.y" +#line 340 "parse.y" { ; ; break;} case 13: -#line 303 "parse.y" +#line 343 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1217,7 +1260,7 @@ case 13: ; break;} case 14: -#line 308 "parse.y" +#line 348 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1225,49 +1268,49 @@ case 14: ; break;} case 15: -#line 315 "parse.y" +#line 355 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 16: -#line 320 "parse.y" +#line 360 "parse.y" { ; ; break;} case 17: -#line 321 "parse.y" +#line 361 "parse.y" { ; ; break;} case 18: -#line 324 "parse.y" +#line 364 "parse.y" { ; ; break;} case 19: -#line 325 "parse.y" +#line 365 "parse.y" { ; ; break;} case 20: -#line 326 "parse.y" +#line 366 "parse.y" { ; ; break;} case 21: -#line 327 "parse.y" +#line 367 "parse.y" { ; ; break;} case 22: -#line 330 "parse.y" +#line 370 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} case 23: -#line 331 "parse.y" +#line 371 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} case 24: -#line 332 "parse.y" +#line 372 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} case 25: -#line 335 "parse.y" +#line 375 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1283,7 +1326,7 @@ case 25: ; break;} case 26: -#line 348 "parse.y" +#line 388 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1300,14 +1343,14 @@ case 26: ; break;} case 27: -#line 364 "parse.y" +#line 404 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} case 28: -#line 368 "parse.y" +#line 408 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; @@ -1315,42 +1358,42 @@ case 28: ; break;} case 29: -#line 376 "parse.y" +#line 416 "parse.y" { ; ; break;} case 30: -#line 377 "parse.y" +#line 417 "parse.y" { ; ; break;} case 31: -#line 378 "parse.y" +#line 418 "parse.y" { destructor = NULL; ; break;} case 32: -#line 379 "parse.y" +#line 419 "parse.y" { initializer = NULL; ; break;} case 33: -#line 380 "parse.y" +#line 420 "parse.y" { destructor = NULL; initializer = NULL; ; break;} case 34: -#line 386 "parse.y" +#line 426 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} case 35: -#line 389 "parse.y" +#line 429 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} case 36: -#line 393 "parse.y" +#line 433 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1388,7 +1431,7 @@ case 36: ; break;} case 37: -#line 428 "parse.y" +#line 468 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1419,7 +1462,7 @@ case 37: ; break;} case 38: -#line 456 "parse.y" +#line 496 "parse.y" { Node *node; char *get, *set = NULL; @@ -1485,7 +1528,7 @@ case 38: ; break;} case 39: -#line 521 "parse.y" +#line 561 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1497,38 +1540,38 @@ case 39: ; break;} case 40: -#line 530 "parse.y" +#line 570 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} case 41: -#line 536 "parse.y" +#line 576 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 42: -#line 537 "parse.y" +#line 577 "parse.y" { yyval.list = NULL; ; break;} case 43: -#line 540 "parse.y" +#line 580 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 44: -#line 543 "parse.y" +#line 583 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 45: -#line 549 "parse.y" +#line 589 "parse.y" { ; ; break;} case 46: -#line 550 "parse.y" +#line 590 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1537,14 +1580,14 @@ case 46: ; break;} case 47: -#line 558 "parse.y" +#line 598 "parse.y" { Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} case 48: -#line 562 "parse.y" +#line 602 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id,NULL); stars = 0; @@ -1552,140 +1595,140 @@ case 48: ; break;} case 49: -#line 569 "parse.y" +#line 609 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} case 50: -#line 572 "parse.y" +#line 612 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} case 51: -#line 575 "parse.y" +#line 615 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} case 52: -#line 578 "parse.y" +#line 618 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} case 53: -#line 581 "parse.y" +#line 621 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} case 54: -#line 584 "parse.y" +#line 624 "parse.y" { yyval.id = g_strdup("char"); ; break;} case 55: -#line 587 "parse.y" +#line 627 "parse.y" { yyval.id = g_strdup("double"); ; break;} case 56: -#line 590 "parse.y" +#line 630 "parse.y" { yyval.id = g_strdup("float"); ; break;} case 57: -#line 593 "parse.y" +#line 633 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 58: -#line 596 "parse.y" +#line 636 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} case 59: -#line 600 "parse.y" +#line 640 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 60: -#line 603 "parse.y" +#line 643 "parse.y" { yyval.id = g_strdup("void"); ; break;} case 61: -#line 608 "parse.y" +#line 648 "parse.y" { yyval.id = "long int"; ; break;} case 62: -#line 611 "parse.y" +#line 651 "parse.y" { yyval.id = "long"; ; break;} case 63: -#line 614 "parse.y" +#line 654 "parse.y" { yyval.id = "short int"; ; break;} case 64: -#line 617 "parse.y" +#line 657 "parse.y" { yyval.id = "short"; ; break;} case 65: -#line 620 "parse.y" +#line 660 "parse.y" { yyval.id = "int"; ; break;} case 66: -#line 625 "parse.y" +#line 665 "parse.y" { yyval.id = "enum "; ; break;} case 67: -#line 628 "parse.y" +#line 668 "parse.y" { yyval.id = "union "; ; break;} case 68: -#line 631 "parse.y" +#line 671 "parse.y" { yyval.id = "struct "; ; break;} case 69: -#line 636 "parse.y" +#line 676 "parse.y" { stars++; ; break;} case 70: -#line 637 "parse.y" +#line 677 "parse.y" { stars++; ; break;} case 71: -#line 641 "parse.y" +#line 681 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) + if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) + else if(strcmp(yyvsp[-1].id, "last")==0) yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); @@ -1696,13 +1739,13 @@ case 71: ; break;} case 72: -#line 653 "parse.y" +#line 693 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} case 73: -#line 659 "parse.y" +#line 699 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1717,7 +1760,7 @@ case 73: ; break;} case 74: -#line 671 "parse.y" +#line 711 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1732,138 +1775,143 @@ case 74: ; break;} case 75: -#line 683 "parse.y" +#line 723 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} case 76: -#line 686 "parse.y" +#line 726 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} case 77: -#line 692 "parse.y" +#line 732 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} case 78: -#line 697 "parse.y" +#line 737 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} case 79: -#line 700 "parse.y" +#line 740 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} case 80: -#line 705 "parse.y" +#line 745 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} case 81: -#line 706 "parse.y" +#line 746 "parse.y" { yyval.cbuf = NULL; ; break;} case 82: -#line 710 "parse.y" +#line 750 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} case 83: -#line 720 "parse.y" +#line 761 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(the_scope, yyvsp[-7].sigtype, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} case 84: -#line 730 "parse.y" +#line 772 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + yyvsp[0].cbuf, yyvsp[-8].line, ccode_line, vararg, NULL); ; break;} case 85: -#line 740 "parse.y" +#line 783 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} case 86: -#line 750 "parse.y" +#line 794 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} case 87: -#line 760 "parse.y" +#line 805 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-10].line, ccode_line, vararg, NULL); ; break;} case 88: -#line 766 "parse.y" +#line 811 "parse.y" { push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} case 89: -#line 771 "parse.y" +#line 816 "parse.y" { - if(strcmp(yyvsp[-4].id,"init")==0) { + 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, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, ccode_line, FALSE, NULL); - } else if(strcmp(yyvsp[-4].id,"class_init")==0) { + } 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, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, ccode_line, FALSE, NULL); } else { g_free(yyvsp[-4].id); @@ -1875,26 +1923,65 @@ case 89: ; break;} case 90: -#line 792 "parse.y" -{ yyval.id = yyvsp[0].id; ; +#line 837 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-1].id); + ; break;} case 91: -#line 793 "parse.y" +#line 848 "parse.y" { - yyval.id = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf,FALSE); - ; + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + onerror = defreturn = NULL; + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-3].id); + g_free(yyvsp[-1].id); + ; break;} case 92: -#line 797 "parse.y" -{ yyval.id = NULL; ; +#line 867 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; break;} case 93: -#line 800 "parse.y" -{ vararg = FALSE; has_self = FALSE; ; +#line 873 "parse.y" +{ yyval.id = yyvsp[0].id; ; break;} case 94: -#line 801 "parse.y" +#line 874 "parse.y" +{ + yyval.id = (yyvsp[1].cbuf)->str; + g_string_free(yyvsp[1].cbuf, FALSE); + ; + break;} +case 95: +#line 880 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; + break;} +case 96: +#line 881 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1907,8 +1994,8 @@ case 94: } ; break;} -case 95: -#line 812 "parse.y" +case 97: +#line 892 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1920,40 +2007,40 @@ case 95: } ; break;} -case 96: -#line 822 "parse.y" +case 98: +#line 902 "parse.y" { has_self = FALSE; ; break;} -case 97: -#line 825 "parse.y" +case 99: +#line 905 "parse.y" { vararg = TRUE; ; break;} -case 98: -#line 826 "parse.y" +case 100: +#line 906 "parse.y" { vararg = FALSE; ; break;} -case 99: -#line 829 "parse.y" +case 101: +#line 909 "parse.y" { ; ; break;} -case 100: -#line 830 "parse.y" +case 102: +#line 910 "parse.y" { ; ; break;} -case 101: -#line 833 "parse.y" +case 103: +#line 913 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 102: -#line 836 "parse.y" +case 104: +#line 916 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 103: -#line 839 "parse.y" +case 105: +#line 919 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1963,8 +2050,8 @@ case 103: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 104: -#line 847 "parse.y" +case 106: +#line 927 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1974,16 +2061,16 @@ case 104: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 105: -#line 857 "parse.y" +case 107: +#line 937 "parse.y" { ; ; break;} -case 106: -#line 858 "parse.y" +case 108: +#line 938 "parse.y" { ; ; break;} -case 107: -#line 861 "parse.y" +case 109: +#line 941 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1998,61 +2085,61 @@ case 107: g_free(yyvsp[0].id); ; break;} -case 108: -#line 874 "parse.y" +case 110: +#line 954 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 109: -#line 878 "parse.y" +case 111: +#line 958 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 110: -#line 882 "parse.y" +case 112: +#line 962 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 111: -#line 886 "parse.y" +case 113: +#line 966 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 890 "parse.y" +case 114: +#line 970 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 894 "parse.y" +case 115: +#line 974 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 900 "parse.y" +case 116: +#line 980 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 115: -#line 901 "parse.y" +case 117: +#line 981 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 116: -#line 905 "parse.y" +case 118: +#line 985 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2277,5 +2364,5 @@ yyerrhandle: } return 1; } -#line 908 "parse.y" +#line 988 "parse.y"