#define TOKEN 274
#define NUMBER 275
#define TYPETOKEN 276
-#define CCODE 277
-#define HCODE 278
-#define PUBLIC 279
-#define PRIVATE 280
-#define ARGUMENT 281
-#define VIRTUAL 282
-#define SIGNAL 283
-#define OVERRIDE 284
+#define ARRAY_DIM 277
+#define CCODE 278
+#define HCODE 279
+#define PUBLIC 280
+#define PRIVATE 281
+#define PROTECTED 282
+#define ARGUMENT 283
+#define VIRTUAL 284
+#define SIGNAL 285
+#define OVERRIDE 286
#line 21 "parse.y"
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 void
-push_variable(char *name, int scope, int line_no)
+static Type *
+pop_type(void)
{
- Node *var;
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 = pop_type();
+
+ type->postfix = postfix;
var = new_variable(scope,type,name,line_no);
class_nodes = g_list_append(class_nodes, var);
}
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"));
+ 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;
}
static void
-push_funcarg(char *name)
+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;
node = new_funcarg(type,name,checks);
checks = NULL;
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn);
+ type = new_type(1,tn,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));
+ type = new_type(1,g_strdup(((Class *)class)->otype),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 174 "parse.y"
+#line 202 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 198
+#define YYFINAL 219
#define YYFLAG -32768
-#define YYNTBASE 45
+#define YYNTBASE 46
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 77)
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, 43, 2, 2, 2, 2, 2, 2, 34,
- 35, 37, 2, 38, 44, 2, 2, 2, 40, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 33, 42,
- 39, 41, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 44, 2, 2, 2, 2, 2, 2, 36,
+ 37, 39, 2, 40, 45, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 35, 42,
+ 43, 41, 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, 31, 36, 32, 2, 2, 2, 2, 2,
+ 2, 2, 33, 38, 34, 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
+ 27, 28, 29, 30, 31, 32
};
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
0, 4, 7, 10, 12, 15, 18, 20, 22, 27,
- 32, 35, 38, 41, 43, 45, 47, 52, 57, 69,
- 78, 82, 83, 87, 89, 91, 94, 96, 99, 102,
- 105, 107, 110, 113, 115, 117, 119, 121, 124, 126,
- 128, 131, 133, 136, 138, 140, 142, 144, 146, 149,
- 151, 155, 159, 162, 165, 167, 172, 176, 178, 181,
- 183, 193, 203, 212, 225, 235, 245, 251, 254, 258,
- 261, 262, 264, 266, 270, 272, 276, 278, 282, 284,
- 287, 294, 297, 299, 301, 304, 307, 311, 315, 319,
- 323, 325, 328
+ 31, 36, 39, 42, 45, 47, 49, 51, 53, 55,
+ 57, 62, 68, 80, 89, 95, 97, 101, 102, 106,
+ 108, 110, 113, 115, 118, 121, 124, 126, 129, 132,
+ 134, 136, 138, 140, 143, 145, 147, 150, 152, 155,
+ 157, 159, 161, 163, 165, 168, 170, 173, 175, 179,
+ 183, 186, 188, 193, 197, 199, 202, 204, 214, 225,
+ 235, 245, 254, 266, 275, 281, 284, 288, 289, 291,
+ 293, 297, 299, 303, 305, 309, 311, 314, 318, 325,
+ 333, 336, 338, 340, 343, 346, 350, 354, 358, 362,
+ 364, 367
};
-static const short yyrhs[] = { 46,
- 47, 46, 0, 47, 46, 0, 46, 47, 0, 47,
- 0, 46, 23, 0, 46, 24, 0, 23, 0, 24,
- 0, 48, 31, 49, 32, 0, 3, 22, 4, 22,
- 0, 49, 64, 0, 49, 50, 0, 49, 51, 0,
- 64, 0, 50, 0, 51, 0, 25, 54, 20, 33,
- 0, 26, 54, 20, 33, 0, 27, 52, 20, 20,
- 20, 31, 23, 20, 31, 23, 33, 0, 27, 52,
- 20, 20, 20, 31, 23, 33, 0, 34, 53, 35,
- 0, 0, 20, 36, 53, 0, 20, 0, 55, 0,
- 5, 55, 0, 56, 0, 56, 59, 0, 12, 57,
- 0, 11, 57, 0, 57, 0, 12, 18, 0, 11,
- 18, 0, 18, 0, 17, 0, 16, 0, 20, 0,
- 58, 20, 0, 22, 0, 6, 0, 13, 15, 0,
- 13, 0, 14, 15, 0, 14, 0, 15, 0, 9,
- 0, 8, 0, 7, 0, 37, 59, 0, 37, 0,
- 26, 20, 61, 0, 20, 26, 61, 0, 26, 61,
- 0, 20, 61, 0, 61, 0, 20, 34, 62, 35,
- 0, 62, 38, 20, 0, 20, 0, 31, 23, 0,
- 33, 0, 29, 60, 54, 20, 34, 66, 35, 65,
- 63, 0, 28, 26, 54, 20, 34, 66, 35, 65,
- 63, 0, 28, 54, 20, 34, 66, 35, 65, 63,
- 0, 30, 34, 22, 35, 54, 20, 34, 66, 35,
- 65, 31, 23, 0, 25, 54, 20, 34, 66, 35,
- 65, 31, 23, 0, 26, 54, 20, 34, 66, 35,
- 65, 31, 23, 0, 20, 34, 20, 35, 63, 0,
- 19, 72, 0, 19, 31, 23, 0, 39, 40, 0,
- 0, 6, 0, 20, 0, 20, 38, 67, 0, 67,
- 0, 68, 38, 10, 0, 68, 0, 68, 38, 69,
- 0, 69, 0, 54, 20, 0, 54, 20, 34, 20,
- 70, 35, 0, 70, 71, 0, 71, 0, 20, 0,
- 41, 72, 0, 42, 72, 0, 41, 39, 72, 0,
- 42, 39, 72, 0, 39, 39, 72, 0, 43, 39,
- 72, 0, 21, 0, 44, 21, 0, 20, 0
+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, 33, 50, 34, 0, 49, 33, 34, 0,
+ 3, 22, 4, 22, 0, 50, 68, 0, 50, 52,
+ 0, 50, 53, 0, 68, 0, 52, 0, 53, 0,
+ 26, 0, 27, 0, 28, 0, 51, 57, 20, 35,
+ 0, 51, 57, 20, 23, 35, 0, 29, 55, 54,
+ 20, 20, 33, 24, 20, 33, 24, 35, 0, 29,
+ 55, 54, 20, 20, 33, 24, 35, 0, 20, 36,
+ 20, 57, 37, 0, 20, 0, 36, 56, 37, 0,
+ 0, 20, 38, 56, 0, 20, 0, 58, 0, 5,
+ 58, 0, 59, 0, 59, 62, 0, 12, 60, 0,
+ 11, 60, 0, 60, 0, 12, 18, 0, 11, 18,
+ 0, 18, 0, 17, 0, 16, 0, 20, 0, 61,
+ 20, 0, 22, 0, 6, 0, 13, 15, 0, 13,
+ 0, 14, 15, 0, 14, 0, 15, 0, 9, 0,
+ 8, 0, 7, 0, 39, 62, 0, 39, 0, 20,
+ 65, 0, 65, 0, 51, 20, 65, 0, 20, 51,
+ 65, 0, 51, 65, 0, 63, 0, 20, 36, 66,
+ 37, 0, 66, 40, 20, 0, 20, 0, 33, 24,
+ 0, 35, 0, 31, 64, 57, 20, 36, 70, 37,
+ 69, 67, 0, 51, 31, 63, 57, 20, 36, 70,
+ 37, 69, 67, 0, 30, 51, 57, 20, 36, 70,
+ 37, 69, 67, 0, 51, 30, 57, 20, 36, 70,
+ 37, 69, 67, 0, 30, 57, 20, 36, 70, 37,
+ 69, 67, 0, 32, 36, 22, 37, 57, 20, 36,
+ 70, 37, 69, 67, 0, 51, 57, 20, 36, 70,
+ 37, 69, 67, 0, 20, 36, 20, 37, 67, 0,
+ 19, 76, 0, 19, 33, 24, 0, 0, 6, 0,
+ 20, 0, 20, 40, 71, 0, 71, 0, 72, 40,
+ 10, 0, 72, 0, 72, 40, 73, 0, 73, 0,
+ 57, 20, 0, 57, 20, 23, 0, 57, 20, 36,
+ 20, 74, 37, 0, 57, 20, 23, 36, 20, 74,
+ 37, 0, 74, 75, 0, 75, 0, 20, 0, 41,
+ 76, 0, 42, 76, 0, 41, 43, 76, 0, 42,
+ 43, 76, 0, 43, 43, 76, 0, 44, 43, 76,
+ 0, 21, 0, 45, 21, 0, 20, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 193, 194, 195, 196, 199, 203, 207, 211, 217, 224,
- 229, 230, 231, 232, 233, 234, 237, 240, 244, 273,
- 299, 300, 303, 306, 312, 313, 321, 325, 332, 335,
- 338, 341, 344, 347, 350, 353, 356, 359, 363, 366,
- 371, 374, 377, 380, 383, 388, 391, 394, 399, 400,
- 403, 415, 427, 430, 442, 447, 452, 455, 460, 461,
- 465, 475, 485, 495, 501, 506, 511, 532, 533, 537,
- 538, 541, 542, 553, 563, 566, 567, 570, 571, 574,
- 577, 587, 588, 591, 604, 608, 612, 616, 620, 624,
- 630, 631, 635
+ 221, 222, 223, 224, 227, 233, 238, 244, 251, 256,
+ 263, 268, 269, 270, 271, 272, 273, 276, 277, 278,
+ 281, 284, 288, 323, 353, 362, 368, 369, 372, 375,
+ 381, 382, 390, 394, 401, 404, 407, 410, 413, 416,
+ 419, 422, 425, 428, 432, 435, 440, 443, 446, 449,
+ 452, 457, 460, 463, 468, 469, 473, 485, 491, 503,
+ 515, 518, 524, 529, 532, 537, 538, 542, 552, 562,
+ 572, 582, 592, 598, 603, 624, 625, 629, 632, 633,
+ 644, 654, 657, 658, 661, 662, 665, 668, 671, 679,
+ 689, 690, 693, 706, 710, 714, 718, 722, 726, 732,
+ 733, 737
};
#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",
-"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
-"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
-"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
-"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype",
-"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
-"arg","checklist","check","numtok", NULL
+"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","PROTECTED","ARGUMENT","VIRTUAL",
+"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'",
+"'='","'!'","'-'","prog","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,
- 45, 45, 45, 45, 46, 46, 46, 46, 47, 48,
- 49, 49, 49, 49, 49, 49, 50, 50, 51, 51,
+ 46, 46, 46, 46, 47, 47, 47, 47, 48, 48,
+ 49, 50, 50, 50, 50, 50, 50, 51, 51, 51,
52, 52, 53, 53, 54, 54, 55, 55, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 57, 57, 57, 57, 57, 58, 58, 58, 59, 59,
- 60, 60, 60, 60, 60, 61, 62, 62, 63, 63,
- 64, 64, 64, 64, 64, 64, 64, 65, 65, 65,
- 65, 66, 66, 66, 66, 67, 67, 68, 68, 69,
- 69, 70, 70, 71, 71, 71, 71, 71, 71, 71,
- 72, 72, 72
+ 57, 57, 58, 58, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 60, 60, 60, 60,
+ 60, 61, 61, 61, 62, 62, 63, 63, 64, 64,
+ 64, 64, 65, 66, 66, 67, 67, 68, 68, 68,
+ 68, 68, 68, 68, 68, 69, 69, 69, 70, 70,
+ 70, 70, 71, 71, 72, 72, 73, 73, 73, 73,
+ 74, 74, 75, 75, 75, 75, 75, 75, 75, 76,
+ 76, 76
};
static const short yyr2[] = { 0,
- 3, 2, 2, 1, 2, 2, 1, 1, 4, 4,
- 2, 2, 2, 1, 1, 1, 4, 4, 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,
- 3, 3, 2, 2, 1, 4, 3, 1, 2, 1,
- 9, 9, 8, 12, 9, 9, 5, 2, 3, 2,
- 0, 1, 1, 3, 1, 3, 1, 3, 1, 2,
- 6, 2, 1, 1, 2, 2, 3, 3, 3, 3,
- 1, 2, 1
+ 3, 2, 2, 1, 2, 2, 1, 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, 22, 0, 0,
- 0, 0, 15, 16, 14, 10, 0, 0, 40, 48,
- 47, 46, 0, 0, 42, 44, 45, 36, 35, 34,
- 37, 39, 0, 25, 27, 31, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 55, 0, 9, 12, 13,
- 11, 0, 26, 33, 30, 32, 29, 41, 43, 0,
- 50, 28, 38, 0, 24, 0, 0, 0, 0, 0,
- 0, 0, 54, 0, 53, 0, 0, 0, 17, 0,
- 49, 18, 0, 0, 21, 0, 0, 0, 52, 58,
- 0, 51, 0, 0, 0, 60, 67, 40, 37, 0,
- 0, 75, 77, 79, 0, 23, 0, 0, 0, 56,
- 0, 0, 0, 59, 0, 80, 71, 0, 71, 0,
- 0, 71, 57, 0, 0, 74, 0, 0, 0, 0,
- 76, 78, 0, 0, 71, 0, 71, 0, 0, 93,
- 91, 0, 0, 68, 70, 0, 0, 0, 20, 0,
- 63, 0, 0, 84, 0, 0, 0, 0, 0, 83,
- 69, 92, 65, 66, 0, 62, 61, 71, 0, 0,
- 85, 0, 86, 0, 81, 82, 0, 0, 89, 87,
- 88, 90, 19, 0, 64, 0, 0, 0
+ 2, 0, 0, 1, 0, 18, 19, 20, 28, 0,
+ 0, 0, 10, 0, 0, 16, 17, 15, 11, 0,
+ 0, 0, 0, 46, 54, 53, 52, 0, 0, 48,
+ 50, 51, 42, 41, 40, 43, 45, 0, 0, 31,
+ 33, 37, 0, 0, 0, 62, 0, 58, 0, 9,
+ 13, 14, 12, 0, 0, 0, 0, 30, 0, 26,
+ 0, 32, 39, 36, 38, 35, 47, 49, 0, 0,
+ 56, 34, 44, 0, 0, 0, 57, 0, 61, 0,
+ 0, 0, 0, 0, 0, 0, 0, 27, 0, 0,
+ 0, 0, 55, 65, 0, 60, 59, 0, 0, 0,
+ 0, 0, 21, 0, 0, 67, 75, 29, 0, 0,
+ 0, 46, 43, 0, 0, 82, 84, 86, 63, 0,
+ 0, 0, 0, 0, 22, 0, 66, 0, 0, 0,
+ 0, 87, 78, 0, 64, 0, 0, 0, 0, 78,
+ 25, 0, 78, 81, 88, 0, 0, 0, 83, 85,
+ 78, 0, 78, 0, 0, 0, 24, 0, 0, 0,
+ 102, 100, 0, 0, 76, 72, 0, 0, 0, 78,
+ 74, 0, 70, 0, 93, 0, 0, 0, 0, 0,
+ 92, 77, 101, 68, 78, 71, 0, 0, 0, 0,
+ 94, 0, 95, 0, 0, 89, 91, 0, 69, 23,
+ 90, 96, 97, 98, 99, 73, 0, 0, 0
};
-static const short yydefgoto[] = { 196,
- 4, 5, 6, 22, 23, 24, 50, 76, 110, 44,
- 45, 46, 47, 72, 55, 56, 101, 107, 25, 140,
- 111, 112, 113, 114, 169, 170, 154
+static const short yydefgoto[] = { 217,
+ 4, 5, 6, 24, 25, 26, 27, 71, 32, 69,
+ 124, 50, 51, 52, 53, 82, 56, 57, 58, 105,
+ 117, 28, 158, 125, 126, 127, 128, 190, 191, 175
};
-static const short yypact[] = { 21,
- -18,-32768,-32768, 68, 66, 20, 54,-32768,-32768, 66,
- 155, 171, 0, 155, 48, 116, 116, 52, 61, -14,
- 59, 160,-32768,-32768,-32768,-32768, 29, 151,-32768,-32768,
--32768,-32768, 81, 189, 111, 120,-32768,-32768,-32768,-32768,
--32768,-32768, 117,-32768, 64,-32768, 124, 133, 135, 152,
- 116, 154, 150, 163, 116,-32768, 186,-32768,-32768,-32768,
--32768, 158,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 148,
- 64,-32768,-32768, 161, 173, 175, 191, 192, 179, 180,
- 195, 196,-32768, 28,-32768, 197, 183, 86,-32768, 134,
--32768,-32768, 134, 135,-32768, 199, 187, 134,-32768,-32768,
- -22,-32768, 188, 116, 200,-32768,-32768, 185, 18, 204,
- 190,-32768, 193,-32768, 194,-32768, 201, 134, 198,-32768,
- 206, 134, 207,-32768, 116, 202, 41, 98, 41, 205,
- 203, 41,-32768, 208, 210,-32768, 214, -6, 209, 211,
--32768,-32768, 215, 26, 41, 86, 41, 134, 22,-32768,
--32768, 212, 216,-32768,-32768, 217, 218, 219,-32768, 86,
--32768, 86, 213,-32768, 220, -3, 8, 221, -9,-32768,
--32768,-32768,-32768,-32768, 222,-32768,-32768, 41, -1, -1,
--32768, -1,-32768, -1,-32768,-32768, 223, 224,-32768,-32768,
--32768,-32768,-32768, 228,-32768, 230, 239,-32768
+static const short yypact[] = { 69,
+ -13,-32768,-32768, 73, 89, -19, 17,-32768,-32768, 89,
+ 125, 216, 11, 125, 6,-32768,-32768,-32768, 46, 115,
+ 120, 50,-32768, 229, 53,-32768,-32768,-32768,-32768, 68,
+ 76, 81, 206,-32768,-32768,-32768,-32768, 251, 257, 92,
+ 110,-32768,-32768,-32768,-32768,-32768,-32768, 171, 131,-32768,
+ 114,-32768, 135, 205, 152,-32768, 171,-32768, 159,-32768,
+-32768,-32768,-32768, 171, 154, 170, 155, 161, 173, 172,
+ 196,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 207, 193,
+ 114,-32768,-32768, 194, 214, 215,-32768, -10,-32768, 217,
+ 201, 219, -10, 171, 56, 101, 76,-32768, 220, 231,
+ 218, 189,-32768,-32768, -5,-32768,-32768, 226, 171, 232,
+ 233, 238,-32768, 189, 228,-32768,-32768,-32768, 171, 234,
+ 189, 237, 16, 256, 240,-32768, 239,-32768,-32768, 258,
+ 189, 260, 189, 245,-32768, 246,-32768, 247, 261, 249,
+ 171, -7, 263, 153,-32768, 250, 252, 253, 189, 263,
+-32768, -8, 263,-32768, 255, 269, 10, 101,-32768,-32768,
+ 263, 189, 263, 259, 101, 262,-32768, 101, 272, 4,
+-32768,-32768, 270, 276,-32768,-32768, 101, 264, 101, 263,
+-32768, 274,-32768, 4,-32768, 57, 60, 265, 266, 67,
+-32768,-32768,-32768,-32768, 263,-32768, 101, 267, 75, 18,
+-32768, 18,-32768, 18, 18,-32768,-32768, 101,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 293, 299,-32768
};
static const short yypgoto[] = {-32768,
- 45, 243,-32768,-32768, 231, 232,-32768, 164, -16, 229,
--32768, 172,-32768, 181,-32768, -44,-32768, 15, 240, -124,
- -91, 136,-32768, 137,-32768, 94, -82
+ 80, 296,-32768,-32768, -18, 279, 280,-32768,-32768, 208,
+ -20, 273,-32768, 106,-32768, 230, 242,-32768, -36,-32768,
+ -157, 286, -146, -108, 174,-32768, 168, 129, -84, -48
};
-#define YYLAST 265
-
-
-static const short yytable[] = { 43,
- 48, 115, 52, 7, 143, 53, 119, 146, 83, 85,
- 164, 54, 120, 150, 151, 121, 150, 151, 150, 151,
- 160, 26, 162, 1, 152, 185, 131, 150, 151, 165,
- 134, 166, 167, 168, 78, 180, 99, 153, 86, 102,
- 153, 164, 153, 2, 3, 158, 182, 80, 62, 11,
- 12, 153, -73, 188, 14, 125, 163, 13, 159, 138,
- 165, 82, 166, 167, 168, 28, 29, 30, 31, 32,
- 1, 33, 34, 35, 36, 37, 38, 39, 40, 139,
- 41, 27, 42, 181, 183, 49, 51, 123, 2, 3,
- 8, 9, 57, 35, 36, 37, 189, 190, 64, 191,
- 71, 192, 28, 29, 30, 31, 32, 141, 33, 34,
- 35, 36, 37, 38, 39, 40, 105, 41, 106, 42,
- 28, 29, 30, 31, 32, 68, 33, 34, 35, 36,
- 37, 38, 39, 40, 69, 41, 70, 42, 28, 108,
- 30, 31, 32, 73, 33, 34, 35, 36, 37, 38,
- 39, 40, 74, 109, 75, 42, 29, 30, 31, 32,
- 161, 33, 34, 35, 36, 37, 38, 39, 40, 80,
- 41, 77, 42, 79, 176, 81, 177, 8, 9, 15,
- 89, 90, 84, 82, 16, 17, 18, 19, 20, 21,
- 15, 58, 88, 92, 93, 16, 17, 18, 19, 20,
- 21, 35, 36, 37, 65, 67, 66, 87, 94, 95,
- 96, 97, 98, 82, 80, 100, 103, 104, 117, -72,
- 118, 122, 124, 126, 127, 133, 135, 144, 129, 197,
- 128, 130, 132, 149, 171, 137, 172, 145, 198, 173,
- 174, 156, 147, 148, 187, 157, 10, 178, 155, 175,
- 195, 91, 59, 60, 194, 193, 63, 116, 179, 184,
- 136, 61, 186, 0, 142
+#define YYLAST 315
+
+
+static const short yytable[] = { 49,
+ 176, 48, 55, 165, 66, 136, 168, 181, 7, 84,
+ 183, 166, 140, 12, 177, 155, 179, 87, 89, 194,
+ 13, 196, 146, 185, 148, 85, 167, 79, 156, 171,
+ 172, 129, 29, 197, 130, 86, 90, 171, 172, 209,
+ 164, 30, 173, 92, 186, 187, 188, 189, 208, 106,
+ 216, 107, -80, 178, 174, 141, 87, 33, 34, 35,
+ 36, 37, 174, 38, 39, 40, 41, 42, 43, 44,
+ 45, 1, 46, 111, 47, 1, 171, 172, 112, 171,
+ 172, 31, 64, 65, 11, 59, 185, 67, 132, 14,
+ 113, 114, 2, 3, 185, 68, 8, 9, 138, 200,
+ 70, 174, 202, 206, 174, 207, 77, 186, 187, 188,
+ 189, 211, 2, 3, 207, 186, 187, 188, 189, 33,
+ 34, 35, 36, 37, 78, 38, 39, 40, 41, 42,
+ 43, 44, 45, 115, 46, 116, 47, 201, 203, 54,
+ 16, 17, 18, 74, 76, 16, 17, 18, 8, 9,
+ 80, 212, 81, 213, 83, 214, 215, 33, 34, 35,
+ 36, 37, 159, 38, 39, 40, 41, 42, 43, 44,
+ 45, 88, 46, 93, 47, 33, 34, 35, 36, 37,
+ 91, 38, 39, 40, 41, 42, 43, 44, 45, 95,
+ 46, 96, 47, 33, 122, 35, 36, 37, 97, 38,
+ 39, 40, 41, 42, 43, 44, 45, 99, 123, 98,
+ 47, 34, 35, 36, 37, 100, 38, 39, 40, 41,
+ 42, 43, 44, 45, 84, 46, 101, 47, 102, 85,
+ 16, 17, 18, 104, 84, 15, 108, 109, 110, 119,
+ 85, 16, 17, 18, 19, 20, 21, 22, 15, 23,
+ 120, 137, 134, 121, 16, 17, 18, 19, 20, 21,
+ 22, 131, 60, 40, 41, 42, 139, 133, 73, 40,
+ 41, 42, 135, -79, 75, 142, 143, 145, 144, 147,
+ 149, 157, 150, 151, 152, 153, 161, 162, 170, 163,
+ 169, 184, 218, 192, 182, 180, 193, 198, 219, 10,
+ 195, 210, 61, 62, 118, 72, 94, 204, 205, 63,
+ 103, 160, 199, 0, 154
};
-static const short yycheck[] = { 16,
- 17, 93, 19, 22, 129, 20, 98, 132, 53, 54,
- 20, 26, 35, 20, 21, 38, 20, 21, 20, 21,
- 145, 22, 147, 3, 31, 35, 118, 20, 21, 39,
- 122, 41, 42, 43, 51, 39, 81, 44, 55, 84,
- 44, 20, 44, 23, 24, 20, 39, 20, 20, 5,
- 31, 44, 35, 178, 10, 38, 148, 4, 33, 19,
- 39, 34, 41, 42, 43, 5, 6, 7, 8, 9,
- 3, 11, 12, 13, 14, 15, 16, 17, 18, 39,
- 20, 34, 22, 166, 167, 34, 26, 104, 23, 24,
- 23, 24, 34, 13, 14, 15, 179, 180, 18, 182,
- 37, 184, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 31, 20, 33, 22,
- 5, 6, 7, 8, 9, 15, 11, 12, 13, 14,
- 15, 16, 17, 18, 15, 20, 20, 22, 5, 6,
- 7, 8, 9, 20, 11, 12, 13, 14, 15, 16,
- 17, 18, 20, 20, 20, 22, 6, 7, 8, 9,
- 146, 11, 12, 13, 14, 15, 16, 17, 18, 20,
- 20, 20, 22, 20, 160, 26, 162, 23, 24, 20,
- 33, 34, 20, 34, 25, 26, 27, 28, 29, 30,
- 20, 32, 35, 33, 34, 25, 26, 27, 28, 29,
- 30, 13, 14, 15, 33, 34, 18, 22, 36, 35,
- 20, 20, 34, 34, 20, 20, 20, 35, 20, 35,
- 34, 34, 23, 20, 35, 20, 20, 23, 35, 0,
- 38, 31, 35, 20, 23, 34, 21, 35, 0, 23,
- 23, 31, 35, 34, 23, 31, 4, 35, 40, 31,
- 23, 71, 22, 22, 31, 33, 28, 94, 39, 39,
- 125, 22, 169, -1, 128
+static const short yycheck[] = { 20,
+ 158, 20, 21, 150, 25, 114, 153, 165, 22, 20,
+ 168, 20, 121, 33, 161, 23, 163, 54, 55, 177,
+ 4, 179, 131, 20, 133, 36, 35, 48, 36, 20,
+ 21, 37, 22, 180, 40, 54, 57, 20, 21, 197,
+ 149, 36, 33, 64, 41, 42, 43, 44, 195, 86,
+ 208, 88, 37, 162, 45, 40, 93, 5, 6, 7,
+ 8, 9, 45, 11, 12, 13, 14, 15, 16, 17,
+ 18, 3, 20, 94, 22, 3, 20, 21, 23, 20,
+ 21, 36, 30, 31, 5, 36, 20, 20, 109, 10,
+ 35, 36, 24, 25, 20, 20, 24, 25, 119, 43,
+ 20, 45, 43, 37, 45, 190, 15, 41, 42, 43,
+ 44, 37, 24, 25, 199, 41, 42, 43, 44, 5,
+ 6, 7, 8, 9, 15, 11, 12, 13, 14, 15,
+ 16, 17, 18, 33, 20, 35, 22, 186, 187, 20,
+ 26, 27, 28, 38, 39, 26, 27, 28, 24, 25,
+ 20, 200, 39, 202, 20, 204, 205, 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, 37, 22, 5, 6, 7, 8, 9, 38, 11,
+ 12, 13, 14, 15, 16, 17, 18, 36, 20, 37,
+ 22, 6, 7, 8, 9, 20, 11, 12, 13, 14,
+ 15, 16, 17, 18, 20, 20, 20, 22, 36, 36,
+ 26, 27, 28, 20, 20, 20, 20, 37, 20, 20,
+ 36, 26, 27, 28, 29, 30, 31, 32, 20, 34,
+ 20, 24, 20, 36, 26, 27, 28, 29, 30, 31,
+ 32, 36, 34, 13, 14, 15, 33, 36, 18, 13,
+ 14, 15, 35, 37, 18, 20, 37, 20, 40, 20,
+ 36, 19, 37, 37, 24, 37, 37, 36, 20, 37,
+ 36, 20, 0, 24, 33, 37, 21, 24, 0, 4,
+ 37, 35, 24, 24, 97, 33, 65, 43, 43, 24,
+ 81, 144, 184, -1, 141
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
switch (yyn) {
case 1:
-#line 193 "parse.y"
+#line 221 "parse.y"
{ ; ;
break;}
case 2:
-#line 194 "parse.y"
+#line 222 "parse.y"
{ ; ;
break;}
case 3:
-#line 195 "parse.y"
+#line 223 "parse.y"
{ ; ;
break;}
case 4:
-#line 196 "parse.y"
+#line 224 "parse.y"
{ ; ;
break;}
case 5:
-#line 199 "parse.y"
+#line 227 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 6:
-#line 203 "parse.y"
+#line 233 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 7:
-#line 207 "parse.y"
+#line 238 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 8:
-#line 211 "parse.y"
+#line 244 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+ Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 9:
-#line 217 "parse.y"
+#line 251 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 224 "parse.y"
+#line 256 "parse.y"
{
- class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+ ((Class *)class)->nodes = NULL;
+ class_nodes = NULL;
+ nodes = g_list_append(nodes,class);
;
break;}
case 11:
-#line 229 "parse.y"
-{ ; ;
+#line 263 "parse.y"
+{
+ class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+ ;
break;}
case 12:
-#line 230 "parse.y"
+#line 268 "parse.y"
{ ; ;
break;}
case 13:
-#line 231 "parse.y"
+#line 269 "parse.y"
{ ; ;
break;}
case 14:
-#line 232 "parse.y"
+#line 270 "parse.y"
{ ; ;
break;}
case 15:
-#line 233 "parse.y"
+#line 271 "parse.y"
{ ; ;
break;}
case 16:
-#line 234 "parse.y"
+#line 272 "parse.y"
{ ; ;
break;}
case 17:
-#line 237 "parse.y"
+#line 273 "parse.y"
+{ ; ;
+ break;}
+case 18:
+#line 276 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+ break;}
+case 19:
+#line 277 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+ break;}
+case 20:
+#line 278 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+ break;}
+case 21:
+#line 281 "parse.y"
{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line);
+ push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL);
;
break;}
-case 18:
-#line 240 "parse.y"
+case 22:
+#line 284 "parse.y"
{
- push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line);
+ push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id);
;
break;}
-case 19:
-#line 244 "parse.y"
+case 23:
+#line 288 "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 20:
-#line 273 "parse.y"
+case 24:
+#line 323 "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 21:
-#line 299 "parse.y"
+case 25:
+#line 353 "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 26:
+#line 362 "parse.y"
+{
+ yyval.id = yyvsp[0].id;
+ typestack = g_list_prepend(typestack,NULL);
+ ;
+ break;}
+case 27:
+#line 368 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 22:
-#line 300 "parse.y"
+case 28:
+#line 369 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 23:
-#line 303 "parse.y"
+case 29:
+#line 372 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 24:
-#line 306 "parse.y"
+case 30:
+#line 375 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 25:
-#line 312 "parse.y"
+case 31:
+#line 381 "parse.y"
{ ; ;
break;}
-case 26:
-#line 313 "parse.y"
+case 32:
+#line 382 "parse.y"
{
Type *type = typestack->data;
char *oldname = type->name;
g_free(oldname);
;
break;}
-case 27:
-#line 321 "parse.y"
+case 33:
+#line 390 "parse.y"
{
- Node *node = new_type(0,yyvsp[0].id);
+ Node *node = new_type(0,yyvsp[0].id,NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 28:
-#line 325 "parse.y"
+case 34:
+#line 394 "parse.y"
{
- Node *node = new_type(stars,yyvsp[-1].id);
+ Node *node = new_type(stars,yyvsp[-1].id,NULL);
stars = 0;
typestack = g_list_prepend(typestack,node);
;
break;}
-case 29:
-#line 332 "parse.y"
+case 35:
+#line 401 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 30:
-#line 335 "parse.y"
+case 36:
+#line 404 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 31:
-#line 338 "parse.y"
+case 37:
+#line 407 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 32:
-#line 341 "parse.y"
+case 38:
+#line 410 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 33:
-#line 344 "parse.y"
+case 39:
+#line 413 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 34:
-#line 347 "parse.y"
+case 40:
+#line 416 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 35:
-#line 350 "parse.y"
+case 41:
+#line 419 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 36:
-#line 353 "parse.y"
+case 42:
+#line 422 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 37:
-#line 356 "parse.y"
+case 43:
+#line 425 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 38:
-#line 359 "parse.y"
+case 44:
+#line 428 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 39:
-#line 363 "parse.y"
+case 45:
+#line 432 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 40:
-#line 366 "parse.y"
+case 46:
+#line 435 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 41:
-#line 371 "parse.y"
+case 47:
+#line 440 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 42:
-#line 374 "parse.y"
+case 48:
+#line 443 "parse.y"
{
yyval.id = "long";
;
break;}
-case 43:
-#line 377 "parse.y"
+case 49:
+#line 446 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 44:
-#line 380 "parse.y"
+case 50:
+#line 449 "parse.y"
{
yyval.id = "short";
;
break;}
-case 45:
-#line 383 "parse.y"
+case 51:
+#line 452 "parse.y"
{
yyval.id = "int";
;
break;}
-case 46:
-#line 388 "parse.y"
+case 52:
+#line 457 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 47:
-#line 391 "parse.y"
+case 53:
+#line 460 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 48:
-#line 394 "parse.y"
+case 54:
+#line 463 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 49:
-#line 399 "parse.y"
+case 55:
+#line 468 "parse.y"
{ stars++; ;
break;}
-case 50:
-#line 400 "parse.y"
+case 56:
+#line 469 "parse.y"
{ stars++; ;
break;}
-case 51:
-#line 403 "parse.y"
+case 57:
+#line 473 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
- yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
+ yyval.sigtype = SIGNAL_FIRST_METHOD;
else if(strcmp(yyvsp[-1].id,"last")==0)
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ yyval.sigtype = SIGNAL_LAST_METHOD;
else {
yyerror(_("signal must be 'first' or 'last'"));
g_free(yyvsp[-1].id);
g_free(yyvsp[-1].id);
;
break;}
-case 52:
-#line 415 "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);
- ;
- break;}
-case 53:
-#line 427 "parse.y"
+case 58:
+#line 485 "parse.y"
{
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 54:
-#line 430 "parse.y"
+case 59:
+#line 491 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 55:
-#line 442 "parse.y"
+case 60:
+#line 503 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"first")==0)
+ yyval.sigtype = SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-2].id,"last")==0)
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-2].id);
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ ;
+ break;}
+case 61:
+#line 515 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 56:
-#line 447 "parse.y"
+case 62:
+#line 518 "parse.y"
+{
+ /* the_scope was default thus public */
+ the_scope = PUBLIC_SCOPE;
+ ;
+ break;}
+case 63:
+#line 524 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 57:
-#line 452 "parse.y"
+case 64:
+#line 529 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 58:
-#line 455 "parse.y"
+case 65:
+#line 532 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 59:
-#line 460 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 66:
+#line 537 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 60:
-#line 461 "parse.y"
+case 67:
+#line 538 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 61:
-#line 465 "parse.y"
+case 68:
+#line 542 "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 62:
-#line 475 "parse.y"
+case 69:
+#line 552 "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 70:
+#line 562 "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 63:
-#line 485 "parse.y"
+case 71:
+#line 572 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
ccode_line,vararg);
;
break;}
-case 64:
-#line 495 "parse.y"
+case 72:
+#line 582 "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 65:
-#line 501 "parse.y"
+case 73:
+#line 592 "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 66:
-#line 506 "parse.y"
+case 74:
+#line 598 "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 67:
-#line 511 "parse.y"
+case 75:
+#line 603 "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 68:
-#line 532 "parse.y"
+case 76:
+#line 624 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 69:
-#line 533 "parse.y"
+case 77:
+#line 625 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 70:
-#line 537 "parse.y"
-{ ; ;
- break;}
-case 71:
-#line 538 "parse.y"
+case 78:
+#line 629 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 72:
-#line 541 "parse.y"
+case 79:
+#line 632 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 73:
-#line 542 "parse.y"
+case 80:
+#line 633 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
}
;
break;}
-case 74:
-#line 553 "parse.y"
+case 81:
+#line 644 "parse.y"
{
has_self = TRUE;
if(strcmp(yyvsp[-2].id,"self")==0)
}
;
break;}
-case 75:
-#line 563 "parse.y"
+case 82:
+#line 654 "parse.y"
{ has_self = FALSE; ;
break;}
-case 76:
-#line 566 "parse.y"
+case 83:
+#line 657 "parse.y"
{ vararg = TRUE; ;
break;}
-case 77:
-#line 567 "parse.y"
+case 84:
+#line 658 "parse.y"
{ vararg = FALSE; ;
break;}
-case 78:
-#line 570 "parse.y"
+case 85:
+#line 661 "parse.y"
{ ; ;
break;}
-case 79:
-#line 571 "parse.y"
+case 86:
+#line 662 "parse.y"
{ ; ;
break;}
-case 80:
-#line 574 "parse.y"
+case 87:
+#line 665 "parse.y"
{
- push_funcarg(yyvsp[0].id);
+ push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 81:
-#line 577 "parse.y"
+case 88:
+#line 668 "parse.y"
+{
+ push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+ ;
+ break;}
+case 89:
+#line 671 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
YYERROR;
}
g_free(yyvsp[-2].id);
- push_funcarg(yyvsp[-4].id);
+ push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 82:
-#line 587 "parse.y"
+case 90:
+#line 679 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+ ;
+ break;}
+case 91:
+#line 689 "parse.y"
{ ; ;
break;}
-case 83:
-#line 588 "parse.y"
+case 92:
+#line 690 "parse.y"
{ ; ;
break;}
-case 84:
-#line 591 "parse.y"
+case 93:
+#line 693 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 85:
-#line 604 "parse.y"
+case 94:
+#line 706 "parse.y"
{
Node *node = new_check(GT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 86:
-#line 608 "parse.y"
+case 95:
+#line 710 "parse.y"
{
Node *node = new_check(LT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 87:
-#line 612 "parse.y"
+case 96:
+#line 714 "parse.y"
{
Node *node = new_check(GE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 88:
-#line 616 "parse.y"
+case 97:
+#line 718 "parse.y"
{
Node *node = new_check(LE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 89:
-#line 620 "parse.y"
+case 98:
+#line 722 "parse.y"
{
Node *node = new_check(EQ_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 90:
-#line 624 "parse.y"
+case 99:
+#line 726 "parse.y"
{
Node *node = new_check(NE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 91:
-#line 630 "parse.y"
+case 100:
+#line 732 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 92:
-#line 631 "parse.y"
+case 101:
+#line 733 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 93:
-#line 635 "parse.y"
+case 102:
+#line 737 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 638 "parse.y"
+#line 740 "parse.y"
projects / gob-dx.git / blobdiff