#define HCODE 279
#define PUBLIC 280
#define PRIVATE 281
-#define ARGUMENT 282
-#define VIRTUAL 283
-#define SIGNAL 284
-#define OVERRIDE 285
+#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);
}
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) {
+ if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
} else {
/* 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;
}
-#line 178 "parse.y"
+#line 197 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 207
+#define YYFINAL 214
#define YYFLAG -32768
#define YYNTBASE 46
-#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 76)
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, 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, 32, 37, 33, 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, 31
+ 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, 58, 63,
- 69, 81, 90, 94, 95, 99, 101, 103, 106, 108,
- 111, 114, 117, 119, 122, 125, 127, 129, 131, 133,
- 136, 138, 140, 143, 145, 148, 150, 152, 154, 156,
- 158, 161, 163, 167, 171, 174, 177, 179, 184, 188,
- 190, 193, 195, 205, 215, 224, 237, 247, 257, 263,
- 266, 270, 273, 274, 276, 278, 282, 284, 288, 290,
- 294, 296, 299, 303, 310, 318, 321, 323, 325, 328,
- 331, 335, 339, 343, 347, 349, 352
+ 31, 36, 39, 42, 45, 47, 49, 51, 53, 55,
+ 57, 62, 68, 80, 89, 93, 94, 98, 100, 102,
+ 105, 107, 110, 113, 116, 118, 121, 124, 126, 128,
+ 130, 132, 135, 137, 139, 142, 144, 147, 149, 151,
+ 153, 155, 157, 160, 162, 165, 167, 171, 175, 178,
+ 180, 185, 189, 191, 194, 196, 206, 217, 227, 237,
+ 246, 258, 267, 273, 276, 280, 281, 283, 285, 289,
+ 291, 295, 297, 301, 303, 306, 310, 317, 325, 328,
+ 330, 332, 335, 338, 342, 346, 350, 354, 356, 359
};
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, 3, 22, 4, 22,
- 0, 50, 65, 0, 50, 51, 0, 50, 52, 0,
- 65, 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, 27, 20, 62, 0, 20, 27, 62, 0,
- 27, 62, 0, 20, 62, 0, 62, 0, 20, 35,
- 63, 36, 0, 63, 39, 20, 0, 20, 0, 32,
- 24, 0, 34, 0, 30, 61, 55, 20, 35, 67,
- 36, 66, 64, 0, 29, 27, 55, 20, 35, 67,
- 36, 66, 64, 0, 29, 55, 20, 35, 67, 36,
- 66, 64, 0, 31, 35, 22, 36, 55, 20, 35,
- 67, 36, 66, 32, 24, 0, 26, 55, 20, 35,
- 67, 36, 66, 32, 24, 0, 27, 55, 20, 35,
- 67, 36, 66, 32, 24, 0, 20, 35, 20, 36,
- 64, 0, 19, 73, 0, 19, 32, 24, 0, 40,
- 41, 0, 0, 6, 0, 20, 0, 20, 39, 68,
- 0, 68, 0, 69, 39, 10, 0, 69, 0, 69,
- 39, 70, 0, 70, 0, 55, 20, 0, 55, 20,
- 23, 0, 55, 20, 35, 20, 71, 36, 0, 55,
- 20, 23, 35, 20, 71, 36, 0, 71, 72, 0,
- 72, 0, 20, 0, 42, 73, 0, 43, 73, 0,
- 42, 40, 73, 0, 43, 40, 73, 0, 40, 40,
- 73, 0, 44, 40, 73, 0, 21, 0, 45, 21,
- 0, 20, 0
+ 0, 49, 33, 50, 34, 0, 49, 33, 34, 0,
+ 3, 22, 4, 22, 0, 50, 67, 0, 50, 52,
+ 0, 50, 53, 0, 67, 0, 52, 0, 53, 0,
+ 26, 0, 27, 0, 28, 0, 51, 56, 20, 35,
+ 0, 51, 56, 20, 23, 35, 0, 29, 54, 20,
+ 20, 20, 33, 24, 20, 33, 24, 35, 0, 29,
+ 54, 20, 20, 20, 33, 24, 35, 0, 36, 55,
+ 37, 0, 0, 20, 38, 55, 0, 20, 0, 57,
+ 0, 5, 57, 0, 58, 0, 58, 61, 0, 12,
+ 59, 0, 11, 59, 0, 59, 0, 12, 18, 0,
+ 11, 18, 0, 18, 0, 17, 0, 16, 0, 20,
+ 0, 60, 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, 61, 0, 39,
+ 0, 20, 64, 0, 64, 0, 51, 20, 64, 0,
+ 20, 51, 64, 0, 51, 64, 0, 62, 0, 20,
+ 36, 65, 37, 0, 65, 40, 20, 0, 20, 0,
+ 33, 24, 0, 35, 0, 31, 63, 56, 20, 36,
+ 69, 37, 68, 66, 0, 51, 31, 62, 56, 20,
+ 36, 69, 37, 68, 66, 0, 30, 51, 56, 20,
+ 36, 69, 37, 68, 66, 0, 51, 30, 56, 20,
+ 36, 69, 37, 68, 66, 0, 30, 56, 20, 36,
+ 69, 37, 68, 66, 0, 32, 36, 22, 37, 56,
+ 20, 36, 69, 37, 68, 66, 0, 51, 56, 20,
+ 36, 69, 37, 68, 66, 0, 20, 36, 20, 37,
+ 66, 0, 19, 75, 0, 19, 33, 24, 0, 0,
+ 6, 0, 20, 0, 20, 40, 70, 0, 70, 0,
+ 71, 40, 10, 0, 71, 0, 71, 40, 72, 0,
+ 72, 0, 56, 20, 0, 56, 20, 23, 0, 56,
+ 20, 36, 20, 73, 37, 0, 56, 20, 23, 36,
+ 20, 73, 37, 0, 73, 74, 0, 74, 0, 20,
+ 0, 41, 75, 0, 42, 75, 0, 41, 43, 75,
+ 0, 42, 43, 75, 0, 43, 43, 75, 0, 44,
+ 43, 75, 0, 21, 0, 45, 21, 0, 20, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 197, 198, 199, 200, 203, 207, 211, 215, 221, 228,
- 233, 234, 235, 236, 237, 238, 241, 244, 247, 250,
- 254, 283, 309, 310, 313, 316, 322, 323, 331, 335,
- 342, 345, 348, 351, 354, 357, 360, 363, 366, 369,
- 373, 376, 381, 384, 387, 390, 393, 398, 401, 404,
- 409, 410, 413, 425, 437, 440, 452, 457, 462, 465,
- 470, 471, 475, 485, 495, 505, 511, 516, 521, 542,
- 543, 547, 548, 551, 552, 563, 573, 576, 577, 580,
- 581, 584, 587, 590, 598, 608, 609, 612, 625, 629,
- 633, 637, 641, 645, 651, 652, 656
+ 216, 217, 218, 219, 222, 228, 233, 239, 246, 251,
+ 258, 263, 264, 265, 266, 267, 268, 271, 272, 273,
+ 276, 279, 283, 316, 344, 345, 348, 351, 357, 358,
+ 366, 370, 377, 380, 383, 386, 389, 392, 395, 398,
+ 401, 404, 408, 411, 416, 419, 422, 425, 428, 433,
+ 436, 439, 444, 445, 449, 461, 467, 479, 491, 494,
+ 500, 505, 508, 513, 514, 518, 528, 538, 548, 558,
+ 568, 574, 579, 600, 601, 605, 608, 609, 620, 630,
+ 633, 634, 637, 638, 641, 644, 647, 655, 665, 666,
+ 669, 682, 686, 690, 694, 698, 702, 708, 709, 713
};
#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",
+"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","PROTECTED","ARGUMENT","VIRTUAL",
+"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'",
+"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable",
"argument","argflags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","fullsigtype","sigtype","tokenlist","codenocode","method","onerror",
-"funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL
+"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, 49,
- 50, 50, 50, 50, 50, 50, 51, 51, 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,
- 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 58, 58, 58, 58, 58, 59, 59, 59,
- 60, 60, 61, 61, 61, 61, 61, 62, 63, 63,
- 64, 64, 65, 65, 65, 65, 65, 65, 65, 66,
- 66, 66, 66, 67, 67, 67, 67, 68, 68, 69,
- 69, 70, 70, 70, 70, 71, 71, 72, 72, 72,
- 72, 72, 72, 72, 73, 73, 73
+ 57, 57, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 59, 59, 59, 59, 59, 60,
+ 60, 60, 61, 61, 62, 62, 63, 63, 63, 63,
+ 64, 65, 65, 66, 66, 67, 67, 67, 67, 67,
+ 67, 67, 67, 68, 68, 68, 69, 69, 69, 69,
+ 70, 70, 71, 71, 72, 72, 72, 72, 73, 73,
+ 74, 74, 74, 74, 74, 74, 74, 75, 75, 75
};
static const short yyr2[] = { 0,
- 3, 2, 2, 1, 2, 2, 1, 1, 4, 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, 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, 3, 6, 7, 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, 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, 24, 0, 0,
- 0, 0, 15, 16, 14, 10, 0, 0, 42, 50,
- 49, 48, 0, 0, 44, 46, 47, 38, 37, 36,
- 39, 41, 0, 27, 29, 33, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 57, 0, 9, 12, 13,
- 11, 0, 28, 35, 32, 34, 31, 43, 45, 0,
- 52, 30, 40, 0, 26, 0, 0, 0, 0, 0,
- 0, 0, 56, 0, 55, 0, 0, 0, 0, 17,
- 0, 51, 0, 19, 0, 0, 23, 0, 0, 0,
- 54, 60, 0, 53, 0, 0, 0, 62, 69, 18,
- 42, 39, 0, 0, 77, 79, 81, 20, 0, 25,
- 0, 0, 0, 58, 0, 0, 0, 61, 0, 82,
- 73, 0, 73, 0, 0, 73, 59, 0, 0, 76,
- 83, 0, 0, 0, 0, 78, 80, 0, 0, 73,
- 0, 73, 0, 0, 0, 97, 95, 0, 0, 70,
- 72, 0, 0, 0, 22, 0, 65, 0, 0, 0,
- 88, 0, 0, 0, 0, 0, 87, 71, 96, 67,
- 68, 0, 64, 63, 73, 0, 0, 0, 89, 0,
- 90, 0, 84, 86, 0, 0, 85, 93, 91, 92,
- 94, 21, 0, 66, 0, 0, 0
+ 2, 0, 0, 1, 0, 18, 19, 20, 26, 0,
+ 0, 0, 10, 0, 0, 16, 17, 15, 11, 0,
+ 0, 0, 0, 44, 52, 51, 50, 0, 0, 46,
+ 48, 49, 40, 39, 38, 41, 43, 0, 0, 29,
+ 31, 35, 0, 0, 0, 60, 0, 56, 0, 9,
+ 13, 14, 12, 0, 0, 0, 0, 28, 0, 0,
+ 30, 37, 34, 36, 33, 45, 47, 0, 0, 54,
+ 32, 42, 0, 0, 0, 55, 0, 59, 0, 0,
+ 0, 0, 0, 0, 0, 0, 25, 0, 0, 0,
+ 53, 63, 0, 58, 57, 0, 0, 0, 0, 0,
+ 21, 0, 0, 65, 73, 27, 0, 0, 44, 41,
+ 0, 0, 80, 82, 84, 61, 0, 0, 0, 0,
+ 0, 22, 0, 64, 0, 0, 0, 85, 76, 0,
+ 62, 0, 0, 0, 0, 76, 0, 76, 79, 86,
+ 0, 0, 0, 81, 83, 76, 0, 76, 0, 0,
+ 0, 24, 0, 0, 0, 100, 98, 0, 0, 74,
+ 70, 0, 0, 0, 76, 72, 0, 68, 0, 91,
+ 0, 0, 0, 0, 0, 90, 75, 99, 66, 76,
+ 69, 0, 0, 0, 0, 92, 0, 93, 0, 0,
+ 87, 89, 0, 67, 23, 88, 94, 95, 96, 97,
+ 71, 0, 0, 0
};
-static const short yydefgoto[] = { 205,
- 4, 5, 6, 22, 23, 24, 50, 76, 113, 44,
- 45, 46, 47, 72, 55, 56, 103, 109, 25, 145,
- 114, 115, 116, 117, 176, 177, 160
+static const short yydefgoto[] = { 212,
+ 4, 5, 6, 24, 25, 26, 27, 32, 69, 121,
+ 50, 51, 52, 53, 81, 56, 57, 58, 103, 115,
+ 28, 153, 122, 123, 124, 125, 185, 186, 170
};
-static const short yypact[] = { 3,
- 47,-32768,-32768, 70, 169, 94, 75,-32768,-32768, 169,
- 182, 171, 79, 182, 100, 125, 125, 109, 69, 77,
- 111, 159,-32768,-32768,-32768,-32768, 108, 160,-32768,-32768,
--32768,-32768, 190, 196, 138, 147,-32768,-32768,-32768,-32768,
--32768,-32768, 144,-32768, 132,-32768, 163, 193, 197, 198,
- 125, 199, 32, 200, 125,-32768, 194,-32768,-32768,-32768,
--32768, 145,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 65,
- 132,-32768,-32768, 161, 184, 186, 203, 204, 191, 192,
- 205, 208,-32768, 26,-32768, 209, 195, 76, 201,-32768,
- 143,-32768, 202,-32768, 143, 197,-32768, 210, 206, 143,
--32768,-32768, 66,-32768, 207, 125, 213,-32768,-32768,-32768,
- 211, 176, 212, 214,-32768, 215,-32768,-32768, 216,-32768,
- 217, 143, 219,-32768, 218, 143, 220,-32768, 125, 21,
- -6, 107, -6, 221, 222, -6,-32768, 223, 225,-32768,
- 226, 224, -9, 227, 230,-32768,-32768, 231, 29, -6,
- 76, -6, 143, 228, 28,-32768,-32768, 229, 235,-32768,
--32768, 233, 240, 234,-32768, 76,-32768, 76, 236, 28,
--32768, 237, -2, 5, 238, 11,-32768,-32768,-32768,-32768,
--32768, 241,-32768,-32768, -6, 22, -4, -4,-32768, -4,
--32768, -4,-32768,-32768, 239, 242,-32768,-32768,-32768,-32768,
--32768,-32768, 243,-32768, 246, 251,-32768
+static const short yypact[] = { 77,
+ -16,-32768,-32768, 85, 65, 6, 51,-32768,-32768, 65,
+ 120, 216, 42, 120, 46,-32768,-32768,-32768, 62, 115,
+ 15, 89,-32768, 229, 54,-32768,-32768,-32768,-32768, 91,
+ 116, 131, 206,-32768,-32768,-32768,-32768, 79, 135, 125,
+ 140,-32768,-32768,-32768,-32768,-32768,-32768, 171, 161,-32768,
+ 151,-32768, 172, 205, 179,-32768, 171,-32768, 186,-32768,
+-32768,-32768,-32768, 171, 190, 196, 197, 199, 198, 207,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 218, 203, 151,
+-32768,-32768, 204, 231, 232,-32768, -7,-32768, 233, 217,
+ 242, -7, 171, 111, 139, 116,-32768, 244, 230, 189,
+-32768,-32768, -30,-32768,-32768, 234, 171, 235, 245, 237,
+-32768, 189, 243,-32768,-32768,-32768, 236, 189, 238, 59,
+ 248, 239,-32768, 240,-32768,-32768, 253, 189, 254, 189,
+ 241,-32768, 246,-32768, 255, 247, 171, 9, 259, 153,
+-32768, 249, 251, 252, 189, 259, -5, 259,-32768, 256,
+ 261, 5, 139,-32768,-32768, 259, 189, 259, 257, 139,
+ 258,-32768, 139, 262, 75,-32768,-32768, 264, 269,-32768,
+-32768, 139, 260, 139, 259,-32768, 271,-32768, 75,-32768,
+ 13, 32, 250, 263, 63,-32768,-32768,-32768,-32768, 259,
+-32768, 139, 265, 71, 58,-32768, 58,-32768, 58, 58,
+-32768,-32768, 139,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 285, 296,-32768
};
static const short yypgoto[] = {-32768,
- 93, 265,-32768,-32768, 248, 249,-32768, 137, -16, 247,
--32768, -13,-32768, 168,-32768, -44,-32768, -136, 254, -128,
- -93, 105,-32768, 148, 73, -172, -81
+ 76, 294,-32768,-32768, 3, 275, 277,-32768, 208, -20,
+ 270,-32768, 191,-32768, 222, 266,-32768, -38,-32768, -152,
+ 281, -144, -109, 170,-32768, 168, 130, -167, -43
};
-#define YYLAST 280
-
-
-static const short yytable[] = { 43,
- 48, 119, 52, 194, 148, 1, 123, 151, 83, 85,
- 156, 157, 143, 194, 167, 156, 157, 156, 157, 65,
- 67, 166, 158, 168, 156, 157, 2, 3, 135, 183,
- 171, 184, 138, 144, 78, 159, 101, 188, 86, 104,
- 159, 171, 159, 141, 190, 80, 193, 171, 164, 159,
- 172, 80, 173, 174, 175, 142, 196, 197, 81, 169,
- 82, 172, 165, 173, 174, 175, 82, 172, 7, 173,
- 174, 175, 1, 28, 29, 30, 31, 32, 13, 33,
- 34, 35, 36, 37, 38, 39, 40, 89, 41, 127,
- 42, 189, 191, 8, 9, 51, 53, 11, 90, 91,
- 26, 124, 14, 54, 125, 198, 199, 107, 200, 108,
- 201, 28, 29, 30, 31, 32, 146, 33, 34, 35,
- 36, 37, 38, 39, 40, 12, 41, 62, 42, 28,
- 29, 30, 31, 32, 27, 33, 34, 35, 36, 37,
- 38, 39, 40, 49, 41, 57, 42, 28, 111, 30,
- 31, 32, 68, 33, 34, 35, 36, 37, 38, 39,
- 40, 69, 112, 70, 42, 29, 30, 31, 32, 71,
- 33, 34, 35, 36, 37, 38, 39, 40, 15, 41,
- 88, 42, 73, 93, 16, 17, 18, 19, 20, 21,
- 15, 58, 2, 3, 94, 95, 16, 17, 18, 19,
- 20, 21, 35, 36, 37, 8, 9, 64, 35, 36,
- 37, -75, 74, 66, 129, 87, 75, 77, 79, 84,
- 96, 97, 98, 99, 80, 100, 82, 102, 105, 121,
- 106, 130, 120, 140, 110, 118, 128, 137, 92, 139,
- 122, 126, 186, 155, 149, 206, -74, 170, 134, 131,
- 207, 133, 178, 132, 136, 179, 180, 150, 152, 153,
- 154, 162, 163, 181, 195, 182, 204, 161, 10, 59,
- 60, 185, 202, 203, 63, 61, 187, 192, 0, 147
+#define YYLAST 331
+
+
+static const short yytable[] = { 49,
+ 171, 160, 133, 163, 66, 7, 126, 176, 136, 127,
+ 178, 172, 83, 174, 161, 86, 88, 202, 142, 189,
+ 144, 191, 48, 55, 166, 167, 202, 78, 84, 162,
+ 192, 150, 166, 167, 54, 159, 89, 168, 12, 204,
+ 16, 17, 18, 91, 151, 203, 104, 173, 105, 169,
+ 211, 166, 167, 86, 13, 195, 85, 169, 33, 34,
+ 35, 36, 37, 29, 38, 39, 40, 41, 42, 43,
+ 44, 45, 109, 46, 197, 47, 169, 166, 167, 1,
+ 11, 30, 180, 64, 65, 14, 129, 1, 2, 3,
+ 180, 40, 41, 42, 180, -78, 72, 31, 137, 201,
+ 2, 3, 169, 181, 182, 183, 184, 206, 8, 9,
+ 67, 181, 182, 183, 184, 181, 182, 183, 184, 33,
+ 34, 35, 36, 37, 59, 38, 39, 40, 41, 42,
+ 43, 44, 45, 110, 46, 68, 47, 196, 198, 76,
+ 16, 17, 18, 8, 9, 111, 112, 40, 41, 42,
+ 70, 207, 74, 208, 77, 209, 210, 33, 34, 35,
+ 36, 37, 154, 38, 39, 40, 41, 42, 43, 44,
+ 45, 113, 46, 114, 47, 33, 34, 35, 36, 37,
+ 79, 38, 39, 40, 41, 42, 43, 44, 45, 80,
+ 46, 82, 47, 33, 119, 35, 36, 37, 87, 38,
+ 39, 40, 41, 42, 43, 44, 45, 90, 120, 92,
+ 47, 34, 35, 36, 37, 94, 38, 39, 40, 41,
+ 42, 43, 44, 45, 83, 46, 98, 47, 73, 75,
+ 16, 17, 18, 95, 97, 15, 96, 99, 100, 84,
+ 84, 16, 17, 18, 19, 20, 21, 22, 15, 23,
+ 102, 83, 106, 107, 16, 17, 18, 19, 20, 21,
+ 22, 108, 60, 117, 131, 118, 134, 138, 135, 128,
+ 130, 132, 141, 143, -77, 139, 145, 152, 147, 140,
+ 165, 179, 146, 148, 213, 156, 157, 187, 158, 188,
+ 177, 164, 199, 175, 193, 214, 190, 10, 61, 205,
+ 62, 101, 71, 116, 63, 200, 149, 155, 194, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 93
};
-static const short yycheck[] = { 16,
- 17, 95, 19, 176, 133, 3, 100, 136, 53, 54,
- 20, 21, 19, 186, 151, 20, 21, 20, 21, 33,
- 34, 150, 32, 152, 20, 21, 24, 25, 122, 166,
- 20, 168, 126, 40, 51, 45, 81, 40, 55, 84,
- 45, 20, 45, 23, 40, 20, 36, 20, 20, 45,
- 40, 20, 42, 43, 44, 35, 185, 36, 27, 153,
- 35, 40, 34, 42, 43, 44, 35, 40, 22, 42,
- 43, 44, 3, 5, 6, 7, 8, 9, 4, 11,
- 12, 13, 14, 15, 16, 17, 18, 23, 20, 106,
- 22, 173, 174, 24, 25, 27, 20, 5, 34, 35,
- 22, 36, 10, 27, 39, 187, 188, 32, 190, 34,
- 192, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 32, 20, 20, 22, 5,
- 6, 7, 8, 9, 35, 11, 12, 13, 14, 15,
- 16, 17, 18, 35, 20, 35, 22, 5, 6, 7,
- 8, 9, 15, 11, 12, 13, 14, 15, 16, 17,
- 18, 15, 20, 20, 22, 6, 7, 8, 9, 38,
- 11, 12, 13, 14, 15, 16, 17, 18, 20, 20,
- 36, 22, 20, 23, 26, 27, 28, 29, 30, 31,
- 20, 33, 24, 25, 34, 35, 26, 27, 28, 29,
- 30, 31, 13, 14, 15, 24, 25, 18, 13, 14,
- 15, 36, 20, 18, 39, 22, 20, 20, 20, 20,
- 37, 36, 20, 20, 20, 35, 35, 20, 20, 20,
- 36, 20, 96, 129, 34, 34, 24, 20, 71, 20,
- 35, 35, 170, 20, 24, 0, 36, 20, 32, 36,
- 0, 36, 24, 39, 36, 21, 24, 36, 36, 35,
- 35, 32, 32, 24, 24, 32, 24, 41, 4, 22,
- 22, 36, 34, 32, 28, 22, 40, 40, -1, 132
+static const short yycheck[] = { 20,
+ 153, 146, 112, 148, 25, 22, 37, 160, 118, 40,
+ 163, 156, 20, 158, 20, 54, 55, 185, 128, 172,
+ 130, 174, 20, 21, 20, 21, 194, 48, 36, 35,
+ 175, 23, 20, 21, 20, 145, 57, 33, 33, 192,
+ 26, 27, 28, 64, 36, 190, 85, 157, 87, 45,
+ 203, 20, 21, 92, 4, 43, 54, 45, 5, 6,
+ 7, 8, 9, 22, 11, 12, 13, 14, 15, 16,
+ 17, 18, 93, 20, 43, 22, 45, 20, 21, 3,
+ 5, 36, 20, 30, 31, 10, 107, 3, 24, 25,
+ 20, 13, 14, 15, 20, 37, 18, 36, 40, 37,
+ 24, 25, 45, 41, 42, 43, 44, 37, 24, 25,
+ 20, 41, 42, 43, 44, 41, 42, 43, 44, 5,
+ 6, 7, 8, 9, 36, 11, 12, 13, 14, 15,
+ 16, 17, 18, 23, 20, 20, 22, 181, 182, 15,
+ 26, 27, 28, 24, 25, 35, 36, 13, 14, 15,
+ 20, 195, 18, 197, 15, 199, 200, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 33, 20, 35, 22, 5, 6, 7, 8, 9,
+ 20, 11, 12, 13, 14, 15, 16, 17, 18, 39,
+ 20, 20, 22, 5, 6, 7, 8, 9, 20, 11,
+ 12, 13, 14, 15, 16, 17, 18, 22, 20, 20,
+ 22, 6, 7, 8, 9, 20, 11, 12, 13, 14,
+ 15, 16, 17, 18, 20, 20, 20, 22, 38, 39,
+ 26, 27, 28, 37, 37, 20, 38, 20, 36, 36,
+ 36, 26, 27, 28, 29, 30, 31, 32, 20, 34,
+ 20, 20, 20, 37, 26, 27, 28, 29, 30, 31,
+ 32, 20, 34, 20, 20, 36, 24, 20, 33, 36,
+ 36, 35, 20, 20, 37, 37, 36, 19, 24, 40,
+ 20, 20, 37, 37, 0, 37, 36, 24, 37, 21,
+ 33, 36, 43, 37, 24, 0, 37, 4, 24, 35,
+ 24, 80, 33, 96, 24, 43, 137, 140, 179, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 65
};
/* -*-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 216 "parse.y"
{ ; ;
break;}
case 2:
-#line 198 "parse.y"
+#line 217 "parse.y"
{ ; ;
break;}
case 3:
-#line 199 "parse.y"
+#line 218 "parse.y"
{ ; ;
break;}
case 4:
-#line 200 "parse.y"
+#line 219 "parse.y"
{ ; ;
break;}
case 5:
-#line 203 "parse.y"
+#line 222 "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 207 "parse.y"
+#line 228 "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 211 "parse.y"
+#line 233 "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 215 "parse.y"
+#line 239 "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 221 "parse.y"
+#line 246 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 228 "parse.y"
+#line 251 "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 233 "parse.y"
-{ ; ;
+#line 258 "parse.y"
+{
+ class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+ ;
break;}
case 12:
-#line 234 "parse.y"
+#line 263 "parse.y"
{ ; ;
break;}
case 13:
-#line 235 "parse.y"
+#line 264 "parse.y"
{ ; ;
break;}
case 14:
-#line 236 "parse.y"
+#line 265 "parse.y"
{ ; ;
break;}
case 15:
-#line 237 "parse.y"
+#line 266 "parse.y"
{ ; ;
break;}
case 16:
-#line 238 "parse.y"
+#line 267 "parse.y"
{ ; ;
break;}
case 17:
-#line 241 "parse.y"
-{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL);
- ;
+#line 268 "parse.y"
+{ ; ;
break;}
case 18:
-#line 244 "parse.y"
-{
- push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
- ;
+#line 271 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
break;}
case 19:
-#line 247 "parse.y"
+#line 272 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+ break;}
+case 20:
+#line 273 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+ break;}
+case 21:
+#line 276 "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 20:
-#line 250 "parse.y"
+case 22:
+#line 279 "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 21:
-#line 254 "parse.y"
+case 23:
+#line 283 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
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,
+ (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;
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,
+ (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 22:
-#line 283 "parse.y"
+case 24:
+#line 316 "parse.y"
{
if(strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
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);
+ (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;
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);
+ 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 23:
-#line 309 "parse.y"
+case 25:
+#line 344 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 24:
-#line 310 "parse.y"
+case 26:
+#line 345 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 25:
-#line 313 "parse.y"
+case 27:
+#line 348 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 26:
-#line 316 "parse.y"
+case 28:
+#line 351 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 27:
-#line 322 "parse.y"
+case 29:
+#line 357 "parse.y"
{ ; ;
break;}
-case 28:
-#line 323 "parse.y"
+case 30:
+#line 358 "parse.y"
{
Type *type = typestack->data;
char *oldname = type->name;
g_free(oldname);
;
break;}
-case 29:
-#line 331 "parse.y"
+case 31:
+#line 366 "parse.y"
{
Node *node = new_type(0,yyvsp[0].id,NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 30:
-#line 335 "parse.y"
+case 32:
+#line 370 "parse.y"
{
Node *node = new_type(stars,yyvsp[-1].id,NULL);
stars = 0;
typestack = g_list_prepend(typestack,node);
;
break;}
-case 31:
-#line 342 "parse.y"
+case 33:
+#line 377 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 32:
-#line 345 "parse.y"
+case 34:
+#line 380 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 33:
-#line 348 "parse.y"
+case 35:
+#line 383 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 34:
-#line 351 "parse.y"
+case 36:
+#line 386 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 35:
-#line 354 "parse.y"
+case 37:
+#line 389 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 36:
-#line 357 "parse.y"
+case 38:
+#line 392 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 37:
-#line 360 "parse.y"
+case 39:
+#line 395 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 38:
-#line 363 "parse.y"
+case 40:
+#line 398 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 39:
-#line 366 "parse.y"
+case 41:
+#line 401 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 40:
-#line 369 "parse.y"
+case 42:
+#line 404 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 41:
-#line 373 "parse.y"
+case 43:
+#line 408 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 42:
-#line 376 "parse.y"
+case 44:
+#line 411 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 43:
-#line 381 "parse.y"
+case 45:
+#line 416 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 44:
-#line 384 "parse.y"
+case 46:
+#line 419 "parse.y"
{
yyval.id = "long";
;
break;}
-case 45:
-#line 387 "parse.y"
+case 47:
+#line 422 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 46:
-#line 390 "parse.y"
+case 48:
+#line 425 "parse.y"
{
yyval.id = "short";
;
break;}
-case 47:
-#line 393 "parse.y"
+case 49:
+#line 428 "parse.y"
{
yyval.id = "int";
;
break;}
-case 48:
-#line 398 "parse.y"
+case 50:
+#line 433 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 49:
-#line 401 "parse.y"
+case 51:
+#line 436 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 50:
-#line 404 "parse.y"
+case 52:
+#line 439 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 51:
-#line 409 "parse.y"
+case 53:
+#line 444 "parse.y"
{ stars++; ;
break;}
-case 52:
-#line 410 "parse.y"
+case 54:
+#line 445 "parse.y"
{ stars++; ;
break;}
-case 53:
-#line 413 "parse.y"
+case 55:
+#line 449 "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 54:
-#line 425 "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 55:
-#line 437 "parse.y"
+case 56:
+#line 461 "parse.y"
{
- yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 56:
-#line 440 "parse.y"
+case 57:
+#line 467 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 57:
-#line 452 "parse.y"
+case 58:
+#line 479 "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 59:
+#line 491 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 58:
-#line 457 "parse.y"
+case 60:
+#line 494 "parse.y"
+{
+ /* the_scope was default thus public */
+ the_scope = PUBLIC_SCOPE;
+ ;
+ break;}
+case 61:
+#line 500 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 59:
-#line 462 "parse.y"
+case 62:
+#line 505 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 60:
-#line 465 "parse.y"
+case 63:
+#line 508 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 61:
-#line 470 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
+case 64:
+#line 513 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 62:
-#line 471 "parse.y"
+case 65:
+#line 514 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 63:
-#line 475 "parse.y"
+case 66:
+#line 518 "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 64:
-#line 485 "parse.y"
+case 67:
+#line 528 "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 68:
+#line 538 "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 65:
-#line 495 "parse.y"
+case 69:
+#line 548 "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 66:
-#line 505 "parse.y"
+case 70:
+#line 558 "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 67:
-#line 511 "parse.y"
+case 71:
+#line 568 "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 68:
-#line 516 "parse.y"
+case 72:
+#line 574 "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 69:
-#line 521 "parse.y"
+case 73:
+#line 579 "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 70:
-#line 542 "parse.y"
+case 74:
+#line 600 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 71:
-#line 543 "parse.y"
+case 75:
+#line 601 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 72:
-#line 547 "parse.y"
-{ ; ;
- break;}
-case 73:
-#line 548 "parse.y"
+case 76:
+#line 605 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 74:
-#line 551 "parse.y"
+case 77:
+#line 608 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 75:
-#line 552 "parse.y"
+case 78:
+#line 609 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
}
;
break;}
-case 76:
-#line 563 "parse.y"
+case 79:
+#line 620 "parse.y"
{
has_self = TRUE;
if(strcmp(yyvsp[-2].id,"self")==0)
}
;
break;}
-case 77:
-#line 573 "parse.y"
+case 80:
+#line 630 "parse.y"
{ has_self = FALSE; ;
break;}
-case 78:
-#line 576 "parse.y"
+case 81:
+#line 633 "parse.y"
{ vararg = TRUE; ;
break;}
-case 79:
-#line 577 "parse.y"
+case 82:
+#line 634 "parse.y"
{ vararg = FALSE; ;
break;}
-case 80:
-#line 580 "parse.y"
+case 83:
+#line 637 "parse.y"
{ ; ;
break;}
-case 81:
-#line 581 "parse.y"
+case 84:
+#line 638 "parse.y"
{ ; ;
break;}
-case 82:
-#line 584 "parse.y"
+case 85:
+#line 641 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 83:
-#line 587 "parse.y"
+case 86:
+#line 644 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 84:
-#line 590 "parse.y"
+case 87:
+#line 647 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 85:
-#line 598 "parse.y"
+case 88:
+#line 655 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
;
break;}
-case 86:
-#line 608 "parse.y"
+case 89:
+#line 665 "parse.y"
{ ; ;
break;}
-case 87:
-#line 609 "parse.y"
+case 90:
+#line 666 "parse.y"
{ ; ;
break;}
-case 88:
-#line 612 "parse.y"
+case 91:
+#line 669 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 89:
-#line 625 "parse.y"
+case 92:
+#line 682 "parse.y"
{
Node *node = new_check(GT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 90:
-#line 629 "parse.y"
+case 93:
+#line 686 "parse.y"
{
Node *node = new_check(LT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 91:
-#line 633 "parse.y"
+case 94:
+#line 690 "parse.y"
{
Node *node = new_check(GE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 92:
-#line 637 "parse.y"
+case 95:
+#line 694 "parse.y"
{
Node *node = new_check(LE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 93:
-#line 641 "parse.y"
+case 96:
+#line 698 "parse.y"
{
Node *node = new_check(EQ_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 94:
-#line 645 "parse.y"
+case 97:
+#line 702 "parse.y"
{
Node *node = new_check(NE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 95:
-#line 651 "parse.y"
+case 98:
+#line 708 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 96:
-#line 652 "parse.y"
+case 99:
+#line 709 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 97:
-#line 656 "parse.y"
+case 100:
+#line 713 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 659 "parse.y"
+#line 716 "parse.y"
projects / gob-dx.git / blobdiff