X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/5b42e9400440d86723a27747b2191ab8cd59c2ee..refs/tags/v1.0.0:/src/parse.c?ds=sidebyside diff --git a/src/parse.c b/src/parse.c index 3eeb82b..a3b796c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,20 +20,20 @@ #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 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 CLASSWIDE 286 #define ARGUMENT 287 #define VIRTUAL 288 #define SIGNAL 289 @@ -47,7 +47,7 @@ #include #include -#include "tree.h" +#include "treefuncs.h" #include "main.h" #include "util.h" @@ -72,6 +72,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,13 +138,15 @@ 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; char *c_cbuf; + + g_assert(scope != CLASS_SCOPE); if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) { type = pop_type(); @@ -156,11 +161,22 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, g_list_length(gtktypes) != g_list_length(funcargs) && !(g_list_length(funcargs) == 1 && g_list_length(gtktypes) == 2 && - strcmp(gtktypes->next->data,"NONE")==0)) { + strcmp(gtktypes->next->data, "NONE")==0)) { print_error(TRUE, _("The number of GTK arguments and " "function arguments for a signal " "don't seem to match"), line_no); } + if(g_list_length(gtktypes) > 2) { + GList *li; + for(li = gtktypes->next; li; li = li->next) { + if(strcmp(li->data, "NONE")==0) { + print_error(FALSE, + _("NONE can only appear in an " + "argument list by itself"), + line_no); + } + } + } if(cbuf) { char *p; c_cbuf = p = cbuf->str; @@ -172,8 +188,8 @@ 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, - ccode_line, vararg); + id, funcargs, onerror, defreturn, c_cbuf, line_no, + ccode_line, vararg, method_unique_id++); if(cbuf) g_string_free(cbuf, @@ -183,9 +199,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 +229,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 +288,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 290 "parse.y" typedef union { char *id; GString *cbuf; @@ -276,11 +330,11 @@ typedef union { -#define YYFINAL 239 +#define YYFINAL 243 #define YYFLAG -32768 #define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? 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, @@ -318,78 +372,79 @@ static const char yytranslate[] = { 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, 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 + 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[] = { 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, - 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 + 0, 23, 0, 26, 0, 24, 0, 25, 0, 27, + 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, - 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 + 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 @@ -398,194 +453,196 @@ 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","'{'","'}'","';'","'='", +"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", +"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", +"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","onerror","funcargs","arglist","arglist1","arg","checklist","check", -"numtok", NULL +"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, + 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, - 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 + 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, - 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 + 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, 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 + 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[] = { 237, - 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 +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[] = { 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[] = { 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, - 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 + 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 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 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[] = { 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[] = { 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" @@ -1131,23 +1188,23 @@ yyreduce: switch (yyn) { case 1: -#line 255 "parse.y" +#line 308 "parse.y" { ; ; break;} case 2: -#line 256 "parse.y" +#line 309 "parse.y" { ; ; break;} case 3: -#line 257 "parse.y" +#line 310 "parse.y" { ; ; break;} case 4: -#line 258 "parse.y" +#line 311 "parse.y" { ; ; break;} case 5: -#line 261 "parse.y" +#line 314 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1156,7 +1213,7 @@ case 5: ; break;} case 6: -#line 267 "parse.y" +#line 320 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1165,7 +1222,7 @@ case 6: ; break;} case 7: -#line 273 "parse.y" +#line 326 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1174,7 +1231,7 @@ case 7: ; break;} case 8: -#line 279 "parse.y" +#line 332 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1183,7 +1240,7 @@ case 8: ; break;} case 9: -#line 285 "parse.y" +#line 338 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1192,7 +1249,7 @@ case 9: ; break;} case 10: -#line 291 "parse.y" +#line 344 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1201,15 +1258,15 @@ case 10: ; break;} case 11: -#line 299 "parse.y" +#line 352 "parse.y" { ; ; break;} case 12: -#line 300 "parse.y" +#line 353 "parse.y" { ; ; break;} case 13: -#line 303 "parse.y" +#line 356 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1217,7 +1274,7 @@ case 13: ; break;} case 14: -#line 308 "parse.y" +#line 361 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1225,49 +1282,53 @@ case 14: ; break;} case 15: -#line 315 "parse.y" +#line 368 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 16: -#line 320 "parse.y" +#line 373 "parse.y" { ; ; break;} case 17: -#line 321 "parse.y" +#line 374 "parse.y" { ; ; break;} case 18: -#line 324 "parse.y" +#line 377 "parse.y" { ; ; break;} case 19: -#line 325 "parse.y" +#line 378 "parse.y" { ; ; break;} case 20: -#line 326 "parse.y" +#line 379 "parse.y" { ; ; break;} case 21: -#line 327 "parse.y" +#line 380 "parse.y" { ; ; break;} case 22: -#line 330 "parse.y" +#line 383 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} case 23: -#line 331 "parse.y" +#line 384 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} case 24: -#line 332 "parse.y" +#line 385 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} case 25: -#line 335 "parse.y" +#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); @@ -1282,8 +1343,8 @@ case 25: } ; break;} -case 26: -#line 348 "parse.y" +case 27: +#line 402 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1299,58 +1360,58 @@ case 26: } ; break;} -case 27: -#line 364 "parse.y" +case 28: +#line 418 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 368 "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 376 "parse.y" -{ ; ; - break;} case 30: -#line 377 "parse.y" +#line 430 "parse.y" { ; ; break;} case 31: -#line 378 "parse.y" -{ destructor = NULL; ; +#line 431 "parse.y" +{ ; ; break;} case 32: -#line 379 "parse.y" -{ initializer = NULL; ; +#line 432 "parse.y" +{ destructor = NULL; ; break;} case 33: -#line 380 "parse.y" +#line 433 "parse.y" +{ initializer = NULL; ; + break;} +case 34: +#line 434 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 386 "parse.y" +case 35: +#line 440 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 389 "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 393 "parse.y" +case 37: +#line 447 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1387,8 +1448,8 @@ case 36: } ; break;} -case 37: -#line 428 "parse.y" +case 38: +#line 482 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1418,8 +1479,8 @@ case 37: } ; break;} -case 38: -#line 456 "parse.y" +case 39: +#line 510 "parse.y" { Node *node; char *get, *set = NULL; @@ -1427,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); @@ -1442,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, @@ -1484,8 +1550,8 @@ case 38: class_nodes = g_list_append(class_nodes,node); ; break;} -case 39: -#line 521 "parse.y" +case 40: +#line 580 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1496,39 +1562,39 @@ case 39: yyval.id = yyvsp[-4].id; ; break;} -case 40: -#line 530 "parse.y" +case 41: +#line 589 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 41: -#line 536 "parse.y" +case 42: +#line 595 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 42: -#line 537 "parse.y" +case 43: +#line 596 "parse.y" { yyval.list = NULL; ; break;} -case 43: -#line 540 "parse.y" +case 44: +#line 599 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 44: -#line 543 "parse.y" +case 45: +#line 602 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 45: -#line 549 "parse.y" +case 46: +#line 608 "parse.y" { ; ; break;} -case 46: -#line 550 "parse.y" +case 47: +#line 609 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1536,156 +1602,156 @@ case 46: g_free(oldname); ; break;} -case 47: -#line 558 "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 562 "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 569 "parse.y" +case 50: +#line 628 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 50: -#line 572 "parse.y" +case 51: +#line 631 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 51: -#line 575 "parse.y" +case 52: +#line 634 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 52: -#line 578 "parse.y" +case 53: +#line 637 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 53: -#line 581 "parse.y" +case 54: +#line 640 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 54: -#line 584 "parse.y" +case 55: +#line 643 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 55: -#line 587 "parse.y" +case 56: +#line 646 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 56: -#line 590 "parse.y" +case 57: +#line 649 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 57: -#line 593 "parse.y" +case 58: +#line 652 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 58: -#line 596 "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 600 "parse.y" +case 60: +#line 659 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 60: -#line 603 "parse.y" +case 61: +#line 662 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 61: -#line 608 "parse.y" +case 62: +#line 667 "parse.y" { yyval.id = "long int"; ; break;} -case 62: -#line 611 "parse.y" +case 63: +#line 670 "parse.y" { yyval.id = "long"; ; break;} -case 63: -#line 614 "parse.y" +case 64: +#line 673 "parse.y" { yyval.id = "short int"; ; break;} -case 64: -#line 617 "parse.y" +case 65: +#line 676 "parse.y" { yyval.id = "short"; ; break;} -case 65: -#line 620 "parse.y" +case 66: +#line 679 "parse.y" { yyval.id = "int"; ; break;} -case 66: -#line 625 "parse.y" +case 67: +#line 684 "parse.y" { yyval.id = "enum "; ; break;} -case 67: -#line 628 "parse.y" +case 68: +#line 687 "parse.y" { yyval.id = "union "; ; break;} -case 68: -#line 631 "parse.y" +case 69: +#line 690 "parse.y" { yyval.id = "struct "; ; break;} -case 69: -#line 636 "parse.y" -{ stars++; ; - break;} case 70: -#line 637 "parse.y" +#line 695 "parse.y" { stars++; ; break;} case 71: -#line 641 "parse.y" +#line 696 "parse.y" +{ stars++; ; + break;} +case 72: +#line 700 "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'")); @@ -1695,14 +1761,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 653 "parse.y" +case 73: +#line 712 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 659 "parse.y" +case 74: +#line 718 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1716,8 +1782,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 671 "parse.y" +case 75: +#line 730 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1731,170 +1797,241 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 683 "parse.y" +case 76: +#line 742 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 686 "parse.y" +case 77: +#line 745 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 692 "parse.y" +case 78: +#line 751 "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" +case 79: +#line 756 "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" +case 80: +#line 759 "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" +case 81: +#line 764 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 706 "parse.y" +case 82: +#line 765 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 710 "parse.y" +case 83: +#line 769 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + 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[-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" +case 84: +#line 785 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + 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[-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" +case 85: +#line 801 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + 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[-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" +case 86: +#line 817 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + 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[-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" +case 87: +#line 833 "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" +case 88: +#line 844 "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" +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[-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" +case 90: +#line 860 "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); 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 792 "parse.y" -{ yyval.id = yyvsp[0].id; ; - break;} case 91: -#line 793 "parse.y" +#line 883 "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[-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 92: -#line 797 "parse.y" -{ yyval.id = NULL; ; +#line 894 "parse.y" +{ + 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 93: -#line 800 "parse.y" -{ vararg = FALSE; has_self = FALSE; ; +#line 913 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; break;} case 94: -#line 801 "parse.y" +#line 919 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 95: +#line 920 "parse.y" +{ + yyval.id = (yyvsp[1].cbuf)->str; + g_string_free(yyvsp[1].cbuf, FALSE); + ; + break;} +case 96: +#line 926 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; + break;} +case 97: +#line 927 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1907,8 +2044,8 @@ case 94: } ; break;} -case 95: -#line 812 "parse.y" +case 98: +#line 938 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1920,40 +2057,40 @@ case 95: } ; break;} -case 96: -#line 822 "parse.y" +case 99: +#line 948 "parse.y" { has_self = FALSE; ; break;} -case 97: -#line 825 "parse.y" +case 100: +#line 951 "parse.y" { vararg = TRUE; ; break;} -case 98: -#line 826 "parse.y" +case 101: +#line 952 "parse.y" { vararg = FALSE; ; break;} -case 99: -#line 829 "parse.y" +case 102: +#line 955 "parse.y" { ; ; break;} -case 100: -#line 830 "parse.y" +case 103: +#line 956 "parse.y" { ; ; break;} -case 101: -#line 833 "parse.y" +case 104: +#line 959 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 102: -#line 836 "parse.y" +case 105: +#line 962 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 103: -#line 839 "parse.y" +case 106: +#line 965 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1963,8 +2100,8 @@ case 103: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 104: -#line 847 "parse.y" +case 107: +#line 973 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1974,16 +2111,16 @@ case 104: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 105: -#line 857 "parse.y" +case 108: +#line 983 "parse.y" { ; ; break;} -case 106: -#line 858 "parse.y" +case 109: +#line 984 "parse.y" { ; ; break;} -case 107: -#line 861 "parse.y" +case 110: +#line 987 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1998,61 +2135,61 @@ case 107: g_free(yyvsp[0].id); ; break;} -case 108: -#line 874 "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 109: -#line 878 "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 110: -#line 882 "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 111: -#line 886 "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 112: -#line 890 "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 113: -#line 894 "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 114: -#line 900 "parse.y" +case 117: +#line 1026 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 115: -#line 901 "parse.y" +case 118: +#line 1027 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 116: -#line 905 "parse.y" +case 119: +#line 1031 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2277,5 +2414,5 @@ yyerrhandle: } return 1; } -#line 908 "parse.y" +#line 1034 "parse.y"