#define TYPETOKEN 276
#define ARRAY_DIM 277
#define CCODE 278
-#define HCODE 279
-#define PUBLIC 280
-#define PRIVATE 281
-#define ARGUMENT 282
-#define VIRTUAL 283
-#define SIGNAL 284
-#define OVERRIDE 285
+#define HTCODE 279
+#define PHCODE 280
+#define HCODE 281
+#define PUBLIC 282
+#define PRIVATE 283
+#define PROTECTED 284
+#define ARGUMENT 285
+#define VIRTUAL 286
+#define SIGNAL 287
+#define OVERRIDE 288
#line 21 "parse.y"
#include "tree.h"
#include "main.h"
+#include "util.h"
#define _(x) (x)
-extern char *filename;
-
GList *nodes = NULL;
static GList *class_nodes = NULL;
static GList *gtktypes = NULL;
+/* this can be a global as we will only do one function at a time
+ anyway */
+static int the_scope = NO_SCOPE;
+
void free(void *ptr);
int yylex(void);
exit(1);
}
+static Type *
+pop_type(void)
+{
+ Type *type = typestack->data;
+ typestack = g_list_remove(typestack,typestack->data);
+ return type;
+}
+
static void
push_variable(char *name, int scope, int line_no, char *postfix)
{
Node *var;
- Type *type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ Type *type = pop_type();
type->postfix = postfix;
}
static void
-push_function(int scope, char *oid, char *id, char *onerror,
+push_function(int scope, int method, char *oid, char *id, char *onerror,
GString *cbuf,int line_no, int ccode_line, int vararg)
{
Node *node;
Type *type;
+ char *c_cbuf;
- if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
- type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
+ type = pop_type();
} else {
type = (Type *)new_type(0,g_strdup("void"),NULL);
}
/* a complicated and ugly test to figure out if we have
the wrong number of types for a signal */
- if((scope == SIGNAL_FIRST_METHOD ||
- scope == SIGNAL_LAST_METHOD ||
- scope == PRIVATE_SIGNAL_FIRST_METHOD ||
- scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+ if((method == SIGNAL_FIRST_METHOD ||
+ method == SIGNAL_LAST_METHOD) &&
g_list_length(gtktypes) != g_list_length(funcargs) &&
!(g_list_length(funcargs) == 1 &&
g_list_length(gtktypes) == 2 &&
"function arguments for a signal "
"don't seem to match"),line_no);
}
- node = new_method(scope,type,oid,gtktypes,id,funcargs,
- onerror,cbuf,line_no,ccode_line,vararg);
+ if(cbuf) {
+ char *p;
+ c_cbuf = p = cbuf->str;
+ while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+ p++;
+ if(!p || !*p)
+ c_cbuf = NULL;
+ } else
+ c_cbuf = NULL;
+
+ node = new_method(scope,method,type,oid,gtktypes,id,funcargs,
+ onerror,c_cbuf,line_no,ccode_line,vararg);
+
+ if(cbuf)
+ g_string_free(cbuf,
+ /*only free segment if we haven't passed it
+ above */
+ c_cbuf?FALSE:TRUE);
gtktypes = NULL;
funcargs = NULL;
push_funcarg(char *name, char *postfix)
{
Node *node;
- Type *type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ Type *type = pop_type();
type->postfix = postfix;
}
-#line 178 "parse.y"
+#line 201 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 216
+#define YYFINAL 221
#define YYFLAG -32768
-#define YYNTBASE 46
+#define YYNTBASE 48
-#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 75)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 288 ? yytranslate[x] : 80)
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, 44, 2, 2, 2, 2, 2, 2, 35,
- 36, 38, 2, 39, 45, 2, 2, 2, 41, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 34, 43,
- 40, 42, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 46, 2, 2, 2, 2, 2, 2, 38,
+ 39, 41, 2, 42, 47, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 37, 44,
+ 45, 43, 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, 32, 37, 33, 2, 2, 2, 2, 2,
+ 2, 2, 35, 40, 36, 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
+ 27, 28, 29, 30, 31, 32, 33, 34
};
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
- 0, 4, 7, 10, 12, 15, 18, 20, 22, 27,
- 31, 36, 39, 42, 45, 47, 49, 51, 56, 62,
- 67, 73, 85, 94, 98, 99, 103, 105, 107, 110,
- 112, 115, 118, 121, 123, 126, 129, 131, 133, 135,
- 137, 140, 142, 144, 147, 149, 152, 154, 156, 158,
- 160, 162, 165, 167, 168, 170, 174, 178, 181, 184,
- 188, 192, 195, 197, 202, 206, 208, 211, 213, 223,
- 233, 243, 256, 266, 276, 282, 285, 289, 292, 293,
- 295, 297, 301, 303, 307, 309, 313, 315, 318, 322,
- 329, 337, 340, 342, 344, 347, 350, 354, 358, 362,
- 366, 368, 371
+ 0, 4, 7, 10, 12, 14, 16, 18, 20, 23,
+ 25, 30, 34, 39, 42, 45, 48, 50, 52, 54,
+ 56, 58, 60, 65, 71, 83, 92, 98, 100, 104,
+ 105, 109, 111, 113, 116, 118, 121, 124, 127, 129,
+ 132, 135, 137, 139, 141, 143, 146, 148, 150, 153,
+ 155, 158, 160, 162, 164, 166, 168, 171, 173, 176,
+ 178, 182, 186, 189, 191, 196, 200, 202, 205, 207,
+ 217, 228, 238, 248, 257, 269, 278, 284, 287, 291,
+ 292, 294, 296, 300, 302, 306, 308, 312, 314, 317,
+ 321, 328, 336, 339, 341, 343, 346, 349, 353, 357,
+ 361, 365, 367, 370
};
-static const short yyrhs[] = { 47,
- 48, 47, 0, 48, 47, 0, 47, 48, 0, 48,
- 0, 47, 24, 0, 47, 25, 0, 24, 0, 25,
- 0, 49, 32, 50, 33, 0, 49, 32, 33, 0,
- 3, 22, 4, 22, 0, 50, 66, 0, 50, 51,
- 0, 50, 52, 0, 66, 0, 51, 0, 52, 0,
- 26, 55, 20, 34, 0, 26, 55, 20, 23, 34,
- 0, 27, 55, 20, 34, 0, 27, 55, 20, 23,
- 34, 0, 28, 53, 20, 20, 20, 32, 24, 20,
- 32, 24, 34, 0, 28, 53, 20, 20, 20, 32,
- 24, 34, 0, 35, 54, 36, 0, 0, 20, 37,
- 54, 0, 20, 0, 56, 0, 5, 56, 0, 57,
- 0, 57, 60, 0, 12, 58, 0, 11, 58, 0,
- 58, 0, 12, 18, 0, 11, 18, 0, 18, 0,
- 17, 0, 16, 0, 20, 0, 59, 20, 0, 22,
- 0, 6, 0, 13, 15, 0, 13, 0, 14, 15,
- 0, 14, 0, 15, 0, 9, 0, 8, 0, 7,
- 0, 38, 60, 0, 38, 0, 0, 26, 0, 27,
- 20, 63, 0, 20, 27, 63, 0, 27, 63, 0,
- 20, 63, 0, 26, 20, 63, 0, 20, 26, 63,
- 0, 26, 63, 0, 63, 0, 20, 35, 64, 36,
- 0, 64, 39, 20, 0, 20, 0, 32, 24, 0,
- 34, 0, 30, 62, 55, 20, 35, 68, 36, 67,
- 65, 0, 29, 27, 55, 20, 35, 68, 36, 67,
- 65, 0, 29, 61, 55, 20, 35, 68, 36, 67,
- 65, 0, 31, 35, 22, 36, 55, 20, 35, 68,
- 36, 67, 32, 24, 0, 26, 55, 20, 35, 68,
- 36, 67, 32, 24, 0, 27, 55, 20, 35, 68,
- 36, 67, 32, 24, 0, 20, 35, 20, 36, 65,
- 0, 19, 74, 0, 19, 32, 24, 0, 40, 41,
- 0, 0, 6, 0, 20, 0, 20, 39, 69, 0,
- 69, 0, 70, 39, 10, 0, 70, 0, 70, 39,
- 71, 0, 71, 0, 55, 20, 0, 55, 20, 23,
- 0, 55, 20, 35, 20, 72, 36, 0, 55, 20,
- 23, 35, 20, 72, 36, 0, 72, 73, 0, 73,
- 0, 20, 0, 42, 74, 0, 43, 74, 0, 42,
- 40, 74, 0, 43, 40, 74, 0, 40, 40, 74,
- 0, 44, 40, 74, 0, 21, 0, 45, 21, 0,
- 20, 0
+static const short yyrhs[] = { 50,
+ 51, 50, 0, 51, 50, 0, 50, 51, 0, 51,
+ 0, 24, 0, 27, 0, 25, 0, 26, 0, 50,
+ 49, 0, 49, 0, 52, 35, 53, 36, 0, 52,
+ 35, 36, 0, 3, 22, 4, 22, 0, 53, 71,
+ 0, 53, 55, 0, 53, 56, 0, 71, 0, 55,
+ 0, 56, 0, 28, 0, 29, 0, 30, 0, 54,
+ 60, 20, 37, 0, 54, 60, 20, 23, 37, 0,
+ 31, 58, 57, 20, 20, 35, 24, 20, 35, 24,
+ 37, 0, 31, 58, 57, 20, 20, 35, 24, 37,
+ 0, 20, 38, 20, 60, 39, 0, 20, 0, 38,
+ 59, 39, 0, 0, 20, 40, 59, 0, 20, 0,
+ 61, 0, 5, 61, 0, 62, 0, 62, 65, 0,
+ 12, 63, 0, 11, 63, 0, 63, 0, 12, 18,
+ 0, 11, 18, 0, 18, 0, 17, 0, 16, 0,
+ 20, 0, 64, 20, 0, 22, 0, 6, 0, 13,
+ 15, 0, 13, 0, 14, 15, 0, 14, 0, 15,
+ 0, 9, 0, 8, 0, 7, 0, 41, 65, 0,
+ 41, 0, 20, 68, 0, 68, 0, 54, 20, 68,
+ 0, 20, 54, 68, 0, 54, 68, 0, 66, 0,
+ 20, 38, 69, 39, 0, 69, 42, 20, 0, 20,
+ 0, 35, 24, 0, 37, 0, 33, 67, 60, 20,
+ 38, 73, 39, 72, 70, 0, 54, 33, 66, 60,
+ 20, 38, 73, 39, 72, 70, 0, 32, 54, 60,
+ 20, 38, 73, 39, 72, 70, 0, 54, 32, 60,
+ 20, 38, 73, 39, 72, 70, 0, 32, 60, 20,
+ 38, 73, 39, 72, 70, 0, 34, 38, 22, 39,
+ 60, 20, 38, 73, 39, 72, 70, 0, 54, 60,
+ 20, 38, 73, 39, 72, 70, 0, 20, 38, 20,
+ 39, 70, 0, 19, 79, 0, 19, 35, 24, 0,
+ 0, 6, 0, 20, 0, 20, 42, 74, 0, 74,
+ 0, 75, 42, 10, 0, 75, 0, 75, 42, 76,
+ 0, 76, 0, 60, 20, 0, 60, 20, 23, 0,
+ 60, 20, 38, 20, 77, 39, 0, 60, 20, 23,
+ 38, 20, 77, 39, 0, 77, 78, 0, 78, 0,
+ 20, 0, 43, 79, 0, 44, 79, 0, 43, 45,
+ 79, 0, 44, 45, 79, 0, 45, 45, 79, 0,
+ 46, 45, 79, 0, 21, 0, 47, 21, 0, 20,
+ 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 197, 198, 199, 200, 203, 207, 211, 215, 221, 226,
- 233, 238, 239, 240, 241, 242, 243, 246, 249, 252,
- 255, 259, 288, 314, 315, 318, 321, 327, 328, 336,
- 340, 347, 350, 353, 356, 359, 362, 365, 368, 371,
- 374, 378, 381, 386, 389, 392, 395, 398, 403, 406,
- 409, 414, 415, 418, 419, 422, 434, 446, 449, 461,
- 473, 485, 488, 493, 498, 501, 506, 507, 511, 521,
- 531, 541, 547, 552, 557, 578, 579, 583, 584, 587,
- 588, 599, 609, 612, 613, 616, 617, 620, 623, 626,
- 634, 644, 645, 648, 661, 665, 669, 673, 677, 681,
- 687, 688, 692
+ 220, 221, 222, 223, 226, 232, 238, 244, 252, 253,
+ 256, 261, 268, 273, 274, 275, 276, 277, 278, 281,
+ 282, 283, 286, 289, 293, 328, 358, 367, 373, 374,
+ 377, 380, 386, 387, 395, 399, 406, 409, 412, 415,
+ 418, 421, 424, 427, 430, 433, 437, 440, 445, 448,
+ 451, 454, 457, 462, 465, 468, 473, 474, 478, 490,
+ 496, 508, 520, 523, 529, 534, 537, 542, 543, 547,
+ 557, 567, 577, 587, 597, 603, 608, 629, 630, 634,
+ 637, 638, 649, 659, 662, 663, 666, 667, 670, 673,
+ 676, 684, 694, 695, 698, 711, 715, 719, 723, 727,
+ 731, 737, 738, 742
};
#endif
static const char * const yytname[] = { "$","error","$undefined.","CLASS",
"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL",
-"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'",
-"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable",
-"argument","argflags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","optpublic","fullsigtype","sigtype","tokenlist","codenocode","method",
-"onerror","funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL
+"ARRAY_DIM","CCODE","HTCODE","PHCODE","HCODE","PUBLIC","PRIVATE","PROTECTED",
+"ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'",
+"'*'","','","'>'","'<'","'='","'!'","'-'","prog","ccode","ccodes","class","classdec",
+"classcode","scope","variable","argument","argtype","argflags","flaglist","type",
+"type1","type2","integer","tspecifier","stars","simplesigtype","fullsigtype",
+"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
+"arg","checklist","check","numtok", NULL
};
#endif
static const short yyr1[] = { 0,
- 46, 46, 46, 46, 47, 47, 47, 47, 48, 48,
- 49, 50, 50, 50, 50, 50, 50, 51, 51, 51,
- 51, 52, 52, 53, 53, 54, 54, 55, 55, 56,
- 56, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 57, 58, 58, 58, 58, 58, 59, 59,
- 59, 60, 60, 61, 61, 62, 62, 62, 62, 62,
- 62, 62, 62, 63, 64, 64, 65, 65, 66, 66,
- 66, 66, 66, 66, 66, 67, 67, 67, 67, 68,
- 68, 68, 68, 69, 69, 70, 70, 71, 71, 71,
- 71, 72, 72, 73, 73, 73, 73, 73, 73, 73,
- 74, 74, 74
+ 48, 48, 48, 48, 49, 49, 49, 49, 50, 50,
+ 51, 51, 52, 53, 53, 53, 53, 53, 53, 54,
+ 54, 54, 55, 55, 56, 56, 57, 57, 58, 58,
+ 59, 59, 60, 60, 61, 61, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 63, 63,
+ 63, 63, 63, 64, 64, 64, 65, 65, 66, 66,
+ 67, 67, 67, 67, 68, 69, 69, 70, 70, 71,
+ 71, 71, 71, 71, 71, 71, 71, 72, 72, 72,
+ 73, 73, 73, 73, 74, 74, 75, 75, 76, 76,
+ 76, 76, 77, 77, 78, 78, 78, 78, 78, 78,
+ 78, 79, 79, 79
};
static const short yyr2[] = { 0,
- 3, 2, 2, 1, 2, 2, 1, 1, 4, 3,
- 4, 2, 2, 2, 1, 1, 1, 4, 5, 4,
- 5, 11, 8, 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, 0, 1, 3, 3, 2, 2, 3,
- 3, 2, 1, 4, 3, 1, 2, 1, 9, 9,
- 9, 12, 9, 9, 5, 2, 3, 2, 0, 1,
- 1, 3, 1, 3, 1, 3, 1, 2, 3, 6,
- 7, 2, 1, 1, 2, 2, 3, 3, 3, 3,
- 1, 2, 1
+ 3, 2, 2, 1, 1, 1, 1, 1, 2, 1,
+ 4, 3, 4, 2, 2, 2, 1, 1, 1, 1,
+ 1, 1, 4, 5, 11, 8, 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, 9,
+ 10, 9, 9, 8, 11, 8, 5, 2, 3, 0,
+ 1, 1, 3, 1, 3, 1, 3, 1, 2, 3,
+ 6, 7, 2, 1, 1, 2, 2, 3, 3, 3,
+ 3, 1, 2, 1
};
static const short yydefact[] = { 0,
- 0, 7, 8, 0, 4, 0, 0, 5, 6, 3,
- 2, 0, 0, 1, 0, 0, 0, 25, 54, 0,
- 0, 10, 0, 16, 17, 15, 11, 0, 0, 43,
- 51, 50, 49, 0, 0, 45, 47, 48, 39, 38,
- 37, 40, 42, 0, 28, 30, 34, 0, 0, 0,
- 0, 55, 0, 0, 0, 0, 0, 0, 63, 0,
- 9, 13, 14, 12, 0, 29, 36, 33, 35, 32,
- 44, 46, 0, 53, 31, 41, 0, 27, 0, 0,
- 0, 0, 0, 0, 0, 0, 59, 0, 62, 0,
- 58, 0, 0, 0, 0, 18, 0, 52, 0, 20,
- 0, 0, 24, 0, 0, 0, 61, 57, 66, 0,
- 60, 56, 0, 0, 0, 68, 75, 19, 43, 40,
- 0, 0, 83, 85, 87, 21, 0, 26, 0, 0,
- 0, 64, 0, 0, 0, 67, 0, 88, 79, 0,
- 79, 0, 0, 0, 65, 0, 0, 82, 89, 0,
- 0, 0, 0, 84, 86, 0, 0, 79, 79, 79,
- 0, 0, 0, 103, 101, 0, 0, 76, 78, 0,
- 0, 0, 23, 0, 0, 0, 0, 0, 94, 0,
- 0, 0, 0, 0, 93, 77, 102, 73, 74, 0,
- 70, 71, 69, 79, 0, 0, 0, 95, 0, 96,
- 0, 90, 92, 0, 0, 91, 99, 97, 98, 100,
- 22, 0, 72, 0, 0, 0
+ 0, 5, 7, 8, 6, 10, 0, 4, 0, 0,
+ 9, 3, 2, 0, 0, 1, 0, 20, 21, 22,
+ 30, 0, 0, 0, 12, 0, 0, 18, 19, 17,
+ 13, 0, 0, 0, 0, 48, 56, 55, 54, 0,
+ 0, 50, 52, 53, 44, 43, 42, 45, 47, 0,
+ 0, 33, 35, 39, 0, 0, 0, 64, 0, 60,
+ 0, 11, 15, 16, 14, 0, 0, 0, 0, 32,
+ 0, 28, 0, 34, 41, 38, 40, 37, 49, 51,
+ 0, 0, 58, 36, 46, 0, 0, 0, 59, 0,
+ 63, 0, 0, 0, 0, 0, 0, 0, 0, 29,
+ 0, 0, 0, 0, 57, 67, 0, 62, 61, 0,
+ 0, 0, 0, 0, 23, 0, 0, 69, 77, 31,
+ 0, 0, 0, 48, 45, 0, 0, 84, 86, 88,
+ 65, 0, 0, 0, 0, 0, 24, 0, 68, 0,
+ 0, 0, 0, 89, 80, 0, 66, 0, 0, 0,
+ 0, 80, 27, 0, 80, 83, 90, 0, 0, 0,
+ 85, 87, 80, 0, 80, 0, 0, 0, 26, 0,
+ 0, 0, 104, 102, 0, 0, 78, 74, 0, 0,
+ 0, 80, 76, 0, 72, 0, 95, 0, 0, 0,
+ 0, 0, 94, 79, 103, 70, 80, 73, 0, 0,
+ 0, 0, 96, 0, 97, 0, 0, 91, 93, 0,
+ 71, 25, 92, 98, 99, 100, 101, 75, 0, 0,
+ 0
};
-static const short yydefgoto[] = { 214,
- 4, 5, 6, 23, 24, 25, 51, 79, 121, 45,
- 46, 47, 48, 75, 54, 58, 59, 110, 117, 26,
- 153, 122, 123, 124, 125, 184, 185, 168
+static const short yydefgoto[] = { 219,
+ 6, 7, 8, 9, 26, 27, 28, 29, 73, 34,
+ 71, 126, 52, 53, 54, 55, 84, 58, 59, 60,
+ 107, 119, 30, 160, 127, 128, 129, 130, 192, 193,
+ 177
};
-static const short yypact[] = { 43,
- 1,-32768,-32768, 56, 28, 39, 72,-32768,-32768, 28,
- 177, 152, 69, 177, 61, 118, 118, 68, 181, 66,
- 84,-32768, 164,-32768,-32768,-32768,-32768, 81, 153,-32768,
--32768,-32768,-32768, 185, 191, 106, 113,-32768,-32768,-32768,
--32768,-32768,-32768, 117,-32768, 101,-32768, 126, 135, 137,
- 143,-32768, 118, 118, 62, 156, 169, 118,-32768, 174,
--32768,-32768,-32768,-32768, 178,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 13, 101,-32768,-32768, 60, 175, 179, 193,
- 196, 197, 183, 199, 199, 200,-32768, 34,-32768, 34,
--32768, 201, 186, 26, 189,-32768, 136,-32768, 190,-32768,
- 136, 137,-32768, 205, 192, 194,-32768,-32768,-32768, 51,
--32768,-32768, 195, 118, 202,-32768,-32768,-32768, 198, 138,
- 208, 203,-32768, 204,-32768,-32768, 206,-32768, 209, 136,
- 136,-32768, 211, 136, 212,-32768, 118, -19, -6, 100,
- -6, 213, 210, 214,-32768, 215, 217,-32768, 218, 216,
- -15, 207, 222,-32768,-32768, 223, -5, -6, -6, -6,
- 136, 220, 35,-32768,-32768, 221, 226,-32768,-32768, 225,
- 232, 227,-32768, 26, 26, 26, 224, 35,-32768, 228,
- -12, 4, 229, 21,-32768,-32768,-32768,-32768,-32768, 233,
--32768,-32768,-32768, -6, 30, 6, 6,-32768, 6,-32768,
- 6,-32768,-32768, 230, 231,-32768,-32768,-32768,-32768,-32768,
--32768, 234,-32768, 235, 238,-32768
+static const short yypact[] = { 21,
+ -12,-32768,-32768,-32768,-32768,-32768, 21, 238, 0, 39,
+-32768, 238, 238, 202, 41, 238, 84,-32768,-32768,-32768,
+ 100, 112, 117, 101,-32768, 217, 53,-32768,-32768,-32768,
+-32768, 74, 81, 123, 203,-32768,-32768,-32768,-32768, 226,
+ 241, 129, 133,-32768,-32768,-32768,-32768,-32768,-32768, 168,
+ 130,-32768, 111,-32768, 149, 1, 151,-32768, 168,-32768,
+ 156,-32768,-32768,-32768,-32768, 168, 167, 169, 157, 165,
+ 174, 188, 187,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 208, 191, 111,-32768,-32768, 204, 223, 237,-32768, -6,
+-32768, 240, 227, 247, -6, 168, 55, 96, 81,-32768,
+ 248, 249, 232, 186,-32768,-32768, -30,-32768,-32768, 233,
+ 168, 234, 253, 239,-32768, 186, 250,-32768,-32768,-32768,
+ 168, 242, 186, 236, 185, 258, 243,-32768, 244,-32768,
+-32768, 259, 186, 260, 186, 246,-32768, 251,-32768, 252,
+ 257, 254, 168, 64, 264, 150,-32768, 255, 261, 256,
+ 186, 264,-32768, -4, 264,-32768, 262, 265, 56, 96,
+-32768,-32768, 264, 186, 264, 263, 96, 266,-32768, 96,
+ 267, 52,-32768,-32768, 268, 275,-32768,-32768, 96, 269,
+ 96, 264,-32768, 273,-32768, 52,-32768, 35, 63, 270,
+ 271, 61,-32768,-32768,-32768,-32768, 264,-32768, 96, 272,
+ 70, 6,-32768, 6,-32768, 6, 6,-32768,-32768, 96,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 288, 289,
+-32768
};
static const short yypgoto[] = {-32768,
- 9, 240,-32768,-32768, 239, 242,-32768, 131, -16, 237,
--32768, 176,-32768, 187,-32768,-32768, -45,-32768, 12, 244,
- -138, -99, 133,-32768, 132, 93, -177, -97
+ 245, 30, 291,-32768,-32768, -20, 277, 278,-32768,-32768,
+ 206, -22, 276,-32768, 71,-32768, 224, 274,-32768, -38,
+-32768, -159, 280, -148, -110, 170,-32768, 164, 126, -113,
+ -53
};
-#define YYLAST 272
-
-
-static const short yytable[] = { 44,
- 49, 127, 156, 149, 164, 165, 203, 164, 165, 87,
- 89, 91, 151, 11, 172, 150, 166, 203, 14, 174,
- 175, 176, 7, 164, 165, 164, 165, 197, 173, 167,
- 143, 144, 167, 152, 146, 95, 81, 82, 107, 108,
- 179, 92, 111, 199, 112, 1, 96, 97, 167, 179,
- 167, 2, 3, 83, 179, 205, 202, 115, 1, 116,
- 180, 177, 181, 182, 183, 206, 2, 3, 86, 180,
- 12, 181, 182, 183, 180, 13, 181, 182, 183, 8,
- 9, 83, 99, 198, 200, 55, 132, 84, 85, 133,
- 27, 56, 57, 100, 101, 28, 86, 135, 207, 208,
- 65, 209, 50, 210, 29, 30, 31, 32, 33, 154,
- 34, 35, 36, 37, 38, 39, 40, 41, 60, 42,
- 71, 43, 29, 30, 31, 32, 33, 72, 34, 35,
- 36, 37, 38, 39, 40, 41, 73, 42, 74, 43,
- 29, 119, 31, 32, 33, 76, 34, 35, 36, 37,
- 38, 39, 40, 41, 77, 120, 78, 43, 30, 31,
- 32, 33, 80, 34, 35, 36, 37, 38, 39, 40,
- 41, 15, 42, -81, 43, 88, 137, 16, 17, 18,
- 19, 20, 21, 15, 22, 191, 192, 193, 90, 16,
- 17, 18, 19, 20, 21, 93, 61, 36, 37, 38,
- 8, 9, 67, 36, 37, 38, 52, 53, 69, 68,
- 70, 102, 104, 94, 103, 105, 106, 86, 83, 109,
- 113, 114, 118, 126, 129, 136, 130, 138, 131, 134,
- 145, 147, 128, -80, 215, 163, 157, 216, 139, 178,
- 142, 141, 140, 10, 186, 158, 187, 169, 188, 159,
- 160, 161, 162, 170, 171, 189, 204, 213, 190, 194,
- 98, 62, 212, 211, 63, 66, 64, 196, 201, 148,
- 195, 155
+#define YYLAST 341
+
+
+static const short yytable[] = { 51,
+ 178, 50, 57, 167, 68, 138, 170, 183, 131, 10,
+ 185, 132, 142, 86, 179, 168, 181, 89, 91, 196,
+ 86, 198, 148, 1, 150, 173, 174, 81, 18, 19,
+ 20, 87, 169, 199, 14, 88, 92, 13, 87, 211,
+ 166, 16, 15, 94, 2, 3, 4, 5, 210, 108,
+ 218, 109, 176, 180, 173, 174, 89, 35, 36, 37,
+ 38, 39, 31, 40, 41, 42, 43, 44, 45, 46,
+ 47, 187, 48, 113, 49, 173, 174, 114, 209, 202,
+ 187, 176, 173, 174, 66, 67, 157, 209, 134, 187,
+ 175, 115, 116, 69, 188, 189, 190, 191, 140, 208,
+ 70, 158, 176, 188, 189, 190, 191, 204, 213, 176,
+ 76, 78, 188, 189, 190, 191, 35, 36, 37, 38,
+ 39, 32, 40, 41, 42, 43, 44, 45, 46, 47,
+ 117, 48, 118, 49, 203, 205, 56, 33, 61, 18,
+ 19, 20, 72, 79, 18, 19, 20, 80, 214, 82,
+ 215, 83, 216, 217, 35, 36, 37, 38, 39, 161,
+ 40, 41, 42, 43, 44, 45, 46, 47, 85, 48,
+ 90, 49, 35, 36, 37, 38, 39, 93, 40, 41,
+ 42, 43, 44, 45, 46, 47, 95, 48, 97, 49,
+ 35, 124, 37, 38, 39, 98, 40, 41, 42, 43,
+ 44, 45, 46, 47, 99, 125, 102, 49, 36, 37,
+ 38, 39, 100, 40, 41, 42, 43, 44, 45, 46,
+ 47, 17, 48, -82, 49, 101, 143, 103, 104, 18,
+ 19, 20, 21, 22, 23, 24, 17, 25, 42, 43,
+ 44, 87, 106, 75, 18, 19, 20, 21, 22, 23,
+ 24, 11, 62, 42, 43, 44, 86, 11, 77, 110,
+ 11, 2, 3, 4, 5, 111, 112, 121, 122, 123,
+ 133, 135, 136, 139, -81, 137, 141, 144, 147, 149,
+ 154, 145, 159, 151, 172, 146, 186, 220, 221, 152,
+ 153, 194, 155, 163, 165, 195, 200, 12, 164, 171,
+ 184, 182, 63, 64, 120, 65, 105, 197, 212, 162,
+ 74, 201, 156, 0, 206, 207, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 96
};
-static const short yycheck[] = { 16,
- 17, 101, 141, 23, 20, 21, 184, 20, 21, 55,
- 56, 57, 19, 5, 20, 35, 32, 195, 10, 158,
- 159, 160, 22, 20, 21, 20, 21, 40, 34, 45,
- 130, 131, 45, 40, 134, 23, 53, 54, 84, 85,
- 20, 58, 88, 40, 90, 3, 34, 35, 45, 20,
- 45, 24, 25, 20, 20, 194, 36, 32, 3, 34,
- 40, 161, 42, 43, 44, 36, 24, 25, 35, 40,
- 32, 42, 43, 44, 40, 4, 42, 43, 44, 24,
- 25, 20, 23, 181, 182, 20, 36, 26, 27, 39,
- 22, 26, 27, 34, 35, 35, 35, 114, 196, 197,
- 20, 199, 35, 201, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 35, 20,
- 15, 22, 5, 6, 7, 8, 9, 15, 11, 12,
- 13, 14, 15, 16, 17, 18, 20, 20, 38, 22,
- 5, 6, 7, 8, 9, 20, 11, 12, 13, 14,
- 15, 16, 17, 18, 20, 20, 20, 22, 6, 7,
- 8, 9, 20, 11, 12, 13, 14, 15, 16, 17,
- 18, 20, 20, 36, 22, 20, 39, 26, 27, 28,
- 29, 30, 31, 20, 33, 174, 175, 176, 20, 26,
- 27, 28, 29, 30, 31, 22, 33, 13, 14, 15,
- 24, 25, 18, 13, 14, 15, 26, 27, 18, 34,
- 35, 37, 20, 36, 36, 20, 20, 35, 20, 20,
- 20, 36, 34, 34, 20, 24, 35, 20, 35, 35,
- 20, 20, 102, 36, 0, 20, 24, 0, 36, 20,
- 32, 36, 39, 4, 24, 36, 21, 41, 24, 36,
- 36, 35, 35, 32, 32, 24, 24, 24, 32, 36,
- 74, 23, 32, 34, 23, 29, 23, 40, 40, 137,
- 178, 140
+static const short yycheck[] = { 22,
+ 160, 22, 23, 152, 27, 116, 155, 167, 39, 22,
+ 170, 42, 123, 20, 163, 20, 165, 56, 57, 179,
+ 20, 181, 133, 3, 135, 20, 21, 50, 28, 29,
+ 30, 38, 37, 182, 35, 56, 59, 8, 38, 199,
+ 151, 12, 4, 66, 24, 25, 26, 27, 197, 88,
+ 210, 90, 47, 164, 20, 21, 95, 5, 6, 7,
+ 8, 9, 22, 11, 12, 13, 14, 15, 16, 17,
+ 18, 20, 20, 96, 22, 20, 21, 23, 192, 45,
+ 20, 47, 20, 21, 32, 33, 23, 201, 111, 20,
+ 35, 37, 38, 20, 43, 44, 45, 46, 121, 39,
+ 20, 38, 47, 43, 44, 45, 46, 45, 39, 47,
+ 40, 41, 43, 44, 45, 46, 5, 6, 7, 8,
+ 9, 38, 11, 12, 13, 14, 15, 16, 17, 18,
+ 35, 20, 37, 22, 188, 189, 20, 38, 38, 28,
+ 29, 30, 20, 15, 28, 29, 30, 15, 202, 20,
+ 204, 41, 206, 207, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 20, 20,
+ 20, 22, 5, 6, 7, 8, 9, 22, 11, 12,
+ 13, 14, 15, 16, 17, 18, 20, 20, 20, 22,
+ 5, 6, 7, 8, 9, 39, 11, 12, 13, 14,
+ 15, 16, 17, 18, 40, 20, 20, 22, 6, 7,
+ 8, 9, 39, 11, 12, 13, 14, 15, 16, 17,
+ 18, 20, 20, 39, 22, 38, 42, 20, 38, 28,
+ 29, 30, 31, 32, 33, 34, 20, 36, 13, 14,
+ 15, 38, 20, 18, 28, 29, 30, 31, 32, 33,
+ 34, 7, 36, 13, 14, 15, 20, 13, 18, 20,
+ 16, 24, 25, 26, 27, 39, 20, 20, 20, 38,
+ 38, 38, 20, 24, 39, 37, 35, 20, 20, 20,
+ 24, 39, 19, 38, 20, 42, 20, 0, 0, 39,
+ 39, 24, 39, 39, 39, 21, 24, 7, 38, 38,
+ 35, 39, 26, 26, 99, 26, 83, 39, 37, 146,
+ 35, 186, 143, -1, 45, 45, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 67
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
switch (yyn) {
case 1:
-#line 197 "parse.y"
+#line 220 "parse.y"
{ ; ;
break;}
case 2:
-#line 198 "parse.y"
+#line 221 "parse.y"
{ ; ;
break;}
case 3:
-#line 199 "parse.y"
+#line 222 "parse.y"
{ ; ;
break;}
case 4:
-#line 200 "parse.y"
+#line 223 "parse.y"
{ ; ;
break;}
case 5:
-#line 203 "parse.y"
+#line 226 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 6:
-#line 207 "parse.y"
+#line 232 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 7:
-#line 211 "parse.y"
+#line 238 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 8:
-#line 215 "parse.y"
+#line 244 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 9:
-#line 221 "parse.y"
+#line 252 "parse.y"
+{ ; ;
+ break;}
+case 10:
+#line 253 "parse.y"
+{ ; ;
+ break;}
+case 11:
+#line 256 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
nodes = g_list_append(nodes,class);
;
break;}
-case 10:
-#line 226 "parse.y"
+case 12:
+#line 261 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
nodes = g_list_append(nodes,class);
;
break;}
-case 11:
-#line 233 "parse.y"
+case 13:
+#line 268 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
-case 12:
-#line 238 "parse.y"
-{ ; ;
- break;}
-case 13:
-#line 239 "parse.y"
-{ ; ;
- break;}
case 14:
-#line 240 "parse.y"
+#line 273 "parse.y"
{ ; ;
break;}
case 15:
-#line 241 "parse.y"
+#line 274 "parse.y"
{ ; ;
break;}
case 16:
-#line 242 "parse.y"
+#line 275 "parse.y"
{ ; ;
break;}
case 17:
-#line 243 "parse.y"
+#line 276 "parse.y"
{ ; ;
break;}
case 18:
-#line 246 "parse.y"
-{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL);
- ;
+#line 277 "parse.y"
+{ ; ;
break;}
case 19:
-#line 249 "parse.y"
-{
- push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
- ;
+#line 278 "parse.y"
+{ ; ;
break;}
case 20:
-#line 252 "parse.y"
+#line 281 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+ break;}
+case 21:
+#line 282 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+ break;}
+case 22:
+#line 283 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+ break;}
+case 23:
+#line 286 "parse.y"
{
- push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL);
+ push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL);
;
break;}
-case 21:
-#line 255 "parse.y"
+case 24:
+#line 289 "parse.y"
{
- push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
- ;
+ push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id);
+ ;
break;}
-case 22:
-#line 259 "parse.y"
+case 25:
+#line 293 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
+ Type *type = pop_type();
g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
- yyvsp[-4].cbuf,yyvsp[-5].line,
- yyvsp[-1].cbuf,yyvsp[-2].line,
+ node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+ (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
+ (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
yyvsp[-10].line);
+ g_string_free(yyvsp[-4].cbuf,FALSE);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp(yyvsp[-6].id,"set")==0 &&
strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
+ Type *type = pop_type();
g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
- yyvsp[-1].cbuf,yyvsp[-2].line,
- yyvsp[-4].cbuf,yyvsp[-5].line,
+ node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+ (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+ (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
yyvsp[-10].line);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
+ g_string_free(yyvsp[-4].cbuf,FALSE);
class_nodes = g_list_append(class_nodes,node);
} else {
g_free(yyvsp[-8].id); g_free(yyvsp[-7].id);
}
;
break;}
-case 23:
-#line 288 "parse.y"
+case 26:
+#line 328 "parse.y"
{
if(strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
+ Type *type = pop_type();
g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
- yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0,
- yyvsp[-7].line);
+ 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,yyvsp[-6].list,yyvsp[-4].id,
- NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line,
- yyvsp[-7].line);
+ 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);
} else {
g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
}
;
break;}
-case 24:
-#line 314 "parse.y"
+case 27:
+#line 358 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"type")!=0) {
+ g_free(yyvsp[-4].id);
+ g_free(yyvsp[-2].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ yyval.id = yyvsp[-4].id;
+ ;
+ break;}
+case 28:
+#line 367 "parse.y"
+{
+ yyval.id = yyvsp[0].id;
+ typestack = g_list_prepend(typestack,NULL);
+ ;
+ break;}
+case 29:
+#line 373 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 25:
-#line 315 "parse.y"
+case 30:
+#line 374 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 26:
-#line 318 "parse.y"
+case 31:
+#line 377 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 27:
-#line 321 "parse.y"
+case 32:
+#line 380 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 28:
-#line 327 "parse.y"
+case 33:
+#line 386 "parse.y"
{ ; ;
break;}
-case 29:
-#line 328 "parse.y"
+case 34:
+#line 387 "parse.y"
{
Type *type = typestack->data;
char *oldname = type->name;
g_free(oldname);
;
break;}
-case 30:
-#line 336 "parse.y"
+case 35:
+#line 395 "parse.y"
{
Node *node = new_type(0,yyvsp[0].id,NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 31:
-#line 340 "parse.y"
+case 36:
+#line 399 "parse.y"
{
Node *node = new_type(stars,yyvsp[-1].id,NULL);
stars = 0;
typestack = g_list_prepend(typestack,node);
;
break;}
-case 32:
-#line 347 "parse.y"
+case 37:
+#line 406 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 33:
-#line 350 "parse.y"
+case 38:
+#line 409 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 34:
-#line 353 "parse.y"
+case 39:
+#line 412 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 35:
-#line 356 "parse.y"
+case 40:
+#line 415 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 36:
-#line 359 "parse.y"
+case 41:
+#line 418 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 37:
-#line 362 "parse.y"
+case 42:
+#line 421 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 38:
-#line 365 "parse.y"
+case 43:
+#line 424 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 39:
-#line 368 "parse.y"
+case 44:
+#line 427 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 40:
-#line 371 "parse.y"
+case 45:
+#line 430 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 41:
-#line 374 "parse.y"
+case 46:
+#line 433 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 42:
-#line 378 "parse.y"
+case 47:
+#line 437 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 43:
-#line 381 "parse.y"
+case 48:
+#line 440 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 44:
-#line 386 "parse.y"
+case 49:
+#line 445 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 45:
-#line 389 "parse.y"
+case 50:
+#line 448 "parse.y"
{
yyval.id = "long";
;
break;}
-case 46:
-#line 392 "parse.y"
+case 51:
+#line 451 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 47:
-#line 395 "parse.y"
+case 52:
+#line 454 "parse.y"
{
yyval.id = "short";
;
break;}
-case 48:
-#line 398 "parse.y"
+case 53:
+#line 457 "parse.y"
{
yyval.id = "int";
;
break;}
-case 49:
-#line 403 "parse.y"
+case 54:
+#line 462 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 50:
-#line 406 "parse.y"
+case 55:
+#line 465 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 51:
-#line 409 "parse.y"
+case 56:
+#line 468 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 52:
-#line 414 "parse.y"
-{ stars++; ;
- break;}
-case 53:
-#line 415 "parse.y"
-{ stars++; ;
- break;}
-case 54:
-#line 418 "parse.y"
-{ ; ;
- break;}
-case 55:
-#line 419 "parse.y"
-{ ; ;
- break;}
-case 56:
-#line 422 "parse.y"
-{
- if(strcmp(yyvsp[-1].id,"first")==0)
- yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
- else if(strcmp(yyvsp[-1].id,"last")==0)
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
- else {
- yyerror(_("signal must be 'first' or 'last'"));
- g_free(yyvsp[-1].id);
- YYERROR;
- }
- g_free(yyvsp[-1].id);
- ;
- break;}
case 57:
-#line 434 "parse.y"
-{
- if(strcmp(yyvsp[-2].id,"first")==0)
- yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
- else if(strcmp(yyvsp[-2].id,"last")==0)
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
- else {
- yyerror(_("signal must be 'first' or 'last'"));
- g_free(yyvsp[-2].id);
- YYERROR;
- }
- g_free(yyvsp[-2].id);
- ;
+#line 473 "parse.y"
+{ stars++; ;
break;}
case 58:
-#line 446 "parse.y"
-{
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
- ;
+#line 474 "parse.y"
+{ stars++; ;
break;}
case 59:
-#line 449 "parse.y"
+#line 478 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
;
break;}
case 60:
-#line 461 "parse.y"
+#line 490 "parse.y"
+{
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ ;
+ break;}
+case 61:
+#line 496 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 61:
-#line 473 "parse.y"
+case 62:
+#line 508 "parse.y"
{
if(strcmp(yyvsp[-2].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-2].id);
;
break;}
-case 62:
-#line 485 "parse.y"
+case 63:
+#line 520 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 63:
-#line 488 "parse.y"
+case 64:
+#line 523 "parse.y"
{
- yyval.sigtype = SIGNAL_LAST_METHOD;
+ /* the_scope was default thus public */
+ the_scope = PUBLIC_SCOPE;
;
break;}
-case 64:
-#line 493 "parse.y"
+case 65:
+#line 529 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 65:
-#line 498 "parse.y"
+case 66:
+#line 534 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 66:
-#line 501 "parse.y"
+case 67:
+#line 537 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 67:
-#line 506 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
- break;}
case 68:
-#line 507 "parse.y"
-{ yyval.cbuf = NULL; ;
+#line 542 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
case 69:
-#line 511 "parse.y"
+#line 543 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 70:
+#line 547 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(yyvsp[-7].sigtype,NULL,
+ push_function(the_scope, yyvsp[-7].sigtype,NULL,
yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
ccode_line,vararg);
;
break;}
-case 70:
-#line 521 "parse.y"
+case 71:
+#line 557 "parse.y"
+{
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
+ "first parameter"));
+ YYERROR;
+ }
+ push_function(the_scope, yyvsp[-7].sigtype,NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ ccode_line,vararg);
+ ;
+ break;}
+case 72:
+#line 567 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
ccode_line,vararg);
;
break;}
-case 71:
-#line 531 "parse.y"
+case 73:
+#line 577 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
ccode_line,vararg);
;
break;}
-case 72:
-#line 541 "parse.y"
+case 74:
+#line 587 "parse.y"
{
- push_function(OVERRIDE_METHOD, yyvsp[-9].id,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,
- yyvsp[-11].line,yyvsp[-1].line,
- vararg);
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
+ "first parameter"));
+ YYERROR;
+ }
+ push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
+ ccode_line,vararg);
;
break;}
-case 73:
-#line 547 "parse.y"
+case 75:
+#line 597 "parse.y"
{
- push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
+ push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,
+ yyvsp[-10].line,ccode_line,
vararg);
- ;
+ ;
break;}
-case 74:
-#line 552 "parse.y"
+case 76:
+#line 603 "parse.y"
{
- push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
+ push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line,
vararg);
;
break;}
-case 75:
-#line 557 "parse.y"
+case 77:
+#line 608 "parse.y"
{
if(strcmp(yyvsp[-4].id,"init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
- push_function(INIT_METHOD, NULL,
+ push_function(NO_SCOPE, INIT_METHOD, NULL,
yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
ccode_line,FALSE);
} else if(strcmp(yyvsp[-4].id,"class_init")==0) {
push_init_arg(yyvsp[-2].id,TRUE);
- push_function(CLASS_INIT_METHOD, NULL,
+ push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
ccode_line,FALSE);
} else {
}
;
break;}
-case 76:
-#line 578 "parse.y"
+case 78:
+#line 629 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 77:
-#line 579 "parse.y"
+case 79:
+#line 630 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 78:
-#line 583 "parse.y"
-{ ; ;
- break;}
-case 79:
-#line 584 "parse.y"
+case 80:
+#line 634 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 80:
-#line 587 "parse.y"
+case 81:
+#line 637 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 81:
-#line 588 "parse.y"
+case 82:
+#line 638 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
}
;
break;}
-case 82:
-#line 599 "parse.y"
+case 83:
+#line 649 "parse.y"
{
has_self = TRUE;
if(strcmp(yyvsp[-2].id,"self")==0)
}
;
break;}
-case 83:
-#line 609 "parse.y"
-{ has_self = FALSE; ;
- break;}
case 84:
-#line 612 "parse.y"
-{ vararg = TRUE; ;
+#line 659 "parse.y"
+{ has_self = FALSE; ;
break;}
case 85:
-#line 613 "parse.y"
-{ vararg = FALSE; ;
+#line 662 "parse.y"
+{ vararg = TRUE; ;
break;}
case 86:
-#line 616 "parse.y"
-{ ; ;
+#line 663 "parse.y"
+{ vararg = FALSE; ;
break;}
case 87:
-#line 617 "parse.y"
+#line 666 "parse.y"
{ ; ;
break;}
case 88:
-#line 620 "parse.y"
+#line 667 "parse.y"
+{ ; ;
+ break;}
+case 89:
+#line 670 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 89:
-#line 623 "parse.y"
+case 90:
+#line 673 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 90:
-#line 626 "parse.y"
+case 91:
+#line 676 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 91:
-#line 634 "parse.y"
+case 92:
+#line 684 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
;
break;}
-case 92:
-#line 644 "parse.y"
-{ ; ;
- break;}
case 93:
-#line 645 "parse.y"
+#line 694 "parse.y"
{ ; ;
break;}
case 94:
-#line 648 "parse.y"
+#line 695 "parse.y"
+{ ; ;
+ break;}
+case 95:
+#line 698 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 95:
-#line 661 "parse.y"
+case 96:
+#line 711 "parse.y"
{
Node *node = new_check(GT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 96:
-#line 665 "parse.y"
+case 97:
+#line 715 "parse.y"
{
Node *node = new_check(LT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 97:
-#line 669 "parse.y"
+case 98:
+#line 719 "parse.y"
{
Node *node = new_check(GE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 98:
-#line 673 "parse.y"
+case 99:
+#line 723 "parse.y"
{
Node *node = new_check(LE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 99:
-#line 677 "parse.y"
+case 100:
+#line 727 "parse.y"
{
Node *node = new_check(EQ_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 100:
-#line 681 "parse.y"
+case 101:
+#line 731 "parse.y"
{
Node *node = new_check(NE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 101:
-#line 687 "parse.y"
+case 102:
+#line 737 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 102:
-#line 688 "parse.y"
+case 103:
+#line 738 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 103:
-#line 692 "parse.y"
+case 104:
+#line 742 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 695 "parse.y"
+#line 745 "parse.y"
projects / gob-dx.git / blobdiff