X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/f31590988781d77ff5249987801d03a986368ca2..774037b15064dcc6e4995c0bba3b24abb1bde35f:/src/parse.c diff --git a/src/parse.c b/src/parse.c index f8593b9..783037d 100644 --- a/src/parse.c +++ b/src/parse.c @@ -29,10 +29,11 @@ #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" @@ -63,6 +64,10 @@ static int vararg = FALSE; 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); @@ -96,12 +101,19 @@ yyerror(char *str) 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; @@ -110,25 +122,23 @@ push_variable(char *name, int scope, int line_no, char *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 && @@ -137,8 +147,24 @@ push_function(int scope, char *oid, char *id, char *onerror, "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; @@ -149,8 +175,7 @@ static void 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; @@ -191,7 +216,7 @@ push_self(char *id) } -#line 178 "parse.y" +#line 202 "parse.y" typedef union { char *id; GString *cbuf; @@ -213,26 +238,26 @@ typedef union { -#define YYFINAL 207 +#define YYFINAL 219 #define YYFLAG -32768 #define YYNTBASE 46 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74) +#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, 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, @@ -248,76 +273,79 @@ static const char yytranslate[] = { 0, 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, 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[] = { 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, 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, - 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 + 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 @@ -327,165 +355,178 @@ static const short yyrline[] = { 0, 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","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, - 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, 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, 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, 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, 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, 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[] = { 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[] = { 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[] = { 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[] = { 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, - 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 + 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 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 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, 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, + 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" @@ -1031,51 +1072,57 @@ yyreduce: switch (yyn) { case 1: -#line 197 "parse.y" +#line 221 "parse.y" { ; ; break;} case 2: -#line 198 "parse.y" +#line 222 "parse.y" { ; ; break;} case 3: -#line 199 "parse.y" +#line 223 "parse.y" { ; ; break;} case 4: -#line 200 "parse.y" +#line 224 "parse.y" { ; ; break;} case 5: -#line 203 "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 207 "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 211 "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 215 "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 221 "parse.y" +#line 251 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1083,79 +1130,93 @@ case 9: ; break;} case 10: -#line 228 "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 233 "parse.y" -{ ; ; +#line 263 "parse.y" +{ + class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + ; break;} case 12: -#line 234 "parse.y" +#line 268 "parse.y" { ; ; break;} case 13: -#line 235 "parse.y" +#line 269 "parse.y" { ; ; break;} case 14: -#line 236 "parse.y" +#line 270 "parse.y" { ; ; break;} case 15: -#line 237 "parse.y" +#line 271 "parse.y" { ; ; break;} case 16: -#line 238 "parse.y" +#line 272 "parse.y" { ; ; break;} case 17: -#line 241 "parse.y" -{ - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL); - ; +#line 273 "parse.y" +{ ; ; break;} case 18: -#line 244 "parse.y" -{ - push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id); - ; +#line 276 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 19: -#line 247 "parse.y" +#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,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 284 "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 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); @@ -1168,22 +1229,26 @@ case 21: } ; break;} -case 22: -#line 283 "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); @@ -1195,32 +1260,51 @@ case 22: } ; break;} -case 23: -#line 309 "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 24: -#line 310 "parse.y" +case 28: +#line 369 "parse.y" { yyval.list = NULL; ; break;} -case 25: -#line 313 "parse.y" +case 29: +#line 372 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 26: -#line 316 "parse.y" +case 30: +#line 375 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 27: -#line 322 "parse.y" +case 31: +#line 381 "parse.y" { ; ; break;} -case 28: -#line 323 "parse.y" +case 32: +#line 382 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1228,157 +1312,157 @@ case 28: g_free(oldname); ; break;} -case 29: -#line 331 "parse.y" +case 33: +#line 390 "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 34: +#line 394 "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 35: +#line 401 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 32: -#line 345 "parse.y" +case 36: +#line 404 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 33: -#line 348 "parse.y" +case 37: +#line 407 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 34: -#line 351 "parse.y" +case 38: +#line 410 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 35: -#line 354 "parse.y" +case 39: +#line 413 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 36: -#line 357 "parse.y" +case 40: +#line 416 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 37: -#line 360 "parse.y" +case 41: +#line 419 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 38: -#line 363 "parse.y" +case 42: +#line 422 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 39: -#line 366 "parse.y" +case 43: +#line 425 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 40: -#line 369 "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 41: -#line 373 "parse.y" +case 45: +#line 432 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 42: -#line 376 "parse.y" +case 46: +#line 435 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 43: -#line 381 "parse.y" +case 47: +#line 440 "parse.y" { yyval.id = "long int"; ; break;} -case 44: -#line 384 "parse.y" +case 48: +#line 443 "parse.y" { yyval.id = "long"; ; break;} -case 45: -#line 387 "parse.y" +case 49: +#line 446 "parse.y" { yyval.id = "short int"; ; break;} -case 46: -#line 390 "parse.y" +case 50: +#line 449 "parse.y" { yyval.id = "short"; ; break;} -case 47: -#line 393 "parse.y" +case 51: +#line 452 "parse.y" { yyval.id = "int"; ; break;} -case 48: -#line 398 "parse.y" +case 52: +#line 457 "parse.y" { yyval.id = "enum "; ; break;} -case 49: -#line 401 "parse.y" +case 53: +#line 460 "parse.y" { yyval.id = "union "; ; break;} -case 50: -#line 404 "parse.y" +case 54: +#line 463 "parse.y" { yyval.id = "struct "; ; break;} -case 51: -#line 409 "parse.y" +case 55: +#line 468 "parse.y" { stars++; ; break;} -case 52: -#line 410 "parse.y" +case 56: +#line 469 "parse.y" { stars++; ; break;} -case 53: -#line 413 "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); @@ -1387,29 +1471,14 @@ case 53: 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 58: +#line 485 "parse.y" { - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 440 "parse.y" +case 59: +#line 491 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1423,113 +1492,153 @@ case 56: g_free(yyvsp[-1].id); ; break;} -case 57: -#line 452 "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 58: -#line 457 "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 59: -#line 462 "parse.y" +case 64: +#line 529 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 60: -#line 465 "parse.y" +case 65: +#line 532 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 61: -#line 470 "parse.y" -{ yyval.cbuf=yyvsp[0].cbuf; ; +case 66: +#line 537 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 62: -#line 471 "parse.y" +case 67: +#line 538 "parse.y" { yyval.cbuf = NULL; ; break;} -case 63: -#line 475 "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 64: -#line 485 "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 65: -#line 495 "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 66: -#line 505 "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 67: -#line 511 "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 68: -#line 516 "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 69: -#line 521 "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 { @@ -1541,31 +1650,27 @@ case 69: } ; break;} -case 70: -#line 542 "parse.y" +case 76: +#line 624 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 71: -#line 543 "parse.y" +case 77: +#line 625 "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 78: +#line 629 "parse.y" { yyval.id = NULL; ; break;} -case 74: -#line 551 "parse.y" +case 79: +#line 632 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 75: -#line 552 "parse.y" +case 80: +#line 633 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1578,8 +1683,8 @@ case 75: } ; break;} -case 76: -#line 563 "parse.y" +case 81: +#line 644 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1591,40 +1696,40 @@ case 76: } ; break;} -case 77: -#line 573 "parse.y" +case 82: +#line 654 "parse.y" { has_self = FALSE; ; break;} -case 78: -#line 576 "parse.y" +case 83: +#line 657 "parse.y" { vararg = TRUE; ; break;} -case 79: -#line 577 "parse.y" +case 84: +#line 658 "parse.y" { vararg = FALSE; ; break;} -case 80: -#line 580 "parse.y" +case 85: +#line 661 "parse.y" { ; ; break;} -case 81: -#line 581 "parse.y" +case 86: +#line 662 "parse.y" { ; ; break;} -case 82: -#line 584 "parse.y" +case 87: +#line 665 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 83: -#line 587 "parse.y" +case 88: +#line 668 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 84: -#line 590 "parse.y" +case 89: +#line 671 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1634,8 +1739,8 @@ case 84: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 85: -#line 598 "parse.y" +case 90: +#line 679 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1645,16 +1750,16 @@ case 85: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 86: -#line 608 "parse.y" +case 91: +#line 689 "parse.y" { ; ; break;} -case 87: -#line 609 "parse.y" +case 92: +#line 690 "parse.y" { ; ; break;} -case 88: -#line 612 "parse.y" +case 93: +#line 693 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1669,61 +1774,61 @@ case 88: g_free(yyvsp[0].id); ; break;} -case 89: -#line 625 "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 90: -#line 629 "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 91: -#line 633 "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 92: -#line 637 "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 93: -#line 641 "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 94: -#line 645 "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 95: -#line 651 "parse.y" +case 100: +#line 732 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 96: -#line 652 "parse.y" +case 101: +#line 733 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 97: -#line 656 "parse.y" +case 102: +#line 737 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1948,5 +2053,5 @@ yyerrhandle: } return 1; } -#line 659 "parse.y" +#line 740 "parse.y"