X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/072bb12e618b26cce359784aa56f9a2b70e1ce52..486240dc4c5d57b0afaddba60d87fe375112bed5:/src/parse.c diff --git a/src/parse.c b/src/parse.c index a3b796c..8cc0914 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 @@ -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,7 +251,7 @@ 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); } @@ -258,7 +262,7 @@ push_self(char *id) 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("*"), 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); @@ -308,7 +312,7 @@ set_return_value(char *type, char *val) } -#line 290 "parse.y" +#line 294 "parse.y" typedef union { char *id; GString *cbuf; @@ -330,20 +334,20 @@ typedef union { -#define YYFINAL 243 +#define YYFINAL 256 #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 +375,85 @@ 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, 376, 378, 382, + 384, 388, 390, 393, 397, 404, 412, 415, 417, 419, + 422, 425, 429, 433, 437, 441, 443, 446 }; 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, 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, - 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 + 312, 313, 314, 315, 318, 324, 330, 336, 342, 348, + 356, 357, 360, 365, 372, 377, 378, 386, 397, 398, + 401, 402, 403, 404, 407, 408, 409, 410, 413, 426, + 442, 446, 454, 455, 456, 457, 458, 464, 467, 471, + 506, 534, 604, 613, 619, 620, 623, 626, 632, 636, + 643, 646, 649, 653, 657, 661, 666, 674, 678, 683, + 687, 690, 694, 697, 702, 703, 704, 705, 706, 707, + 708, 709, 710, 713, 714, 715, 718, 719, 720, 724, + 731, 743, 749, 761, 773, 776, 782, 787, 790, 795, + 796, 800, 816, 832, 848, 864, 875, 881, 891, 914, + 925, 944, 950, 951, 957, 958, 969, 979, 982, 983, + 986, 987, 990, 993, 996, 1004, 1014, 1015, 1018, 1031, + 1035, 1039, 1043, 1047, 1051, 1057, 1058, 1062 }; #endif @@ -455,194 +464,206 @@ 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, 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, 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, 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 + 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, 65, 52, 0, 0, + 108, 110, 112, 80, 89, 0, 84, 83, 0, 0, + 0, 0, 29, 0, 0, 0, 128, 126, 0, 0, + 31, 33, 34, 38, 17, 18, 90, 0, 0, 0, + 0, 113, 102, 0, 87, 0, 0, 0, 0, 0, + 30, 39, 102, 32, 127, 43, 0, 102, 107, 114, + 0, 0, 0, 109, 111, 88, 0, 0, 102, 0, + 0, 0, 41, 0, 0, 0, 0, 100, 103, 96, + 102, 0, 0, 0, 98, 0, 94, 0, 119, 0, + 0, 0, 0, 0, 118, 104, 0, 0, 102, 95, + 102, 0, 0, 0, 0, 120, 0, 121, 0, 115, + 117, 101, 92, 0, 0, 40, 116, 124, 122, 123, + 125, 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[] = { 254, + 8, 9, 10, 11, 69, 30, 31, 32, 125, 126, + 127, 33, 34, 74, 39, 72, 139, 57, 58, 59, + 60, 85, 91, 92, 93, 146, 132, 35, 193, 208, + 140, 141, 142, 143, 224, 225, 209 }; -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[] = { 174, + -1,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 174, 221, + -14, 38,-32768, 221, 221, 175, 23, 221, 29,-32768, +-32768,-32768,-32768, 39, 157, 39, 41,-32768,-32768, 193, +-32768, 112,-32768,-32768,-32768, 57, 72, 81, 84, 263, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 99, 314, 280, 89, 90,-32768, 328, 117, + 161, 116,-32768,-32768, 280, 39, 119, 123,-32768, 104, + 105, 114, 118, 133, 342,-32768,-32768, 137,-32768, 342, +-32768, 139, 128, 5,-32768, 342,-32768, 176, 211, 160, +-32768, 280,-32768, 142, 164, 165, 67, 6, 17, 81, +-32768, 166, 177,-32768, 156, 297, 90,-32768,-32768, 178, + 184, 195,-32768, 31,-32768, 196, 280, 179, 31, 280, + -2, -15, 297, 44, 190, 200, 180, 197, 198, 210, +-32768,-32768,-32768, 280, 183, 297, 199, 3, 216, 226, +-32768, 191,-32768,-32768,-32768, 42,-32768,-32768, 234, 264, + 297, 271,-32768, 277, 266, 281,-32768,-32768, 294, 302, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 283, 301, 296, + 280, 51, 318, 246,-32768, 319, 297, 311, 312, 322, +-32768,-32768, 318,-32768,-32768,-32768, -3, 318,-32768, 323, + 332, 46, 17,-32768,-32768,-32768, 324, 297, 318, 297, + 17, 329,-32768, 17, 346, 93, 344, 349,-32768,-32768, + 318, 330, 17, 331,-32768, 350,-32768, 93,-32768, 327, + 52, 65, 333, 103,-32768,-32768, 46, 17, 318,-32768, + 318, 335, 113, 56, 56,-32768, 56,-32768, 56,-32768, +-32768,-32768,-32768, 17, 17,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 372, 374,-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 + 13, 78, 368,-32768,-32768,-32768, 348, -22, 253, 255, + 259,-32768,-32768,-32768, -20, 282, -18,-32768, -35,-32768, + 343, -73, 288,-32768, -57,-32768, -192,-32768, -170, 158, + -121, 215,-32768, 213, 170, -164, -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 388 + + +static const short yytable[] = { 161, + 210, 156, 55, 121, 77, 61, 56, 79, 215, 107, + 108, 217, 201, 67, 170, 202, 153, 204, 81, 12, + 230, 13, 16, 87, 128, 129, 124, 13, 213, 179, + 13, 113, 115, 144, 154, 243, 82, 203, 90, 77, + 228, 17, -106, 36, 77, 96, 95, 171, 84, 110, + 77, 252, 253, 130, 147, 197, 148, 131, 244, 241, + 245, 113, 157, 158, 157, 158, 112, 37, 241, 111, + 157, 158, 190, 116, 157, 158, 212, 38, 214, 62, + 159, 175, 207, 157, 158, 121, 176, 15, 122, 191, + 70, 18, 160, 235, 160, 68, 236, 238, 150, 71, + 160, 152, 73, 79, 160, 123, 237, 83, 124, 248, + 249, 219, 250, 160, 251, 168, 40, 41, 42, 43, + 44, 219, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 219, 54, 84, 220, 88, 94, 97, 221, 222, + 223, 98, 240, 99, 220, 65, 66, 100, 221, 222, + 223, 103, 247, 101, 220, 104, 102, 105, 221, 222, + 223, 40, 41, 42, 43, 44, 106, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 1, 54, 114, 89, + 109, 117, 118, 119, 134, 20, 21, 22, 23, 20, + 21, 22, 23, 19, 136, 135, 2, 3, 4, 5, + 6, 7, 145, 20, 21, 22, 23, 24, 25, 26, + 27, 19, 28, 110, 149, 29, 111, 151, 121, 169, + 164, 20, 21, 22, 23, 24, 25, 26, 27, 110, + 63, 124, 167, 29, 172, 174, 165, 166, -105, 20, + 21, 22, 23, 2, 3, 4, 5, 6, 7, 111, + 40, 41, 42, 43, 44, 194, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 173, 54, 75, 41, 42, + 43, 44, 177, 45, 46, 47, 48, 49, 50, 51, + 52, 76, 178, 54, 40, 41, 42, 43, 44, 180, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 181, + 54, 40, 137, 42, 43, 44, 182, 45, 46, 47, + 48, 49, 50, 51, 52, 138, 184, 54, 80, 41, + 183, 185, 186, 187, 45, 46, 47, 48, 49, 50, + 51, 52, 86, 41, 54, 188, 192, 196, 45, 46, + 47, 48, 49, 50, 51, 52, 75, 41, 54, 198, + 206, 199, 45, 46, 47, 48, 49, 50, 51, 52, + 200, 205, 54, 211, 218, 216, 226, 227, 234, 229, + 231, 255, 232, 256, 239, 246, 14, 64, 163, 162, + 155, 133, 78, 120, 242, 189, 195, 233 }; -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 +static const short yycheck[] = { 124, + 193, 123, 25, 19, 40, 26, 25, 5, 201, 5, + 84, 204, 183, 32, 136, 19, 19, 188, 54, 21, + 213, 9, 37, 59, 19, 20, 42, 15, 199, 151, + 18, 89, 90, 107, 37, 228, 55, 41, 61, 75, + 211, 4, 40, 21, 80, 66, 65, 45, 44, 19, + 86, 244, 245, 37, 112, 177, 114, 41, 229, 224, + 231, 119, 19, 20, 19, 20, 89, 39, 233, 39, + 19, 20, 22, 92, 19, 20, 198, 39, 200, 39, + 37, 40, 37, 19, 20, 19, 45, 10, 22, 39, + 19, 14, 49, 42, 49, 39, 221, 222, 117, 19, + 49, 120, 19, 5, 49, 39, 42, 19, 42, 234, + 235, 19, 237, 49, 239, 134, 5, 6, 7, 8, + 9, 19, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 19, 21, 44, 42, 19, 21, 19, 46, 47, + 48, 19, 40, 40, 42, 34, 35, 43, 46, 47, + 48, 19, 40, 40, 42, 19, 39, 19, 46, 47, + 48, 5, 6, 7, 8, 9, 39, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 3, 21, 19, 19, + 5, 40, 19, 19, 19, 29, 30, 31, 32, 29, + 30, 31, 32, 19, 39, 19, 23, 24, 25, 26, + 27, 28, 19, 29, 30, 31, 32, 33, 34, 35, + 36, 19, 38, 19, 19, 41, 39, 39, 19, 37, + 41, 29, 30, 31, 32, 33, 34, 35, 36, 19, + 38, 42, 23, 41, 19, 45, 40, 40, 40, 29, + 30, 31, 32, 23, 24, 25, 26, 27, 28, 39, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 40, 21, 5, 6, 7, + 8, 9, 39, 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, 23, + 21, 5, 6, 7, 8, 9, 41, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 23, 21, 5, 6, + 40, 20, 40, 23, 11, 12, 13, 14, 15, 16, + 17, 18, 5, 6, 21, 40, 19, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 5, 6, 21, 39, + 19, 40, 11, 12, 13, 14, 15, 16, 17, 18, + 39, 39, 21, 40, 19, 37, 23, 19, 42, 40, + 40, 0, 23, 0, 42, 41, 9, 30, 126, 125, + 122, 100, 40, 96, 227, 171, 174, 218 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1188,23 +1209,23 @@ yyreduce: switch (yyn) { case 1: -#line 308 "parse.y" +#line 312 "parse.y" { ; ; break;} case 2: -#line 309 "parse.y" +#line 313 "parse.y" { ; ; break;} case 3: -#line 310 "parse.y" +#line 314 "parse.y" { ; ; break;} case 4: -#line 311 "parse.y" +#line 315 "parse.y" { ; ; break;} case 5: -#line 314 "parse.y" +#line 318 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1213,7 +1234,7 @@ case 5: ; break;} case 6: -#line 320 "parse.y" +#line 324 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1222,7 +1243,7 @@ case 6: ; break;} case 7: -#line 326 "parse.y" +#line 330 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1231,7 +1252,7 @@ case 7: ; break;} case 8: -#line 332 "parse.y" +#line 336 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1240,7 +1261,7 @@ case 8: ; break;} case 9: -#line 338 "parse.y" +#line 342 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1249,7 +1270,7 @@ case 9: ; break;} case 10: -#line 344 "parse.y" +#line 348 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1258,15 +1279,15 @@ case 10: ; break;} case 11: -#line 352 "parse.y" +#line 356 "parse.y" { ; ; break;} case 12: -#line 353 "parse.y" +#line 357 "parse.y" { ; ; break;} case 13: -#line 356 "parse.y" +#line 360 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1274,7 +1295,7 @@ case 13: ; break;} case 14: -#line 361 "parse.y" +#line 365 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1282,53 +1303,76 @@ case 14: ; break;} case 15: -#line 368 "parse.y" +#line 372 "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 378 "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 386 "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 397 "parse.y" { ; ; break;} case 20: -#line 379 "parse.y" +#line 398 "parse.y" { ; ; break;} case 21: -#line 380 "parse.y" +#line 401 "parse.y" { ; ; break;} case 22: -#line 383 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 402 "parse.y" +{ ; ; break;} case 23: -#line 384 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 403 "parse.y" +{ ; ; break;} case 24: -#line 385 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 404 "parse.y" +{ ; ; break;} case 25: -#line 386 "parse.y" -{ the_scope = CLASS_SCOPE; ; +#line 407 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 26: -#line 389 "parse.y" +#line 408 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 27: +#line 409 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 28: +#line 410 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 29: +#line 413 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1343,8 +1387,8 @@ case 26: } ; break;} -case 27: -#line 402 "parse.y" +case 30: +#line 426 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1360,58 +1404,58 @@ case 27: } ; break;} -case 28: -#line 418 "parse.y" +case 31: +#line 442 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 29: -#line 422 "parse.y" +case 32: +#line 446 "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 454 "parse.y" { ; ; break;} -case 31: -#line 431 "parse.y" +case 34: +#line 455 "parse.y" { ; ; break;} -case 32: -#line 432 "parse.y" +case 35: +#line 456 "parse.y" { destructor = NULL; ; break;} -case 33: -#line 433 "parse.y" +case 36: +#line 457 "parse.y" { initializer = NULL; ; break;} -case 34: -#line 434 "parse.y" +case 37: +#line 458 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 35: -#line 440 "parse.y" +case 38: +#line 464 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 36: -#line 443 "parse.y" +case 39: +#line 467 "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 471 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1448,8 +1492,8 @@ case 37: } ; break;} -case 38: -#line 482 "parse.y" +case 41: +#line 506 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1479,8 +1523,8 @@ case 38: } ; break;} -case 39: -#line 510 "parse.y" +case 42: +#line 534 "parse.y" { Node *node; char *get, *set = NULL; @@ -1527,16 +1571,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 +1594,8 @@ case 39: class_nodes = g_list_append(class_nodes,node); ; break;} -case 40: -#line 580 "parse.y" +case 43: +#line 604 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1562,192 +1606,215 @@ case 40: yyval.id = yyvsp[-4].id; ; break;} -case 41: -#line 589 "parse.y" +case 44: +#line 613 "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 619 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 46: -#line 608 "parse.y" -{ ; ; +#line 620 "parse.y" +{ yyval.list = NULL; ; break;} case 47: -#line 609 "parse.y" +#line 623 "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 626 "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 632 "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 636 "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 643 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + yyval.id = yyvsp[0].id; + ; break;} case 52: -#line 634 "parse.y" +#line 646 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + yyval.id = yyvsp[0].id; + ; break;} case 53: -#line 637 "parse.y" +#line 649 "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 653 "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 657 "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 661 "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 666 "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 674 "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 678 "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 683 "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 687 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 62: -#line 667 "parse.y" +#line 690 "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 694 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} case 64: -#line 673 "parse.y" +#line 697 "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 702 "parse.y" +{ yyval.id = "void"; ; break;} case 66: -#line 679 "parse.y" -{ - yyval.id = "int"; - ; +#line 703 "parse.y" +{ yyval.id = "char"; ; break;} case 67: -#line 684 "parse.y" -{ - yyval.id = "enum "; - ; +#line 704 "parse.y" +{ yyval.id = "short"; ; break;} case 68: -#line 687 "parse.y" -{ - yyval.id = "union "; - ; +#line 705 "parse.y" +{ yyval.id = "int"; ; break;} case 69: -#line 690 "parse.y" -{ - yyval.id = "struct "; - ; +#line 706 "parse.y" +{ yyval.id = "long"; ; break;} case 70: -#line 695 "parse.y" -{ stars++; ; +#line 707 "parse.y" +{ yyval.id = "float"; ; break;} case 71: -#line 696 "parse.y" -{ stars++; ; +#line 708 "parse.y" +{ yyval.id = "double"; ; break;} case 72: -#line 700 "parse.y" +#line 709 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 73: +#line 710 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 74: +#line 713 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 75: +#line 714 "parse.y" +{ yyval.id = "union"; ; + break;} +case 76: +#line 715 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 77: +#line 718 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 78: +#line 719 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 79: +#line 720 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 80: +#line 724 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 81: +#line 731 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1761,14 +1828,14 @@ case 72: g_free(yyvsp[-1].id); ; break;} -case 73: -#line 712 "parse.y" +case 82: +#line 743 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 74: -#line 718 "parse.y" +case 83: +#line 749 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1782,8 +1849,8 @@ case 74: g_free(yyvsp[-1].id); ; break;} -case 75: -#line 730 "parse.y" +case 84: +#line 761 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1797,47 +1864,47 @@ case 75: g_free(yyvsp[-2].id); ; break;} -case 76: -#line 742 "parse.y" +case 85: +#line 773 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 77: -#line 745 "parse.y" +case 86: +#line 776 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 78: -#line 751 "parse.y" +case 87: +#line 782 "parse.y" { gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 79: -#line 756 "parse.y" +case 88: +#line 787 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 80: -#line 759 "parse.y" +case 89: +#line 790 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 81: -#line 764 "parse.y" +case 90: +#line 795 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 82: -#line 765 "parse.y" +case 91: +#line 796 "parse.y" { yyval.cbuf = NULL; ; break;} -case 83: -#line 769 "parse.y" +case 92: +#line 800 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1855,8 +1922,8 @@ case 83: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 785 "parse.y" +case 93: +#line 816 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1874,8 +1941,8 @@ case 84: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 85: -#line 801 "parse.y" +case 94: +#line 832 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1893,8 +1960,8 @@ case 85: ccode_line, vararg, NULL); ; break;} -case 86: -#line 817 "parse.y" +case 95: +#line 848 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1912,8 +1979,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 833 "parse.y" +case 96: +#line 864 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1926,8 +1993,8 @@ case 87: ccode_line, vararg, NULL); ; break;} -case 88: -#line 844 "parse.y" +case 97: +#line 875 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1935,8 +2002,8 @@ case 88: vararg, NULL); ; break;} -case 89: -#line 850 "parse.y" +case 98: +#line 881 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -1948,8 +2015,8 @@ case 89: vararg, NULL); ; break;} -case 90: -#line 860 "parse.y" +case 99: +#line 891 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1972,8 +2039,8 @@ case 90: } ; break;} -case 91: -#line 883 "parse.y" +case 100: +#line 914 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1986,8 +2053,8 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 894 "parse.y" +case 101: +#line 925 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -2008,30 +2075,30 @@ case 92: g_free(yyvsp[-1].id); ; break;} -case 93: -#line 913 "parse.y" +case 102: +#line 944 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 94: -#line 919 "parse.y" +case 103: +#line 950 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 95: -#line 920 "parse.y" +case 104: +#line 951 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 96: -#line 926 "parse.y" +case 105: +#line 957 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 97: -#line 927 "parse.y" +case 106: +#line 958 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -2044,8 +2111,8 @@ case 97: } ; break;} -case 98: -#line 938 "parse.y" +case 107: +#line 969 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -2057,40 +2124,40 @@ case 98: } ; break;} -case 99: -#line 948 "parse.y" +case 108: +#line 979 "parse.y" { has_self = FALSE; ; break;} -case 100: -#line 951 "parse.y" +case 109: +#line 982 "parse.y" { vararg = TRUE; ; break;} -case 101: -#line 952 "parse.y" +case 110: +#line 983 "parse.y" { vararg = FALSE; ; break;} -case 102: -#line 955 "parse.y" +case 111: +#line 986 "parse.y" { ; ; break;} -case 103: -#line 956 "parse.y" +case 112: +#line 987 "parse.y" { ; ; break;} -case 104: -#line 959 "parse.y" +case 113: +#line 990 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 105: -#line 962 "parse.y" +case 114: +#line 993 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 106: -#line 965 "parse.y" +case 115: +#line 996 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2100,8 +2167,8 @@ case 106: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 107: -#line 973 "parse.y" +case 116: +#line 1004 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2111,16 +2178,16 @@ case 107: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 108: -#line 983 "parse.y" +case 117: +#line 1014 "parse.y" { ; ; break;} -case 109: -#line 984 "parse.y" +case 118: +#line 1015 "parse.y" { ; ; break;} -case 110: -#line 987 "parse.y" +case 119: +#line 1018 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -2135,61 +2202,61 @@ case 110: g_free(yyvsp[0].id); ; break;} -case 111: -#line 1000 "parse.y" +case 120: +#line 1031 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 1004 "parse.y" +case 121: +#line 1035 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 1008 "parse.y" +case 122: +#line 1039 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 1012 "parse.y" +case 123: +#line 1043 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 115: -#line 1016 "parse.y" +case 124: +#line 1047 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 116: -#line 1020 "parse.y" +case 125: +#line 1051 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 117: -#line 1026 "parse.y" +case 126: +#line 1057 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 118: -#line 1027 "parse.y" +case 127: +#line 1058 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 119: -#line 1031 "parse.y" +case 128: +#line 1062 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2414,5 +2481,5 @@ yyerrhandle: } return 1; } -#line 1034 "parse.y" +#line 1065 "parse.y"