#define PUBLIC 283
#define PRIVATE 284
#define PROTECTED 285
-#define ARGUMENT 286
-#define VIRTUAL 287
-#define SIGNAL 288
-#define OVERRIDE 289
+#define CLASSWIDE 286
+#define ARGUMENT 287
+#define VIRTUAL 288
+#define SIGNAL 289
+#define OVERRIDE 290
#line 21 "parse.y"
#include "config.h"
#include <glib.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "treefuncs.h"
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;
Node *node;
Type *type;
char *c_cbuf;
+
+ 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
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,
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;
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);
}
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);
}
-#line 288 "parse.y"
+#line 294 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 242
+#define YYFINAL 256
#define YYFLAG -32768
-#define YYNTBASE 49
+#define YYNTBASE 50
-#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86)
+#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, 47, 2, 2, 2, 2, 2, 2, 40,
- 41, 43, 2, 44, 48, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 38, 46,
- 39, 45, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 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,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 36, 42, 37, 2, 2, 2, 2, 2,
+ 2, 2, 37, 43, 38, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36
};
#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, 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, 329, 330, 332, 335, 337, 339, 343, 345, 349,
- 351, 355, 357, 360, 364, 371, 379, 382, 384, 386,
- 389, 392, 396, 400, 404, 408, 410, 413
+ 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[] = { 51,
- 52, 51, 0, 52, 51, 0, 51, 52, 0, 52,
+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, 51, 50, 0, 50, 0, 53, 36,
- 54, 37, 0, 53, 36, 37, 0, 3, 21, 4,
- 21, 0, 54, 55, 0, 55, 0, 76, 0, 60,
- 0, 61, 0, 38, 0, 29, 0, 30, 0, 31,
- 0, 19, 19, 0, 19, 36, 23, 0, 39, 85,
- 0, 39, 36, 23, 0, 57, 58, 0, 58, 57,
- 0, 58, 0, 57, 0, 0, 56, 65, 19, 59,
- 38, 0, 56, 65, 19, 22, 59, 38, 0, 32,
- 63, 62, 19, 19, 36, 23, 19, 36, 23, 38,
- 0, 32, 63, 62, 19, 19, 36, 23, 38, 0,
- 32, 63, 62, 19, 19, 0, 19, 40, 19, 65,
- 41, 0, 19, 0, 40, 64, 41, 0, 0, 19,
- 42, 64, 0, 19, 0, 66, 0, 5, 66, 0,
- 67, 0, 67, 70, 0, 12, 68, 0, 11, 68,
- 0, 68, 0, 12, 18, 0, 11, 18, 0, 18,
- 0, 17, 0, 16, 0, 19, 0, 69, 19, 0,
- 21, 0, 6, 0, 13, 15, 0, 13, 0, 14,
- 15, 0, 14, 0, 15, 0, 9, 0, 8, 0,
- 7, 0, 43, 70, 0, 43, 0, 19, 73, 0,
- 73, 0, 56, 19, 73, 0, 19, 56, 73, 0,
- 56, 73, 0, 71, 0, 19, 40, 74, 41, 0,
- 74, 44, 19, 0, 19, 0, 36, 23, 0, 38,
- 0, 34, 63, 72, 65, 19, 40, 79, 41, 77,
- 75, 0, 56, 34, 63, 71, 65, 19, 40, 79,
- 41, 77, 75, 0, 33, 56, 65, 19, 40, 79,
- 41, 77, 75, 0, 56, 33, 65, 19, 40, 79,
- 41, 77, 75, 0, 33, 65, 19, 40, 79, 41,
- 77, 75, 0, 35, 40, 21, 41, 65, 19, 40,
- 79, 41, 77, 75, 0, 56, 65, 19, 40, 79,
- 41, 77, 75, 0, 19, 40, 19, 41, 75, 0,
- 19, 78, 0, 19, 78, 19, 78, 0, 0, 85,
- 0, 36, 23, 0, 6, 0, 19, 0, 19, 44,
- 80, 0, 80, 0, 81, 44, 10, 0, 81, 0,
- 81, 44, 82, 0, 82, 0, 65, 19, 0, 65,
- 19, 22, 0, 65, 19, 40, 19, 83, 41, 0,
- 65, 19, 22, 40, 19, 83, 41, 0, 83, 84,
- 0, 84, 0, 19, 0, 45, 85, 0, 46, 85,
- 0, 45, 39, 85, 0, 46, 39, 85, 0, 39,
- 39, 85, 0, 47, 39, 85, 0, 20, 0, 48,
- 20, 0, 19, 0
+ 0, 28, 0, 52, 51, 0, 51, 0, 54, 37,
+ 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,
- 306, 307, 308, 309, 312, 318, 324, 330, 336, 342,
- 350, 351, 354, 359, 366, 371, 372, 375, 376, 377,
- 378, 381, 382, 383, 386, 399, 415, 419, 427, 428,
- 429, 430, 431, 437, 440, 444, 479, 507, 572, 581,
- 587, 588, 591, 594, 600, 601, 609, 613, 620, 623,
- 626, 629, 632, 635, 638, 641, 644, 647, 651, 654,
- 659, 662, 665, 668, 671, 676, 679, 682, 687, 688,
- 692, 704, 710, 722, 734, 737, 743, 748, 751, 756,
- 757, 761, 772, 783, 794, 805, 816, 822, 827, 848,
- 859, 878, 884, 885, 891, 892, 903, 913, 916, 917,
- 920, 921, 924, 927, 930, 938, 948, 949, 952, 965,
- 969, 973, 977, 981, 985, 991, 992, 996
+ 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
"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",
-"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,
- 49, 49, 49, 49, 50, 50, 50, 50, 50, 50,
- 51, 51, 52, 52, 53, 54, 54, 55, 55, 55,
- 55, 56, 56, 56, 57, 57, 58, 58, 59, 59,
- 59, 59, 59, 60, 60, 61, 61, 61, 62, 62,
+ 50, 50, 50, 50, 51, 51, 51, 51, 51, 51,
+ 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,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
- 68, 68, 68, 68, 68, 69, 69, 69, 70, 70,
- 71, 71, 72, 72, 72, 72, 73, 74, 74, 75,
- 75, 76, 76, 76, 76, 76, 76, 76, 76, 77,
- 77, 77, 78, 78, 79, 79, 79, 79, 80, 80,
- 81, 81, 82, 82, 82, 82, 83, 83, 84, 84,
- 84, 84, 84, 84, 84, 85, 85, 85
+ 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, 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, 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,
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, 98,
- 100, 102, 79, 0, 74, 73, 0, 0, 0, 0,
- 25, 0, 0, 118, 116, 0, 0, 27, 0, 29,
- 30, 34, 80, 0, 0, 0, 0, 103, 92, 0,
- 77, 0, 0, 0, 0, 0, 26, 35, 28, 117,
- 92, 39, 0, 92, 97, 104, 0, 0, 0, 99,
- 101, 78, 0, 0, 92, 0, 0, 0, 37, 0,
- 0, 0, 0, 90, 93, 86, 92, 0, 0, 0,
- 88, 0, 84, 0, 109, 0, 0, 0, 0, 0,
- 108, 94, 0, 0, 92, 85, 92, 0, 0, 0,
- 0, 110, 0, 111, 0, 105, 107, 91, 82, 0,
- 0, 36, 106, 114, 112, 113, 115, 87, 83, 0,
- 0, 0
+ 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[] = { 240,
- 8, 9, 10, 11, 29, 30, 31, 116, 117, 118,
- 32, 33, 71, 38, 69, 128, 56, 57, 58, 59,
- 82, 86, 87, 88, 134, 121, 34, 179, 194, 129,
- 130, 131, 132, 210, 211, 195
+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[] = { 136,
- -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 167,
- -16, 13,-32768, 167, 167, 150, 15, 167, 19,-32768,
--32768,-32768, 27, 137, 27, 37,-32768,-32768, 170,-32768,
- 107,-32768,-32768,-32768,-32768, 25, 61, 98, 254,-32768,
--32768,-32768,-32768, 263, 269, 114, 118,-32768,-32768,-32768,
--32768,-32768,-32768, 221, 116,-32768, 104,-32768, 138, 73,
- 151,-32768,-32768, 221, 27, 154, 133, 155, 157, 156,
- 159,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 187, 184,
- 104,-32768,-32768, 146, 212,-32768, 221,-32768, 200, 229,
- 239, 43, 96, 61,-32768, 245, 255, 240, 238,-32768,
- 246, 260, 266,-32768, -8,-32768, 270, 221, 248, -8,
- 221, 36, 3, -1, 238, 251, 272, 256, 273,-32768,
--32768,-32768, 221, 257, 238, 258, 57, 276, 259,-32768,
- 253,-32768,-32768, 64,-32768,-32768, 252, 279, 238, 282,
--32768, 280, 264,-32768,-32768, 281, 285,-32768, 265,-32768,
--32768,-32768,-32768, 267, 284, 268, 221, 5, 291, 204,
--32768, 292, 238, 274, 271, 275,-32768,-32768,-32768,-32768,
- 291,-32768, -10, 291,-32768, 277, 294, 18, 96,-32768,
--32768,-32768, 278, 238, 291, 238, 96, 286,-32768, 96,
- 297, 91, 295, 301,-32768,-32768, 291, 283, 96, 287,
--32768, 298,-32768, 91,-32768, 288, -5, 10, 290, 29,
--32768,-32768, 18, 96, 291,-32768, 291, 293, 50, 4,
- 4,-32768, 4,-32768, 4,-32768,-32768,-32768,-32768, 96,
- 96,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 323,
- 325,-32768
+static const short 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,
- 69, 117, 317,-32768,-32768, 303, -21, 213, 217, 222,
--32768,-32768,-32768, -19, 242, -23, 299,-32768, 126,-32768,
- 261, 243,-32768, -24,-32768, -174,-32768, -164, 124, -113,
- 182,-32768, 180, 139, -120, -114
+ 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 343
-
-
-static const short yytable[] = { 148,
- 55, 149, 54, 12, 196, 60, 187, 66, 188, 190,
- 101, 156, 201, 144, 145, 203, 17, 144, 145, 16,
- 199, 112, 144, 145, 216, 165, 176, 189, 144, 145,
- 79, 102, 214, 221, 146, 35, 144, 145, 85, 229,
- 90, 114, 147, 67, 177, 91, 147, 205, 223, 183,
- 230, 147, 231, 193, 141, 238, 239, 147, 36, 104,
- 106, 112, 103, 107, 113, 147, 37, 206, 205, 226,
- 198, 142, 200, 207, 208, 209, 61, 13, 135, 68,
- 136, 114, 115, 13, 138, 104, 13, 140, 206, 227,
- 233, 84, 222, 224, 207, 208, 209, -96, 227, 154,
- 157, 20, 21, 22, 161, 234, 235, 162, 236, 205,
- 237, 39, 40, 41, 42, 43, 70, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 15, 53, 77, 206,
- 18, 119, 78, 120, 80, 207, 208, 209, 1, 64,
- 65, 39, 40, 41, 42, 43, 81, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 83, 53, 2, 3,
- 4, 5, 6, 7, 101, 20, 21, 22, 19, 74,
- 76, 89, 92, 93, 20, 21, 22, 97, 20, 21,
- 22, 23, 24, 25, 26, 102, 27, 28, 19, 2,
- 3, 4, 5, 6, 7, 96, 94, 95, 20, 21,
- 22, 23, 24, 25, 26, 98, 62, 28, 39, 40,
- 41, 42, 43, 180, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 99, 53, 39, 40, 41, 42, 43,
- 105, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 108, 53, 39, 126, 41, 42, 43, 109, 44, 45,
- 46, 47, 48, 49, 50, 51, 127, 110, 53, 40,
- 41, 42, 43, 123, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 124, 53, 46, 47, 48, 133, 125,
- 73, 46, 47, 48, 101, 102, 75, 139, 137, 114,
- 112, 163, 155, 152, 158, 153, 160, 164, -95, 159,
- 166, 168, 167, 169, 170, 171, 173, 172, 174, 178,
- 182, 185, 192, 184, 186, 204, 191, 212, 197, 213,
- 218, 202, 241, 215, 242, 14, 220, 217, 225, 151,
- 232, 63, 150, 111, 143, 122, 228, 72, 175, 181,
- 0, 100, 219
+#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[] = { 114,
- 24, 115, 24, 21, 179, 25, 171, 31, 19, 174,
- 19, 125, 187, 19, 20, 190, 4, 19, 20, 36,
- 185, 19, 19, 20, 199, 139, 22, 38, 19, 20,
- 54, 40, 197, 39, 36, 21, 19, 20, 60, 214,
- 64, 39, 48, 19, 40, 65, 48, 19, 39, 163,
- 215, 48, 217, 36, 19, 230, 231, 48, 40, 84,
- 85, 19, 84, 87, 22, 48, 40, 39, 19, 41,
- 184, 36, 186, 45, 46, 47, 40, 9, 103, 19,
- 105, 39, 40, 15, 108, 110, 18, 111, 39, 210,
- 41, 19, 207, 208, 45, 46, 47, 41, 219, 123,
- 44, 29, 30, 31, 41, 220, 221, 44, 223, 19,
- 225, 5, 6, 7, 8, 9, 19, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 10, 21, 15, 39,
- 14, 36, 15, 38, 19, 45, 46, 47, 3, 33,
- 34, 5, 6, 7, 8, 9, 43, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 19, 21, 23, 24,
- 25, 26, 27, 28, 19, 29, 30, 31, 19, 44,
- 45, 21, 19, 41, 29, 30, 31, 19, 29, 30,
- 31, 32, 33, 34, 35, 40, 37, 38, 19, 23,
- 24, 25, 26, 27, 28, 40, 42, 41, 29, 30,
- 31, 32, 33, 34, 35, 19, 37, 38, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 40, 21, 5, 6, 7, 8, 9,
- 19, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 41, 21, 5, 6, 7, 8, 9, 19, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 19, 21, 6,
- 7, 8, 9, 19, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 19, 21, 13, 14, 15, 19, 40,
- 18, 13, 14, 15, 19, 40, 18, 40, 19, 39,
- 19, 40, 36, 38, 19, 23, 44, 19, 41, 41,
- 19, 38, 23, 23, 20, 41, 23, 41, 41, 19,
- 19, 41, 19, 40, 40, 19, 40, 23, 41, 19,
- 23, 36, 0, 41, 0, 9, 39, 41, 39, 117,
- 38, 29, 116, 91, 113, 94, 213, 39, 157, 160,
- -1, 81, 204
+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"
switch (yyn) {
case 1:
-#line 306 "parse.y"
+#line 312 "parse.y"
{ ; ;
break;}
case 2:
-#line 307 "parse.y"
+#line 313 "parse.y"
{ ; ;
break;}
case 3:
-#line 308 "parse.y"
+#line 314 "parse.y"
{ ; ;
break;}
case 4:
-#line 309 "parse.y"
+#line 315 "parse.y"
{ ; ;
break;}
case 5:
-#line 312 "parse.y"
+#line 318 "parse.y"
{
Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 6:
-#line 318 "parse.y"
+#line 324 "parse.y"
{
Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 7:
-#line 324 "parse.y"
+#line 330 "parse.y"
{
Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 8:
-#line 330 "parse.y"
+#line 336 "parse.y"
{
Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 9:
-#line 336 "parse.y"
+#line 342 "parse.y"
{
Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 10:
-#line 342 "parse.y"
+#line 348 "parse.y"
{
Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 11:
-#line 350 "parse.y"
+#line 356 "parse.y"
{ ; ;
break;}
case 12:
-#line 351 "parse.y"
+#line 357 "parse.y"
{ ; ;
break;}
case 13:
-#line 354 "parse.y"
+#line 360 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 14:
-#line 359 "parse.y"
+#line 365 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
;
break;}
case 15:
-#line 366 "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 371 "parse.y"
-{ ; ;
- break;}
case 17:
-#line 372 "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 375 "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 376 "parse.y"
+#line 397 "parse.y"
{ ; ;
break;}
case 20:
-#line 377 "parse.y"
+#line 398 "parse.y"
{ ; ;
break;}
case 21:
-#line 378 "parse.y"
+#line 401 "parse.y"
{ ; ;
break;}
case 22:
-#line 381 "parse.y"
-{ the_scope = PUBLIC_SCOPE; ;
+#line 402 "parse.y"
+{ ; ;
break;}
case 23:
-#line 382 "parse.y"
-{ the_scope = PRIVATE_SCOPE; ;
+#line 403 "parse.y"
+{ ; ;
break;}
case 24:
-#line 383 "parse.y"
-{ the_scope = PROTECTED_SCOPE; ;
+#line 404 "parse.y"
+{ ; ;
break;}
case 25:
-#line 386 "parse.y"
+#line 407 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+ break;}
+case 26:
+#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);
}
;
break;}
-case 26:
-#line 399 "parse.y"
+case 30:
+#line 426 "parse.y"
{
if(strcmp(yyvsp[-2].id, "destroy")==0) {
g_free(yyvsp[-2].id);
}
;
break;}
-case 27:
-#line 415 "parse.y"
+case 31:
+#line 442 "parse.y"
{
initializer = yyvsp[0].id;
initializer_line = ccode_line;
;
break;}
-case 28:
-#line 419 "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 29:
-#line 427 "parse.y"
+case 33:
+#line 454 "parse.y"
{ ; ;
break;}
-case 30:
-#line 428 "parse.y"
+case 34:
+#line 455 "parse.y"
{ ; ;
break;}
-case 31:
-#line 429 "parse.y"
+case 35:
+#line 456 "parse.y"
{ destructor = NULL; ;
break;}
-case 32:
-#line 430 "parse.y"
+case 36:
+#line 457 "parse.y"
{ initializer = NULL; ;
break;}
-case 33:
-#line 431 "parse.y"
+case 37:
+#line 458 "parse.y"
{
destructor = NULL;
initializer = NULL;
;
break;}
-case 34:
-#line 437 "parse.y"
+case 38:
+#line 464 "parse.y"
{
push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
-case 35:
-#line 440 "parse.y"
+case 39:
+#line 467 "parse.y"
{
push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
-case 36:
-#line 444 "parse.y"
+case 40:
+#line 471 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
}
;
break;}
-case 37:
-#line 479 "parse.y"
+case 41:
+#line 506 "parse.y"
{
if(strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
}
;
break;}
-case 38:
-#line 507 "parse.y"
+case 42:
+#line 534 "parse.y"
{
Node *node;
char *get, *set = NULL;
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);
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,
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);
class_nodes = g_list_append(class_nodes,node);
;
break;}
-case 39:
-#line 572 "parse.y"
+case 43:
+#line 604 "parse.y"
{
if(strcmp(yyvsp[-2].id,"type")!=0) {
g_free(yyvsp[-4].id);
yyval.id = yyvsp[-4].id;
;
break;}
-case 40:
-#line 581 "parse.y"
+case 44:
+#line 613 "parse.y"
{
yyval.id = yyvsp[0].id;
typestack = g_list_prepend(typestack,NULL);
;
break;}
-case 41:
-#line 587 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
- break;}
-case 42:
-#line 588 "parse.y"
-{ yyval.list = NULL; ;
- break;}
-case 43:
-#line 591 "parse.y"
-{
- yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
- ;
- break;}
-case 44:
-#line 594 "parse.y"
-{
- yyval.list = g_list_append(NULL,yyvsp[0].id);
- ;
- break;}
case 45:
-#line 600 "parse.y"
-{ ; ;
+#line 619 "parse.y"
+{ yyval.list = yyvsp[-1].list; ;
break;}
case 46:
-#line 601 "parse.y"
-{
- Type *type = typestack->data;
- char *oldname = type->name;
- type->name = g_strconcat("const ",oldname,NULL);
- g_free(oldname);
- ;
+#line 620 "parse.y"
+{ yyval.list = NULL; ;
break;}
case 47:
-#line 609 "parse.y"
+#line 623 "parse.y"
{
- Node *node = new_type(0,yyvsp[0].id,NULL);
- typestack = g_list_prepend(typestack,node);
+ yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 48:
-#line 613 "parse.y"
+#line 626 "parse.y"
{
- Node *node = new_type(stars,yyvsp[-1].id,NULL);
- stars = 0;
- typestack = g_list_prepend(typestack,node);
+ yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 49:
-#line 620 "parse.y"
+#line 632 "parse.y"
{
- yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
- ;
+ Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
+ typestack = g_list_prepend(typestack,node);
+ ;
break;}
case 50:
-#line 623 "parse.y"
+#line 636 "parse.y"
{
- yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
- ;
+ Node *node = new_type(yyvsp[0].id, NULL, NULL);
+ typestack = g_list_prepend(typestack,node);
+ ;
break;}
case 51:
-#line 626 "parse.y"
+#line 643 "parse.y"
{
- yyval.id = g_strdup(yyvsp[0].id);
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 52:
-#line 629 "parse.y"
+#line 646 "parse.y"
{
- yyval.id = g_strdup("unsigned char");
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 53:
-#line 632 "parse.y"
+#line 649 "parse.y"
{
- yyval.id = g_strdup("signed char");
- ;
+ yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 54:
-#line 635 "parse.y"
+#line 653 "parse.y"
{
- yyval.id = g_strdup("char");
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 55:
-#line 638 "parse.y"
+#line 657 "parse.y"
{
- yyval.id = g_strdup("double");
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 56:
-#line 641 "parse.y"
+#line 661 "parse.y"
{
- yyval.id = g_strdup("float");
- ;
+ yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+ yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 57:
-#line 644 "parse.y"
+#line 666 "parse.y"
{
- yyval.id = yyvsp[0].id;
- ;
+ yyval.id = g_strconcat(yyvsp[-2].id, " ",
+ yyvsp[-1].id, " const", NULL);
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 58:
-#line 647 "parse.y"
+#line 674 "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[0].id);
- ;
+ ;
break;}
case 59:
-#line 651 "parse.y"
+#line 678 "parse.y"
{
- yyval.id = yyvsp[0].id;
- ;
+ 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 654 "parse.y"
+#line 683 "parse.y"
{
- yyval.id = g_strdup("void");
- ;
+ yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 61:
-#line 659 "parse.y"
+#line 687 "parse.y"
{
- yyval.id = "long int";
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 62:
-#line 662 "parse.y"
+#line 690 "parse.y"
{
- yyval.id = "long";
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 63:
-#line 665 "parse.y"
+#line 694 "parse.y"
{
- yyval.id = "short int";
- ;
+ yyval.id = g_strdup(yyvsp[0].id);
+ ;
break;}
case 64:
-#line 668 "parse.y"
+#line 697 "parse.y"
{
- yyval.id = "short";
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ ;
break;}
case 65:
-#line 671 "parse.y"
-{
- yyval.id = "int";
- ;
+#line 702 "parse.y"
+{ yyval.id = "void"; ;
break;}
case 66:
-#line 676 "parse.y"
-{
- yyval.id = "enum ";
- ;
+#line 703 "parse.y"
+{ yyval.id = "char"; ;
break;}
case 67:
-#line 679 "parse.y"
-{
- yyval.id = "union ";
- ;
+#line 704 "parse.y"
+{ yyval.id = "short"; ;
break;}
case 68:
-#line 682 "parse.y"
-{
- yyval.id = "struct ";
- ;
+#line 705 "parse.y"
+{ yyval.id = "int"; ;
break;}
case 69:
-#line 687 "parse.y"
-{ stars++; ;
+#line 706 "parse.y"
+{ yyval.id = "long"; ;
break;}
case 70:
-#line 688 "parse.y"
-{ stars++; ;
+#line 707 "parse.y"
+{ yyval.id = "float"; ;
break;}
case 71:
-#line 692 "parse.y"
+#line 708 "parse.y"
+{ yyval.id = "double"; ;
+ break;}
+case 72:
+#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;
g_free(yyvsp[-1].id);
;
break;}
-case 72:
-#line 704 "parse.y"
+case 82:
+#line 743 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 73:
-#line 710 "parse.y"
+case 83:
+#line 749 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 74:
-#line 722 "parse.y"
+case 84:
+#line 761 "parse.y"
{
if(strcmp(yyvsp[-2].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-2].id);
;
break;}
-case 75:
-#line 734 "parse.y"
+case 85:
+#line 773 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 76:
-#line 737 "parse.y"
+case 86:
+#line 776 "parse.y"
{
/* the_scope was default thus public */
the_scope = PUBLIC_SCOPE;
;
break;}
-case 77:
-#line 743 "parse.y"
+case 87:
+#line 782 "parse.y"
{
gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
;
break;}
-case 78:
-#line 748 "parse.y"
+case 88:
+#line 787 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 79:
-#line 751 "parse.y"
+case 89:
+#line 790 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 80:
-#line 756 "parse.y"
+case 90:
+#line 795 "parse.y"
{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 81:
-#line 757 "parse.y"
+case 91:
+#line 796 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 82:
-#line 761 "parse.y"
+case 92:
+#line 800 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
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[0].cbuf,yyvsp[-9].line,
ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 83:
-#line 772 "parse.y"
+case 93:
+#line 816 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
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[0].cbuf, yyvsp[-9].line,
ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 84:
-#line 783 "parse.y"
+case 94:
+#line 832 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
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[0].cbuf, yyvsp[-8].line,
ccode_line, vararg, NULL);
;
break;}
-case 85:
-#line 794 "parse.y"
+case 95:
+#line 848 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
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[0].cbuf, yyvsp[-7].line,
ccode_line, vararg, NULL);
;
break;}
-case 86:
-#line 805 "parse.y"
+case 96:
+#line 864 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
ccode_line, vararg, NULL);
;
break;}
-case 87:
-#line 816 "parse.y"
+case 97:
+#line 875 "parse.y"
{
push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
yyvsp[-5].id, yyvsp[0].cbuf,
vararg, NULL);
;
break;}
-case 88:
-#line 822 "parse.y"
+case 98:
+#line 881 "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[0].cbuf, yyvsp[-7].line, ccode_line,
vararg, NULL);
;
break;}
-case 89:
-#line 827 "parse.y"
+case 99:
+#line 891 "parse.y"
{
if(strcmp(yyvsp[-4].id, "init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
} 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 848 "parse.y"
+case 100:
+#line 914 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
g_free(yyvsp[-1].id);
;
break;}
-case 91:
-#line 859 "parse.y"
+case 101:
+#line 925 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
g_free(yyvsp[-1].id);
;
break;}
-case 92:
-#line 878 "parse.y"
+case 102:
+#line 944 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
-case 93:
-#line 884 "parse.y"
+case 103:
+#line 950 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 94:
-#line 885 "parse.y"
+case 104:
+#line 951 "parse.y"
{
yyval.id = (yyvsp[1].cbuf)->str;
g_string_free(yyvsp[1].cbuf, FALSE);
;
break;}
-case 95:
-#line 891 "parse.y"
+case 105:
+#line 957 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 96:
-#line 892 "parse.y"
+case 106:
+#line 958 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
}
;
break;}
-case 97:
-#line 903 "parse.y"
+case 107:
+#line 969 "parse.y"
{
has_self = TRUE;
if(strcmp(yyvsp[-2].id,"self")==0)
}
;
break;}
-case 98:
-#line 913 "parse.y"
+case 108:
+#line 979 "parse.y"
{ has_self = FALSE; ;
break;}
-case 99:
-#line 916 "parse.y"
+case 109:
+#line 982 "parse.y"
{ vararg = TRUE; ;
break;}
-case 100:
-#line 917 "parse.y"
+case 110:
+#line 983 "parse.y"
{ vararg = FALSE; ;
break;}
-case 101:
-#line 920 "parse.y"
+case 111:
+#line 986 "parse.y"
{ ; ;
break;}
-case 102:
-#line 921 "parse.y"
+case 112:
+#line 987 "parse.y"
{ ; ;
break;}
-case 103:
-#line 924 "parse.y"
+case 113:
+#line 990 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 104:
-#line 927 "parse.y"
+case 114:
+#line 993 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 105:
-#line 930 "parse.y"
+case 115:
+#line 996 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 106:
-#line 938 "parse.y"
+case 116:
+#line 1004 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
;
break;}
-case 107:
-#line 948 "parse.y"
+case 117:
+#line 1014 "parse.y"
{ ; ;
break;}
-case 108:
-#line 949 "parse.y"
+case 118:
+#line 1015 "parse.y"
{ ; ;
break;}
-case 109:
-#line 952 "parse.y"
+case 119:
+#line 1018 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 110:
-#line 965 "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 111:
-#line 969 "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 112:
-#line 973 "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 113:
-#line 977 "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 114:
-#line 981 "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 115:
-#line 985 "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 116:
-#line 991 "parse.y"
+case 126:
+#line 1057 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 117:
-#line 992 "parse.y"
+case 127:
+#line 1058 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 118:
-#line 996 "parse.y"
+case 128:
+#line 1062 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 999 "parse.y"
+#line 1065 "parse.y"
projects / gob-dx.git / blobdiff