X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/4f7cfa972623842e64e3a8468696f1f6f40fd202..853c670e4b839fd435507201f04d16080590a894:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 9b63335..9fdfed3 100644 --- a/src/parse.c +++ b/src/parse.c @@ -45,6 +45,7 @@ #include "config.h" #include #include +#include #include #include "treefuncs.h" @@ -57,9 +58,9 @@ GList *nodes = NULL; static GList *class_nodes = NULL; Node *class = NULL; +char *chunk_size = NULL; static GList *typestack = NULL; -static int stars = 0; static GList *funcargs = NULL; static GList *checks = NULL; static int has_self = FALSE; @@ -148,10 +149,10 @@ push_function(int scope, int method, char *oid, char *id, g_assert(scope != CLASS_SCOPE); - if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) { - type = pop_type(); + if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + type = (Type *)new_type(g_strdup("void"), NULL, NULL); } else { - type = (Type *)new_type(0,g_strdup("void"),NULL); + type = pop_type(); } /* a complicated and ugly test to figure out if we have @@ -162,18 +163,18 @@ push_function(int scope, int method, char *oid, char *id, !(g_list_length(funcargs) == 1 && g_list_length(gtktypes) == 2 && 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); + error_print(GOB_WARN, line_no, + _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match")); } 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, + error_print(GOB_ERROR, line_no, _("NONE can only appear in an " - "argument list by itself"), - line_no); + "argument list by itself")); } } } @@ -189,7 +190,7 @@ push_function(int scope, int method, char *oid, char *id, node = new_method(scope, method, type, oid, gtktypes, flags, id, funcargs, onerror, defreturn, c_cbuf, line_no, - ccode_line, vararg); + ccode_line, vararg, method_unique_id++); if(cbuf) g_string_free(cbuf, @@ -213,6 +214,9 @@ free_all_global_state(void) g_free(defreturn); defreturn = NULL; + g_free(chunk_size); + chunk_size = NULL; + g_list_foreach(gtktypes, (GFunc)g_free, NULL); g_list_free(gtktypes); gtktypes = NULL; @@ -247,18 +251,19 @@ push_init_arg(char *name, int is_class) else tn = g_strdup(((Class *)class)->otype); - type = new_type(1,tn,NULL); + type = new_type(tn, g_strdup("*"), NULL); node = new_funcarg((Type *)type,name,NULL); funcargs = g_list_prepend(funcargs, node); } static void -push_self(char *id) +push_self(char *id, gboolean constant) { Node *node; Node *type; GList *ch = NULL; - type = new_type(1,g_strdup(((Class *)class)->otype),NULL); + type = new_type(g_strdup(((Class *)class)->otype), + g_strdup(constant ? "const *" : "*"), NULL); ch = g_list_append(ch,new_check(NULL_CHECK,NULL)); ch = g_list_append(ch,new_check(TYPE_CHECK,NULL)); node = new_funcarg((Type *)type,id,ch); @@ -269,7 +274,6 @@ static Variable * find_var_or_die(const char *id, int line) { GList *li; - char *s; for(li = class_nodes; li != NULL; li = li->next) { Variable *var; @@ -281,8 +285,7 @@ find_var_or_die(const char *id, int line) return var; } - s = g_strdup_printf(_("Variable %s not defined here"), id); - print_error(FALSE, s, line); + error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id); g_assert_not_reached(); return NULL; @@ -308,7 +311,7 @@ set_return_value(char *type, char *val) } -#line 290 "parse.y" +#line 293 "parse.y" typedef union { char *id; GString *cbuf; @@ -330,20 +333,20 @@ typedef union { -#define YYFINAL 243 +#define YYFINAL 263 #define YYFLAG -32768 #define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 87) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 88) 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, 48, 2, 2, 2, 2, 2, 2, 39, + 40, 44, 2, 45, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 41, 47, + 42, 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -371,80 +374,89 @@ static const char yytranslate[] = { 0, #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, - 24, 27, 29, 34, 38, 43, 46, 48, 50, 52, - 54, 56, 58, 60, 62, 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 + 24, 27, 29, 34, 38, 44, 45, 50, 55, 58, + 60, 62, 64, 66, 68, 70, 72, 74, 76, 79, + 83, 86, 90, 93, 96, 98, 100, 101, 107, 114, + 126, 135, 141, 147, 149, 153, 154, 158, 160, 163, + 165, 167, 169, 172, 175, 178, 182, 186, 189, 192, + 195, 197, 200, 202, 205, 207, 209, 211, 213, 215, + 217, 219, 221, 223, 225, 227, 229, 231, 234, 237, + 241, 244, 246, 250, 254, 257, 259, 264, 268, 270, + 273, 275, 286, 298, 308, 318, 327, 339, 348, 354, + 357, 362, 363, 365, 368, 370, 372, 375, 378, 382, + 387, 392, 394, 398, 400, 404, 406, 409, 413, 420, + 428, 431, 433, 435, 438, 441, 445, 449, 453, 457, + 459, 462 }; static const short yyrhs[] = { 52, 53, 52, 0, 53, 52, 0, 52, 53, 0, 53, 0, 23, 0, 26, 0, 24, 0, 25, 0, 27, 0, 28, 0, 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 + 56, 38, 0, 54, 37, 38, 0, 3, 21, 4, + 21, 55, 0, 0, 39, 19, 19, 40, 0, 39, + 19, 20, 40, 0, 56, 57, 0, 57, 0, 78, + 0, 62, 0, 63, 0, 41, 0, 29, 0, 30, + 0, 31, 0, 32, 0, 19, 19, 0, 19, 37, + 23, 0, 42, 87, 0, 42, 37, 23, 0, 59, + 60, 0, 60, 59, 0, 60, 0, 59, 0, 0, + 58, 67, 19, 61, 41, 0, 58, 67, 19, 22, + 61, 41, 0, 33, 65, 64, 19, 19, 37, 23, + 19, 37, 23, 41, 0, 33, 65, 64, 19, 19, + 37, 23, 41, 0, 33, 65, 64, 19, 19, 0, + 19, 39, 19, 67, 40, 0, 19, 0, 39, 66, + 40, 0, 0, 19, 43, 66, 0, 19, 0, 68, + 72, 0, 68, 0, 69, 0, 19, 0, 5, 19, + 0, 19, 5, 0, 71, 19, 0, 5, 71, 19, + 0, 71, 19, 5, 0, 70, 69, 0, 21, 69, + 0, 5, 69, 0, 21, 0, 21, 5, 0, 70, + 0, 70, 5, 0, 6, 0, 18, 0, 14, 0, + 15, 0, 13, 0, 16, 0, 17, 0, 11, 0, + 12, 0, 7, 0, 8, 0, 9, 0, 44, 0, + 44, 5, 0, 44, 72, 0, 44, 5, 72, 0, + 19, 75, 0, 75, 0, 58, 19, 75, 0, 19, + 58, 75, 0, 58, 75, 0, 73, 0, 19, 39, + 76, 40, 0, 76, 45, 19, 0, 19, 0, 37, + 23, 0, 41, 0, 35, 65, 74, 67, 19, 39, + 81, 40, 79, 77, 0, 58, 35, 65, 73, 67, + 19, 39, 81, 40, 79, 77, 0, 34, 58, 67, + 19, 39, 81, 40, 79, 77, 0, 58, 34, 67, + 19, 39, 81, 40, 79, 77, 0, 34, 67, 19, + 39, 81, 40, 79, 77, 0, 36, 39, 21, 40, + 67, 19, 39, 81, 40, 79, 77, 0, 58, 67, + 19, 39, 81, 40, 79, 77, 0, 19, 39, 19, + 40, 77, 0, 19, 80, 0, 19, 80, 19, 80, + 0, 0, 87, 0, 37, 23, 0, 6, 0, 19, + 0, 19, 5, 0, 5, 19, 0, 19, 45, 82, + 0, 19, 5, 45, 82, 0, 5, 19, 45, 82, + 0, 82, 0, 83, 45, 10, 0, 83, 0, 83, + 45, 84, 0, 84, 0, 67, 19, 0, 67, 19, + 22, 0, 67, 19, 39, 19, 85, 40, 0, 67, + 19, 22, 39, 19, 85, 40, 0, 85, 86, 0, + 86, 0, 19, 0, 46, 87, 0, 47, 87, 0, + 46, 42, 87, 0, 47, 42, 87, 0, 42, 42, + 87, 0, 48, 42, 87, 0, 20, 0, 49, 20, + 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 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, - 881, 892, 911, 917, 918, 924, 925, 936, 946, 949, - 950, 953, 954, 957, 960, 963, 971, 981, 982, 985, - 998, 1002, 1006, 1010, 1014, 1018, 1024, 1025, 1029 + 311, 312, 313, 314, 317, 323, 329, 335, 341, 347, + 355, 356, 359, 364, 371, 376, 377, 385, 396, 397, + 400, 401, 402, 403, 406, 407, 408, 409, 412, 425, + 441, 445, 453, 454, 455, 456, 457, 463, 466, 470, + 506, 535, 609, 618, 624, 625, 628, 631, 637, 641, + 648, 651, 654, 658, 662, 666, 671, 679, 683, 688, + 692, 695, 699, 702, 707, 708, 709, 710, 711, 712, + 713, 714, 715, 718, 719, 720, 723, 724, 725, 729, + 736, 748, 754, 766, 778, 781, 787, 792, 795, 800, + 801, 805, 821, 837, 853, 869, 880, 886, 896, 919, + 930, 949, 955, 956, 962, 963, 974, 985, 996, 1006, + 1016, 1026, 1029, 1030, 1033, 1034, 1037, 1040, 1043, 1051, + 1061, 1062, 1065, 1078, 1082, 1086, 1090, 1094, 1098, 1104, + 1105, 1109 }; #endif @@ -455,194 +467,216 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED", "LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", "CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", -"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='", -"'('","')'","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes", -"class","classdec","classcode","thing","scope","destructor","initializer","varoptions", -"variable","argument","argtype","flags","flaglist","type","type1","type2","integer", -"tspecifier","stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode", -"method","returnvals","retcode","funcargs","arglist","arglist1","arg","checklist", -"check","numtok", NULL +"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'", +"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes", +"class","classdec","chunk","classcode","thing","scope","destructor","initializer", +"varoptions","variable","argument","argtype","flags","flaglist","type","specifier_list", +"spec_list","specifier","strunionenum","pointer","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, 57, 58, 58, 59, 59, 60, - 60, 60, 60, 60, 61, 61, 62, 62, 62, 63, - 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 69, 69, 69, 69, 69, 70, 70, 70, 71, - 71, 72, 72, 73, 73, 73, 73, 74, 75, 75, - 76, 76, 77, 77, 77, 77, 77, 77, 77, 77, - 78, 78, 78, 79, 79, 80, 80, 80, 80, 81, - 81, 82, 82, 83, 83, 83, 83, 84, 84, 85, - 85, 85, 85, 85, 85, 85, 86, 86, 86 + 52, 52, 53, 53, 54, 55, 55, 55, 56, 56, + 57, 57, 57, 57, 58, 58, 58, 58, 59, 59, + 60, 60, 61, 61, 61, 61, 61, 62, 62, 63, + 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, + 68, 68, 68, 68, 68, 68, 68, 69, 69, 69, + 69, 69, 69, 69, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 71, 71, 71, 72, 72, 72, 72, + 73, 73, 74, 74, 74, 74, 75, 76, 76, 77, + 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, + 79, 79, 80, 80, 81, 81, 81, 81, 81, 81, + 81, 81, 82, 82, 83, 83, 84, 84, 84, 84, + 85, 85, 86, 86, 86, 86, 86, 86, 86, 87, + 87, 87 }; 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, 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 + 2, 1, 4, 3, 5, 0, 4, 4, 2, 1, + 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, 2, 1, + 1, 1, 2, 2, 2, 3, 3, 2, 2, 2, + 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, + 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, 2, 2, 3, 4, + 4, 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, 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, 11, 3, 2, 0, 0, 1, 0, 25, + 26, 27, 28, 46, 0, 46, 0, 14, 24, 0, + 20, 0, 22, 23, 21, 16, 0, 0, 0, 0, + 65, 74, 75, 76, 72, 73, 69, 67, 68, 70, + 71, 66, 52, 61, 0, 0, 50, 51, 63, 0, + 0, 0, 13, 19, 0, 46, 0, 0, 15, 0, + 48, 0, 44, 0, 0, 53, 60, 0, 54, 62, + 59, 0, 0, 77, 49, 64, 58, 55, 0, 0, + 86, 0, 82, 0, 0, 0, 37, 0, 0, 0, + 45, 0, 0, 56, 0, 0, 78, 79, 57, 0, + 0, 0, 81, 0, 85, 0, 0, 0, 0, 0, + 0, 37, 0, 0, 36, 35, 0, 0, 0, 0, + 91, 99, 47, 0, 42, 0, 0, 65, 52, 0, + 0, 112, 114, 116, 80, 89, 0, 84, 83, 0, + 0, 0, 0, 29, 0, 0, 0, 132, 130, 0, + 0, 31, 33, 34, 38, 17, 18, 90, 0, 0, + 0, 53, 54, 0, 117, 102, 0, 87, 0, 0, + 0, 0, 0, 30, 39, 102, 32, 131, 43, 0, + 102, 0, 0, 109, 118, 0, 0, 0, 113, 115, + 88, 0, 0, 102, 0, 0, 0, 41, 0, 111, + 110, 0, 0, 0, 100, 103, 96, 102, 0, 0, + 0, 98, 0, 94, 0, 123, 0, 0, 0, 0, + 0, 122, 104, 0, 0, 102, 95, 102, 0, 0, + 0, 0, 124, 0, 125, 0, 119, 121, 101, 92, + 0, 0, 40, 120, 128, 126, 127, 129, 97, 93, 0, 0, 0 }; -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 yydefgoto[] = { 261, + 8, 9, 10, 11, 69, 30, 31, 32, 125, 126, + 127, 33, 34, 74, 39, 72, 140, 57, 58, 59, + 60, 85, 91, 92, 93, 147, 132, 35, 198, 215, + 141, 142, 143, 144, 231, 232, 216 }; -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 yypact[] = { 88, + -12,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 88, 347, + -15, 15,-32768, 347, 347, 157, 18, 347, 7,-32768, +-32768,-32768,-32768, 25, 153, 25, 36,-32768,-32768, 175, +-32768, 118,-32768,-32768,-32768, 67, 102, 122, 135, 245, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 22, 313, 262, 144, 131,-32768, 327, 160, + 198, 159,-32768,-32768, 262, 25, 162, 180,-32768, 161, + 171, 178, 164, 181, 341,-32768,-32768, 183,-32768, 341, +-32768, 196, 182, 8,-32768, 341,-32768, 214, 193, 201, +-32768, 262,-32768, 186, 212, 229, 48, 62, 57, 122, +-32768, 236, 246,-32768, 233, 279, 131,-32768,-32768, 243, + 270, 280,-32768, 50,-32768, 287, 262, 277, 50, 262, + -1, 9, 279, -5, 278, 302, 281, 283, 295, 314, +-32768,-32768,-32768, 262, 299, 279, 296, 309, 0, 331, + 311,-32768, 316,-32768,-32768,-32768, 98,-32768,-32768, 324, + 345, 279, 346,-32768, 344, 335, 328,-32768,-32768, 354, + 358,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 339, 357, + 342, 104, 105, 262, 38, 362, 228,-32768, 364, 279, + 348, 349, 352,-32768,-32768, 362,-32768,-32768,-32768, 16, + 362, 262, 262,-32768, 353, 365, 10, 57,-32768,-32768, +-32768, 350, 279, 362, 279, 57, 356,-32768, 57,-32768, +-32768, 366, 109, 363, 369,-32768,-32768, 362, 355, 57, + 359,-32768, 371,-32768, 109,-32768, 360, 43, 53, 361, + 61,-32768,-32768, 10, 57, 362,-32768, 362, 367, 100, + 6, 6,-32768, 6,-32768, 6,-32768,-32768,-32768,-32768, + 57, 57,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 396, 397,-32768 }; static const short yypgoto[] = {-32768, - 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 + 351, 163, 389,-32768,-32768,-32768, 370, -18, 275, 282, + 284,-32768,-32768,-32768, -16, 304, -24,-32768, -38,-32768, + -37, -10, 315,-32768, -36,-32768, -186,-32768, -180, 176, + -119, 4,-32768, 232, 187, -152, -124 }; -#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 +#define YYLAST 412 + + +static const short yytable[] = { 162, + 56, 77, 78, 157, 173, 206, 55, 67, 12, 61, + 209, 217, 107, 158, 159, 81, 171, 154, 17, 222, + 87, 16, 224, 220, 158, 159, 79, 121, 158, 159, + 82, 160, 182, 237, 207, 155, 77, 235, 36, -106, + 95, 77, 90, 161, 174, 37, 214, 77, 250, 96, + 124, 84, 113, 115, 161, 251, 208, 252, 161, 195, + 202, 158, 159, 38, 259, 260, 121, 116, 110, 122, + 112, 158, 159, 108, 62, 148, 196, 149, 248, 226, + 128, 129, 113, 219, 242, 221, 123, 248, 111, 124, + 1, 161, 151, 130, 244, 153, 145, 131, 77, 78, + 247, 161, 227, 243, 245, 68, 228, 229, 230, 169, + 2, 3, 4, 5, 6, 7, 255, 256, 226, 257, + 70, 258, 40, 41, 42, 43, 44, 226, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 178, 54, 254, + 71, 227, 179, -108, -107, 228, 229, 230, 192, 193, + 227, 65, 66, 73, 228, 229, 230, 40, 41, 42, + 43, 44, 83, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 15, 54, 84, 19, 18, 194, 88, 94, + 97, 20, 21, 22, 23, 20, 21, 22, 23, 24, + 25, 26, 27, 19, 28, 210, 211, 29, 98, 103, + 99, 104, 102, 20, 21, 22, 23, 24, 25, 26, + 27, 110, 63, 100, 105, 29, 89, 101, 109, 114, + 106, 20, 21, 22, 23, 117, 20, 21, 22, 23, + 118, 111, 40, 41, 42, 43, 44, 199, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 119, 54, 75, + 41, 42, 43, 44, 134, 45, 46, 47, 48, 49, + 50, 51, 52, 76, 135, 54, 40, 41, 42, 43, + 44, 136, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 111, 54, 137, 138, 42, 43, 44, 146, 45, + 46, 47, 48, 49, 50, 51, 52, 139, 110, 54, + 75, 41, 42, 43, 44, 150, 45, 46, 47, 48, + 49, 50, 51, 52, 172, 152, 54, 80, 41, 124, + 121, 165, 166, 45, 46, 47, 48, 49, 50, 51, + 52, 86, 41, 54, 167, 170, 168, 45, 46, 47, + 48, 49, 50, 51, 52, 75, 41, 54, -105, 175, + 176, 45, 46, 47, 48, 49, 50, 51, 52, 13, + 177, 54, 180, 181, 183, 13, 184, 186, 13, 2, + 3, 4, 5, 6, 7, 185, 187, 188, 189, 190, + 197, 191, 201, 213, 225, 233, 203, 234, 204, 218, + 205, 212, 223, 239, 236, 262, 263, 14, 238, 64, + 164, 241, 246, 133, 0, 156, 163, 253, 200, 249, + 120, 240 }; -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, +static const short yycheck[] = { 124, + 25, 40, 40, 123, 5, 186, 25, 32, 21, 26, + 191, 198, 5, 19, 20, 54, 136, 19, 4, 206, + 59, 37, 209, 204, 19, 20, 5, 19, 19, 20, + 55, 37, 152, 220, 19, 37, 75, 218, 21, 40, + 65, 80, 61, 49, 45, 39, 37, 86, 235, 66, + 42, 44, 89, 90, 49, 236, 41, 238, 49, 22, + 180, 19, 20, 39, 251, 252, 19, 92, 19, 22, + 89, 19, 20, 84, 39, 112, 39, 114, 231, 19, + 19, 20, 119, 203, 42, 205, 39, 240, 39, 42, + 3, 49, 117, 37, 42, 120, 107, 41, 137, 137, + 40, 49, 42, 228, 229, 39, 46, 47, 48, 134, + 23, 24, 25, 26, 27, 28, 241, 242, 19, 244, + 19, 246, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 40, 21, 40, + 19, 42, 45, 40, 40, 46, 47, 48, 45, 45, + 42, 34, 35, 19, 46, 47, 48, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 10, 21, 44, 19, 14, 174, 19, 21, + 19, 29, 30, 31, 32, 29, 30, 31, 32, 33, + 34, 35, 36, 19, 38, 192, 193, 41, 19, 19, + 40, 19, 39, 29, 30, 31, 32, 33, 34, 35, + 36, 19, 38, 43, 19, 41, 19, 40, 5, 19, + 39, 29, 30, 31, 32, 40, 29, 30, 31, 32, + 19, 39, 5, 6, 7, 8, 9, 10, 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 + 16, 17, 18, 19, 19, 21, 5, 6, 7, 8, + 9, 39, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 39, 21, 5, 6, 7, 8, 9, 19, 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, 39, 21, 5, 6, 42, + 19, 41, 40, 11, 12, 13, 14, 15, 16, 17, + 18, 5, 6, 21, 40, 37, 23, 11, 12, 13, + 14, 15, 16, 17, 18, 5, 6, 21, 40, 19, + 40, 11, 12, 13, 14, 15, 16, 17, 18, 9, + 45, 21, 39, 19, 19, 15, 23, 40, 18, 23, + 24, 25, 26, 27, 28, 41, 23, 20, 40, 23, + 19, 40, 19, 19, 19, 23, 39, 19, 40, 40, + 39, 39, 37, 23, 40, 0, 0, 9, 40, 30, + 126, 42, 42, 100, -1, 122, 125, 41, 177, 234, + 96, 225 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1188,23 +1222,23 @@ yyreduce: switch (yyn) { case 1: -#line 308 "parse.y" +#line 311 "parse.y" { ; ; break;} case 2: -#line 309 "parse.y" +#line 312 "parse.y" { ; ; break;} case 3: -#line 310 "parse.y" +#line 313 "parse.y" { ; ; break;} case 4: -#line 311 "parse.y" +#line 314 "parse.y" { ; ; break;} case 5: -#line 314 "parse.y" +#line 317 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1213,7 +1247,7 @@ case 5: ; break;} case 6: -#line 320 "parse.y" +#line 323 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1222,7 +1256,7 @@ case 6: ; break;} case 7: -#line 326 "parse.y" +#line 329 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1231,7 +1265,7 @@ case 7: ; break;} case 8: -#line 332 "parse.y" +#line 335 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1240,7 +1274,7 @@ case 8: ; break;} case 9: -#line 338 "parse.y" +#line 341 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1249,7 +1283,7 @@ case 9: ; break;} case 10: -#line 344 "parse.y" +#line 347 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1258,15 +1292,15 @@ case 10: ; break;} case 11: -#line 352 "parse.y" +#line 355 "parse.y" { ; ; break;} case 12: -#line 353 "parse.y" +#line 356 "parse.y" { ; ; break;} case 13: -#line 356 "parse.y" +#line 359 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1274,7 +1308,7 @@ case 13: ; break;} case 14: -#line 361 "parse.y" +#line 364 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1282,53 +1316,76 @@ case 14: ; break;} case 15: -#line 368 "parse.y" +#line 371 "parse.y" { - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL); ; break;} -case 16: -#line 373 "parse.y" -{ ; ; - break;} case 17: -#line 374 "parse.y" -{ ; ; +#line 377 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"chunks") == 0) { + chunk_size = g_strdup(yyvsp[0].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 18: -#line 377 "parse.y" -{ ; ; +#line 385 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"chunks") == 0) { + if(atoi(yyvsp[0].id) != 0) + chunk_size = g_strdup(yyvsp[0].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 19: -#line 378 "parse.y" +#line 396 "parse.y" { ; ; break;} case 20: -#line 379 "parse.y" +#line 397 "parse.y" { ; ; break;} case 21: -#line 380 "parse.y" +#line 400 "parse.y" { ; ; break;} case 22: -#line 383 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 401 "parse.y" +{ ; ; break;} case 23: -#line 384 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 402 "parse.y" +{ ; ; break;} case 24: -#line 385 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 403 "parse.y" +{ ; ; break;} case 25: -#line 386 "parse.y" -{ the_scope = CLASS_SCOPE; ; +#line 406 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 26: -#line 389 "parse.y" +#line 407 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 27: +#line 408 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 28: +#line 409 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 29: +#line 412 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1343,8 +1400,8 @@ case 26: } ; break;} -case 27: -#line 402 "parse.y" +case 30: +#line 425 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1360,58 +1417,58 @@ case 27: } ; break;} -case 28: -#line 418 "parse.y" +case 31: +#line 441 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 29: -#line 422 "parse.y" +case 32: +#line 445 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 30: -#line 430 "parse.y" +case 33: +#line 453 "parse.y" { ; ; break;} -case 31: -#line 431 "parse.y" +case 34: +#line 454 "parse.y" { ; ; break;} -case 32: -#line 432 "parse.y" +case 35: +#line 455 "parse.y" { destructor = NULL; ; break;} -case 33: -#line 433 "parse.y" +case 36: +#line 456 "parse.y" { initializer = NULL; ; break;} -case 34: -#line 434 "parse.y" +case 37: +#line 457 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 35: -#line 440 "parse.y" +case 38: +#line 463 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 36: -#line 443 "parse.y" +case 39: +#line 466 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 37: -#line 447 "parse.y" +case 40: +#line 470 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1441,6 +1498,7 @@ case 37: g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL); + g_list_free(yyvsp[-9].list); g_string_free(yyvsp[-1].cbuf,TRUE); g_string_free(yyvsp[-4].cbuf,TRUE); yyerror(_("parse error")); @@ -1448,39 +1506,40 @@ case 37: } ; break;} -case 38: -#line 482 "parse.y" +case 41: +#line 506 "parse.y" { - if(strcmp(yyvsp[-3].id,"get")==0) { + if(strcmp(yyvsp[-3].id, "get") == 0) { Node *node; Type *type = pop_type(); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - NULL,0, yyvsp[-7].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - class_nodes = g_list_append(class_nodes,node); - } else if(strcmp(yyvsp[-3].id,"set")==0) { + node = new_argument(yyvsp[-5].id, type, yyvsp[-6].list, yyvsp[-4].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + NULL, 0, yyvsp[-7].line); + g_string_free(yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append(class_nodes, node); + } else if(strcmp(yyvsp[-3].id, "set") == 0) { Node *node; Type *type = pop_type(); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id, - NULL,0,(yyvsp[-1].cbuf)->str, + node = new_argument(yyvsp[-5].id, type, yyvsp[-6].list, yyvsp[-4].id, + NULL, 0, (yyvsp[-1].cbuf)->str, yyvsp[-2].line, yyvsp[-7].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - class_nodes = g_list_append(class_nodes,node); + g_string_free(yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append(class_nodes, node); } else { g_free(yyvsp[-3].id); g_free(yyvsp[-5].id); g_free(yyvsp[-4].id); - g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL); - g_string_free(yyvsp[-1].cbuf,TRUE); + g_list_foreach(yyvsp[-6].list, (GFunc)g_free, NULL); + g_list_free(yyvsp[-6].list); + g_string_free(yyvsp[-1].cbuf, TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 39: -#line 510 "parse.y" +case 42: +#line 535 "parse.y" { Node *node; char *get, *set = NULL; @@ -1494,6 +1553,7 @@ case 39: 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); + g_list_free(yyvsp[-3].list); yyerror(_("parse error")); YYERROR; } @@ -1503,9 +1563,12 @@ case 39: 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 + else if(var->scope == CLASS_SCOPE) { + root = "SELF_GET_CLASS(self)"; + if(no_self_alias) + error_print(GOB_ERROR, yyvsp[-4].line, + _("Self aliases needed when autolinking to a classwide member")); + } else root = "self"; if(strcmp(yyvsp[0].id, "link")==0) { @@ -1527,16 +1590,16 @@ case 39: root, yyvsp[-1].id, root, yyvsp[-1].id, root, yyvsp[-1].id, - root, yyvsp[-1].id, - root, yyvsp[-1].id, - root, yyvsp[-1].id, root, yyvsp[-1].id); } else { g_assert_not_reached(); } - /* get is the same for everything */ - get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); + if(strcmp(yyvsp[0].id, "stringlink")==0) { + get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, yyvsp[-1].id); + } else + /* For everything else, get is just straight assignment */ + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); g_free(yyvsp[0].id); @@ -1550,8 +1613,8 @@ case 39: class_nodes = g_list_append(class_nodes,node); ; break;} -case 40: -#line 580 "parse.y" +case 43: +#line 609 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1562,192 +1625,215 @@ case 40: yyval.id = yyvsp[-4].id; ; break;} -case 41: -#line 589 "parse.y" +case 44: +#line 618 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 42: -#line 595 "parse.y" -{ yyval.list = yyvsp[-1].list; ; - break;} -case 43: -#line 596 "parse.y" -{ yyval.list = NULL; ; - break;} -case 44: -#line 599 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; - break;} case 45: -#line 602 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +#line 624 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 46: -#line 608 "parse.y" -{ ; ; +#line 625 "parse.y" +{ yyval.list = NULL; ; break;} case 47: -#line 609 "parse.y" +#line 628 "parse.y" { - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 48: -#line 617 "parse.y" +#line 631 "parse.y" { - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 49: -#line 621 "parse.y" +#line 637 "parse.y" { - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); typestack = g_list_prepend(typestack,node); - ; + ; break;} case 50: -#line 628 "parse.y" +#line 641 "parse.y" { - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 51: -#line 631 "parse.y" +#line 648 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + yyval.id = yyvsp[0].id; + ; break;} case 52: -#line 634 "parse.y" +#line 651 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + yyval.id = yyvsp[0].id; + ; break;} case 53: -#line 637 "parse.y" +#line 654 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 54: -#line 640 "parse.y" +#line 658 "parse.y" { - yyval.id = g_strdup("signed char"); - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 55: -#line 643 "parse.y" +#line 662 "parse.y" { - yyval.id = g_strdup("char"); - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 56: -#line 646 "parse.y" +#line 666 "parse.y" { - yyval.id = g_strdup("double"); - ; + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 57: -#line 649 "parse.y" +#line 671 "parse.y" { - yyval.id = g_strdup("float"); - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 58: -#line 652 "parse.y" +#line 679 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 59: -#line 655 "parse.y" +#line 683 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); - ; + ; break;} case 60: -#line 659 "parse.y" +#line 688 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 61: -#line 662 "parse.y" +#line 692 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 62: -#line 667 "parse.y" +#line 695 "parse.y" { - yyval.id = "long int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 63: -#line 670 "parse.y" +#line 699 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} case 64: -#line 673 "parse.y" +#line 702 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} case 65: -#line 676 "parse.y" -{ - yyval.id = "short"; - ; +#line 707 "parse.y" +{ yyval.id = "void"; ; break;} case 66: -#line 679 "parse.y" -{ - yyval.id = "int"; - ; +#line 708 "parse.y" +{ yyval.id = "char"; ; break;} case 67: -#line 684 "parse.y" -{ - yyval.id = "enum "; - ; +#line 709 "parse.y" +{ yyval.id = "short"; ; break;} case 68: -#line 687 "parse.y" -{ - yyval.id = "union "; - ; +#line 710 "parse.y" +{ yyval.id = "int"; ; break;} case 69: -#line 690 "parse.y" -{ - yyval.id = "struct "; - ; +#line 711 "parse.y" +{ yyval.id = "long"; ; break;} case 70: -#line 695 "parse.y" -{ stars++; ; +#line 712 "parse.y" +{ yyval.id = "float"; ; break;} case 71: -#line 696 "parse.y" -{ stars++; ; +#line 713 "parse.y" +{ yyval.id = "double"; ; break;} case 72: -#line 700 "parse.y" +#line 714 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 73: +#line 715 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 74: +#line 718 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 75: +#line 719 "parse.y" +{ yyval.id = "union"; ; + break;} +case 76: +#line 720 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 77: +#line 723 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 78: +#line 724 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 79: +#line 725 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 80: +#line 729 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 81: +#line 736 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1761,14 +1847,14 @@ case 72: g_free(yyvsp[-1].id); ; break;} -case 73: -#line 712 "parse.y" +case 82: +#line 748 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 74: -#line 718 "parse.y" +case 83: +#line 754 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1782,8 +1868,8 @@ case 74: g_free(yyvsp[-1].id); ; break;} -case 75: -#line 730 "parse.y" +case 84: +#line 766 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1797,47 +1883,47 @@ case 75: g_free(yyvsp[-2].id); ; break;} -case 76: -#line 742 "parse.y" +case 85: +#line 778 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 77: -#line 745 "parse.y" +case 86: +#line 781 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 78: -#line 751 "parse.y" +case 87: +#line 787 "parse.y" { gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 79: -#line 756 "parse.y" +case 88: +#line 792 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 80: -#line 759 "parse.y" +case 89: +#line 795 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 81: -#line 764 "parse.y" +case 90: +#line 800 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 82: -#line 765 "parse.y" +case 91: +#line 801 "parse.y" { yyval.cbuf = NULL; ; break;} -case 83: -#line 769 "parse.y" +case 92: +#line 805 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1855,8 +1941,8 @@ case 83: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 785 "parse.y" +case 93: +#line 821 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1874,8 +1960,8 @@ case 84: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 85: -#line 801 "parse.y" +case 94: +#line 837 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1893,8 +1979,8 @@ case 85: ccode_line, vararg, NULL); ; break;} -case 86: -#line 817 "parse.y" +case 95: +#line 853 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1912,8 +1998,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 833 "parse.y" +case 96: +#line 869 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1926,8 +2012,8 @@ case 87: ccode_line, vararg, NULL); ; break;} -case 88: -#line 844 "parse.y" +case 97: +#line 880 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1935,8 +2021,8 @@ case 88: vararg, NULL); ; break;} -case 89: -#line 850 "parse.y" +case 98: +#line 886 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -1948,8 +2034,8 @@ case 89: vararg, NULL); ; break;} -case 90: -#line 860 "parse.y" +case 99: +#line 896 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1964,14 +2050,16 @@ case 90: } 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 91: -#line 881 "parse.y" +case 100: +#line 919 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1984,8 +2072,8 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 892 "parse.y" +case 101: +#line 930 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -2006,35 +2094,35 @@ case 92: g_free(yyvsp[-1].id); ; break;} -case 93: -#line 911 "parse.y" +case 102: +#line 949 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 94: -#line 917 "parse.y" +case 103: +#line 955 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 95: -#line 918 "parse.y" +case 104: +#line 956 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 96: -#line 924 "parse.y" +case 105: +#line 962 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 97: -#line 925 "parse.y" +case 106: +#line 963 "parse.y" { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id); + push_self(yyvsp[0].id, FALSE); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -2042,12 +2130,40 @@ case 97: } ; break;} -case 98: -#line 936 "parse.y" +case 107: +#line 974 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[-1].id,"self")==0) + push_self(yyvsp[-1].id, TRUE); + else { + g_free(yyvsp[-1].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 108: +#line 985 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[0].id,"self")==0) + push_self(yyvsp[0].id, TRUE); + else { + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 109: +#line 996 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id); + push_self(yyvsp[-2].id, FALSE); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -2055,40 +2171,66 @@ case 98: } ; break;} -case 99: -#line 946 "parse.y" +case 110: +#line 1006 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-3].id,"self")==0) + push_self(yyvsp[-3].id, TRUE); + else { + g_free(yyvsp[-3].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 111: +#line 1016 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-2].id,"self")==0) + push_self(yyvsp[-2].id, TRUE); + else { + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 112: +#line 1026 "parse.y" { has_self = FALSE; ; break;} -case 100: -#line 949 "parse.y" +case 113: +#line 1029 "parse.y" { vararg = TRUE; ; break;} -case 101: -#line 950 "parse.y" +case 114: +#line 1030 "parse.y" { vararg = FALSE; ; break;} -case 102: -#line 953 "parse.y" +case 115: +#line 1033 "parse.y" { ; ; break;} -case 103: -#line 954 "parse.y" +case 116: +#line 1034 "parse.y" { ; ; break;} -case 104: -#line 957 "parse.y" +case 117: +#line 1037 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 105: -#line 960 "parse.y" +case 118: +#line 1040 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 106: -#line 963 "parse.y" +case 119: +#line 1043 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2098,8 +2240,8 @@ case 106: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 107: -#line 971 "parse.y" +case 120: +#line 1051 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2109,16 +2251,16 @@ case 107: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 108: -#line 981 "parse.y" +case 121: +#line 1061 "parse.y" { ; ; break;} -case 109: -#line 982 "parse.y" +case 122: +#line 1062 "parse.y" { ; ; break;} -case 110: -#line 985 "parse.y" +case 123: +#line 1065 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -2133,61 +2275,61 @@ case 110: g_free(yyvsp[0].id); ; break;} -case 111: -#line 998 "parse.y" +case 124: +#line 1078 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 1002 "parse.y" +case 125: +#line 1082 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 1006 "parse.y" +case 126: +#line 1086 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 1010 "parse.y" +case 127: +#line 1090 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 115: -#line 1014 "parse.y" +case 128: +#line 1094 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 116: -#line 1018 "parse.y" +case 129: +#line 1098 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 117: -#line 1024 "parse.y" +case 130: +#line 1104 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 118: -#line 1025 "parse.y" +case 131: +#line 1105 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 119: -#line 1029 "parse.y" +case 132: +#line 1109 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2412,5 +2554,5 @@ yyerrhandle: } return 1; } -#line 1032 "parse.y" +#line 1112 "parse.y"