X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/8cb6370effd9f2dacc6dc9b662a43ea19ee637ac..b17287deb56775a49030d738d8c8c0e9cd15f9fe:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 51a215a..b70b550 100644 --- a/src/parse.c +++ b/src/parse.c @@ -24,14 +24,20 @@ #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 HTCODE 279 +#define PHCODE 280 +#define HCODE 281 +#define ACODE 282 +#define ATCODE 283 +#define PUBLIC 284 +#define PRIVATE 285 +#define PROTECTED 286 +#define ARGUMENT 287 +#define VIRTUAL 288 +#define SIGNAL 289 +#define OVERRIDE 290 #line 21 "parse.y" @@ -43,11 +49,10 @@ #include "tree.h" #include "main.h" +#include "util.h" #define _(x) (x) -extern char *filename; - GList *nodes = NULL; static GList *class_nodes = NULL; @@ -62,6 +67,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); @@ -95,33 +104,72 @@ yyerror(char *str) 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, - GString *cbuf,int line_no, int ccode_line, int vararg) +push_function(int scope, int method, char *oid, char *id, char *onerror, + GString *cbuf, int line_no, int ccode_line, gboolean vararg, + GList *flags) { 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); } - node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no,ccode_line,vararg); + /* a complicated and ugly test to figure out if we have + the wrong number of types for a signal */ + 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 && + strcmp(gtktypes->next->data,"NONE")==0)) { + print_error(TRUE, _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match"),line_no); + } + 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, flags, + 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; @@ -129,11 +177,12 @@ push_function(int scope, char *oid, char *id, char *onerror, } 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; @@ -153,7 +202,7 @@ push_init_arg(char *name, int is_class) 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); } @@ -164,7 +213,7 @@ push_self(char *id) 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); @@ -172,7 +221,7 @@ push_self(char *id) } -#line 160 "parse.y" +#line 203 "parse.y" typedef union { char *id; GString *cbuf; @@ -194,26 +243,26 @@ typedef union { -#define YYFINAL 198 +#define YYFINAL 225 #define YYFLAG -32768 -#define YYNTBASE 45 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 82) 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, 48, 2, 2, 2, 2, 2, 2, 40, + 41, 43, 2, 44, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 39, 46, + 47, 45, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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, 37, 42, 38, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -229,73 +278,80 @@ 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 + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 }; #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 + 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, + 24, 27, 29, 34, 38, 43, 46, 49, 52, 54, + 56, 58, 60, 62, 64, 69, 75, 87, 96, 102, + 104, 108, 109, 113, 115, 117, 120, 122, 125, 128, + 131, 133, 136, 139, 141, 143, 145, 147, 150, 152, + 154, 157, 159, 162, 164, 166, 168, 170, 172, 175, + 177, 180, 182, 186, 190, 193, 195, 200, 204, 206, + 209, 211, 222, 234, 244, 254, 263, 275, 284, 290, + 293, 297, 298, 300, 302, 306, 308, 312, 314, 318, + 320, 323, 327, 334, 342, 345, 347, 349, 352, 355, + 359, 363, 367, 371, 373, 376 }; -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[] = { 52, + 53, 52, 0, 53, 52, 0, 52, 53, 0, 53, + 0, 24, 0, 27, 0, 25, 0, 26, 0, 28, + 0, 29, 0, 52, 51, 0, 51, 0, 54, 37, + 55, 38, 0, 54, 37, 38, 0, 3, 22, 4, + 22, 0, 55, 73, 0, 55, 57, 0, 55, 58, + 0, 73, 0, 57, 0, 58, 0, 30, 0, 31, + 0, 32, 0, 56, 62, 20, 39, 0, 56, 62, + 20, 23, 39, 0, 33, 60, 59, 20, 20, 37, + 24, 20, 37, 24, 39, 0, 33, 60, 59, 20, + 20, 37, 24, 39, 0, 20, 40, 20, 62, 41, + 0, 20, 0, 40, 61, 41, 0, 0, 20, 42, + 61, 0, 20, 0, 63, 0, 5, 63, 0, 64, + 0, 64, 67, 0, 12, 65, 0, 11, 65, 0, + 65, 0, 12, 18, 0, 11, 18, 0, 18, 0, + 17, 0, 16, 0, 20, 0, 66, 20, 0, 22, + 0, 6, 0, 13, 15, 0, 13, 0, 14, 15, + 0, 14, 0, 15, 0, 9, 0, 8, 0, 7, + 0, 43, 67, 0, 43, 0, 20, 70, 0, 70, + 0, 56, 20, 70, 0, 20, 56, 70, 0, 56, + 70, 0, 68, 0, 20, 40, 71, 41, 0, 71, + 44, 20, 0, 20, 0, 37, 24, 0, 39, 0, + 35, 60, 69, 62, 20, 40, 75, 41, 74, 72, + 0, 56, 35, 60, 68, 62, 20, 40, 75, 41, + 74, 72, 0, 34, 56, 62, 20, 40, 75, 41, + 74, 72, 0, 56, 34, 62, 20, 40, 75, 41, + 74, 72, 0, 34, 62, 20, 40, 75, 41, 74, + 72, 0, 36, 40, 22, 41, 62, 20, 40, 75, + 41, 74, 72, 0, 56, 62, 20, 40, 75, 41, + 74, 72, 0, 20, 40, 20, 41, 72, 0, 19, + 81, 0, 19, 37, 24, 0, 0, 6, 0, 20, + 0, 20, 44, 76, 0, 76, 0, 77, 44, 10, + 0, 77, 0, 77, 44, 78, 0, 78, 0, 62, + 20, 0, 62, 20, 23, 0, 62, 20, 40, 20, + 79, 41, 0, 62, 20, 23, 40, 20, 79, 41, + 0, 79, 80, 0, 80, 0, 20, 0, 45, 81, + 0, 46, 81, 0, 45, 47, 81, 0, 46, 47, + 81, 0, 47, 47, 81, 0, 48, 47, 81, 0, + 21, 0, 49, 21, 0, 20, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 179, 180, 181, 182, 185, 189, 193, 197, 203, 210, - 215, 216, 217, 218, 219, 220, 223, 226, 230, 259, - 285, 286, 289, 292, 298, 299, 307, 311, 318, 321, - 324, 327, 330, 333, 336, 339, 342, 345, 349, 352, - 357, 360, 363, 366, 369, 374, 377, 380, 385, 386, - 389, 401, 413, 416, 428, 433, 438, 441, 446, 447, - 451, 461, 471, 481, 487, 492, 497, 518, 519, 523, - 524, 527, 528, 544, 559, 562, 563, 566, 567, 570, - 573, 583, 584, 587, 600, 604, 608, 612, 616, 620, - 626, 627, 631 + 222, 223, 224, 225, 228, 234, 240, 246, 252, 258, + 266, 267, 270, 275, 282, 287, 288, 289, 290, 291, + 292, 295, 296, 297, 300, 303, 307, 342, 372, 381, + 387, 388, 391, 394, 400, 401, 409, 413, 420, 423, + 426, 429, 432, 435, 438, 441, 444, 447, 451, 454, + 459, 462, 465, 468, 471, 476, 479, 482, 487, 488, + 492, 504, 510, 522, 534, 537, 543, 548, 551, 556, + 557, 561, 571, 581, 591, 601, 611, 617, 622, 643, + 644, 648, 651, 652, 663, 673, 676, 677, 680, 681, + 684, 687, 690, 698, 708, 709, 712, 725, 729, 733, + 737, 741, 745, 751, 752, 756 }; #endif @@ -305,161 +361,184 @@ 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", -"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","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE", +"PROTECTED","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'('", +"')'","'|'","'*'","','","'>'","'<'","'='","'!'","'-'","prog","ccode","ccodes", +"class","classdec","classcode","scope","variable","argument","argtype","flags", +"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, - 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 + 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, + 52, 52, 53, 53, 54, 55, 55, 55, 55, 55, + 55, 56, 56, 56, 57, 57, 58, 58, 59, 59, + 60, 60, 61, 61, 62, 62, 63, 63, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 65, 65, 65, 65, 65, 66, 66, 66, 67, 67, + 68, 68, 69, 69, 69, 69, 70, 71, 71, 72, + 72, 73, 73, 73, 73, 73, 73, 73, 73, 74, + 74, 74, 75, 75, 75, 75, 76, 76, 77, 77, + 78, 78, 78, 78, 79, 79, 80, 80, 80, 80, + 80, 80, 80, 81, 81, 81 }; 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, 2, 2, 1, 1, 1, 1, 1, 1, 1, + 2, 1, 4, 3, 4, 2, 2, 2, 1, 1, + 1, 1, 1, 1, 4, 5, 11, 8, 5, 1, 3, 0, 3, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, - 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 + 2, 1, 3, 3, 2, 1, 4, 3, 1, 2, + 1, 10, 11, 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 + 0, 5, 7, 8, 6, 9, 10, 12, 0, 4, + 0, 0, 11, 3, 2, 0, 0, 1, 0, 22, + 23, 24, 32, 0, 32, 0, 14, 0, 0, 20, + 21, 19, 15, 0, 0, 0, 0, 50, 58, 57, + 56, 0, 0, 52, 54, 55, 46, 45, 44, 47, + 49, 0, 0, 35, 37, 41, 0, 0, 0, 13, + 17, 18, 16, 0, 32, 0, 0, 34, 0, 30, + 0, 36, 43, 40, 42, 39, 51, 53, 0, 0, + 60, 38, 48, 0, 0, 66, 0, 62, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 59, + 0, 0, 0, 61, 0, 65, 0, 0, 0, 0, + 0, 0, 25, 0, 0, 71, 79, 33, 0, 0, + 0, 50, 47, 0, 0, 86, 88, 90, 69, 0, + 64, 63, 0, 0, 0, 0, 26, 0, 70, 0, + 0, 0, 0, 91, 82, 0, 67, 0, 0, 0, + 0, 0, 82, 29, 0, 82, 85, 92, 0, 0, + 0, 87, 89, 68, 0, 0, 82, 0, 0, 0, + 28, 0, 0, 0, 106, 104, 0, 0, 80, 76, + 82, 0, 0, 0, 78, 0, 74, 0, 97, 0, + 0, 0, 0, 0, 96, 81, 105, 0, 82, 75, + 82, 0, 0, 0, 98, 0, 99, 0, 0, 93, + 95, 72, 0, 0, 27, 94, 100, 101, 102, 103, + 77, 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[] = { 223, + 8, 9, 10, 11, 28, 29, 30, 31, 71, 36, + 69, 124, 54, 55, 56, 57, 82, 86, 87, 88, + 130, 117, 32, 161, 125, 126, 127, 128, 194, 195, + 179 }; -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[] = { 136, + 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 119, + 32, 10,-32768, 119, 119, 146, 67, 119, 40,-32768, +-32768,-32768, 57, 120, 57, 68,-32768, 155, 59,-32768, +-32768,-32768,-32768, 78, 95, 96, 242,-32768,-32768,-32768, +-32768, 252, 258, 115, 126,-32768,-32768,-32768,-32768,-32768, +-32768, 207, 129,-32768, 113,-32768, 137, 70, 151,-32768, +-32768,-32768,-32768, 207, 57, 138, 133, 141, 167, 152, + 190,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 197, 186, + 113,-32768,-32768, 2, 208,-32768, 207,-32768, 194, 224, + 226, -19, 131, 95,-32768, 232, 241, 223, 225,-32768, + 228, 249, 254,-32768, -4,-32768, 255, 207, 237, -4, + 207, 239,-32768, 225, 256,-32768,-32768,-32768, 207, 244, + 225, 238, 47, 262, 243,-32768, 245,-32768,-32768, 66, +-32768,-32768, 246, 263, 225, 265,-32768, 247,-32768, 250, + 266, 251, 207, 7, 268, 189,-32768, 273, 225, 257, + 253, 259, 268,-32768, -1, 268,-32768, 260, 275, -10, + 131,-32768,-32768,-32768, 261, 225, 268, 225, 131, 264, +-32768, 131, 276, 76,-32768,-32768, 274, 282,-32768,-32768, + 268, 267, 131, 269,-32768, 280,-32768, 76,-32768, 62, + 65, 270, 271, 58,-32768,-32768,-32768, 131, 268,-32768, + 268, 272, 72, -8,-32768, -8,-32768, -8, -8,-32768, +-32768,-32768, 131, 131,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 305, 306,-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 + 37, 145, 298,-32768,-32768, -23, 281, 284,-32768, -17, + 219, -24, 277,-32768, 15,-32768, 234, 229,-32768, -60, +-32768, -154, 288, -150, -112, 176,-32768, 175, 134, -141, + -37 }; -#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 322 + + +static const short yytable[] = { 53, + 52, 138, 169, 112, 66, 172, 180, 58, 142, 175, + 176, 175, 176, 17, 185, 101, 183, 187, 170, 113, + 114, 101, 151, 104, 106, 12, 177, 79, 200, 158, + 198, 20, 21, 22, 85, 102, 165, 171, 178, 90, + 178, 102, 131, 212, 132, 13, 159, 91, 213, 104, + 214, 13, 211, 182, 13, 184, 74, 76, 221, 222, + 103, 211, 107, 37, 38, 39, 40, 41, 16, 42, + 43, 44, 45, 46, 47, 48, 49, 189, 50, 34, + 51, 175, 176, 134, 175, 176, 136, -84, 33, 84, + 143, 189, 64, 65, 140, 189, 35, 67, 210, 20, + 21, 22, 190, 191, 192, 193, 147, 59, 204, 148, + 178, 206, 216, 178, 68, 70, 190, 191, 192, 193, + 190, 191, 192, 193, 37, 38, 39, 40, 41, 77, + 42, 43, 44, 45, 46, 47, 48, 49, 1, 50, + 78, 51, 2, 3, 4, 5, 6, 7, 80, 20, + 21, 22, 205, 207, 15, 81, 83, 92, 18, 2, + 3, 4, 5, 6, 7, 19, 217, 115, 218, 116, + 219, 220, 89, 93, 19, 20, 21, 22, 23, 24, + 25, 26, 94, 27, 20, 21, 22, 23, 24, 25, + 26, 96, 60, 37, 38, 39, 40, 41, 162, 42, + 43, 44, 45, 46, 47, 48, 49, 95, 50, 97, + 51, 37, 38, 39, 40, 41, 98, 42, 43, 44, + 45, 46, 47, 48, 49, 99, 50, 105, 51, 37, + 122, 39, 40, 41, 108, 42, 43, 44, 45, 46, + 47, 48, 49, 109, 123, 110, 51, 38, 39, 40, + 41, 119, 42, 43, 44, 45, 46, 47, 48, 49, + 120, 50, 121, 51, 44, 45, 46, 102, 129, 73, + 44, 45, 46, 101, 133, 75, 135, 137, -83, 139, + 141, 144, 150, 145, 152, 149, 160, 153, 146, 155, + 154, 156, 164, 167, 174, 188, 166, 196, 168, 173, + 186, 181, 197, 202, 224, 225, 14, 199, 61, 201, + 215, 62, 118, 72, 100, 63, 208, 209, 157, 111, + 163, 203 }; -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[] = { 24, + 24, 114, 153, 23, 29, 156, 161, 25, 121, 20, + 21, 20, 21, 4, 169, 20, 167, 172, 20, 39, + 40, 20, 135, 84, 85, 22, 37, 52, 183, 23, + 181, 30, 31, 32, 58, 40, 149, 39, 49, 64, + 49, 40, 103, 198, 105, 9, 40, 65, 199, 110, + 201, 15, 194, 166, 18, 168, 42, 43, 213, 214, + 84, 203, 87, 5, 6, 7, 8, 9, 37, 11, + 12, 13, 14, 15, 16, 17, 18, 20, 20, 40, + 22, 20, 21, 108, 20, 21, 111, 41, 22, 20, + 44, 20, 34, 35, 119, 20, 40, 20, 41, 30, + 31, 32, 45, 46, 47, 48, 41, 40, 47, 44, + 49, 47, 41, 49, 20, 20, 45, 46, 47, 48, + 45, 46, 47, 48, 5, 6, 7, 8, 9, 15, + 11, 12, 13, 14, 15, 16, 17, 18, 3, 20, + 15, 22, 24, 25, 26, 27, 28, 29, 20, 30, + 31, 32, 190, 191, 10, 43, 20, 20, 14, 24, + 25, 26, 27, 28, 29, 20, 204, 37, 206, 39, + 208, 209, 22, 41, 20, 30, 31, 32, 33, 34, + 35, 36, 42, 38, 30, 31, 32, 33, 34, 35, + 36, 40, 38, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 41, 20, 20, + 22, 5, 6, 7, 8, 9, 20, 11, 12, 13, + 14, 15, 16, 17, 18, 40, 20, 20, 22, 5, + 6, 7, 8, 9, 41, 11, 12, 13, 14, 15, + 16, 17, 18, 20, 20, 20, 22, 6, 7, 8, + 9, 20, 11, 12, 13, 14, 15, 16, 17, 18, + 20, 20, 40, 22, 13, 14, 15, 40, 20, 18, + 13, 14, 15, 20, 20, 18, 40, 39, 41, 24, + 37, 20, 20, 41, 20, 40, 19, 41, 44, 24, + 41, 41, 20, 41, 20, 20, 40, 24, 40, 40, + 37, 41, 21, 24, 0, 0, 9, 41, 28, 41, + 39, 28, 94, 37, 81, 28, 47, 47, 143, 91, + 146, 188 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1005,119 +1084,179 @@ yyreduce: switch (yyn) { case 1: -#line 179 "parse.y" +#line 222 "parse.y" { ; ; break;} case 2: -#line 180 "parse.y" +#line 223 "parse.y" { ; ; break;} case 3: -#line 181 "parse.y" +#line 224 "parse.y" { ; ; break;} case 4: -#line 182 "parse.y" +#line 225 "parse.y" { ; ; break;} case 5: -#line 185 "parse.y" +#line 228 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 6: -#line 189 "parse.y" +#line 234 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 7: -#line 193 "parse.y" +#line 240 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 8: -#line 197 "parse.y" +#line 246 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 9: -#line 203 "parse.y" +#line 252 "parse.y" +{ + Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 10: +#line 258 "parse.y" +{ + Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; + break;} +case 11: +#line 266 "parse.y" +{ ; ; + break;} +case 12: +#line 267 "parse.y" +{ ; ; + break;} +case 13: +#line 270 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 10: -#line 210 "parse.y" +case 14: +#line 275 "parse.y" +{ + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); + ; + break;} +case 15: +#line 282 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} -case 11: -#line 215 "parse.y" +case 16: +#line 287 "parse.y" { ; ; break;} -case 12: -#line 216 "parse.y" +case 17: +#line 288 "parse.y" { ; ; break;} -case 13: -#line 217 "parse.y" +case 18: +#line 289 "parse.y" { ; ; break;} -case 14: -#line 218 "parse.y" +case 19: +#line 290 "parse.y" { ; ; break;} -case 15: -#line 219 "parse.y" +case 20: +#line 291 "parse.y" { ; ; break;} -case 16: -#line 220 "parse.y" +case 21: +#line 292 "parse.y" { ; ; break;} -case 17: -#line 223 "parse.y" +case 22: +#line 295 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 23: +#line 296 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 24: +#line 297 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 25: +#line 300 "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 226 "parse.y" +case 26: +#line 303 "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 230 "parse.y" +case 27: +#line 307 "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); @@ -1130,22 +1269,26 @@ case 19: } ; break;} -case 20: -#line 259 "parse.y" +case 28: +#line 342 "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); @@ -1157,32 +1300,51 @@ case 20: } ; break;} -case 21: -#line 285 "parse.y" +case 29: +#line 372 "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 30: +#line 381 "parse.y" +{ + yyval.id = yyvsp[0].id; + typestack = g_list_prepend(typestack,NULL); + ; + break;} +case 31: +#line 387 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 286 "parse.y" +case 32: +#line 388 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 289 "parse.y" +case 33: +#line 391 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 292 "parse.y" +case 34: +#line 394 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 298 "parse.y" +case 35: +#line 400 "parse.y" { ; ; break;} -case 26: -#line 299 "parse.y" +case 36: +#line 401 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1190,157 +1352,157 @@ case 26: g_free(oldname); ; break;} -case 27: -#line 307 "parse.y" +case 37: +#line 409 "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 311 "parse.y" +case 38: +#line 413 "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 318 "parse.y" +case 39: +#line 420 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 30: -#line 321 "parse.y" +case 40: +#line 423 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 31: -#line 324 "parse.y" +case 41: +#line 426 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 32: -#line 327 "parse.y" +case 42: +#line 429 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 33: -#line 330 "parse.y" +case 43: +#line 432 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 34: -#line 333 "parse.y" +case 44: +#line 435 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 35: -#line 336 "parse.y" +case 45: +#line 438 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 36: -#line 339 "parse.y" +case 46: +#line 441 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 37: -#line 342 "parse.y" +case 47: +#line 444 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 345 "parse.y" +case 48: +#line 447 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 39: -#line 349 "parse.y" +case 49: +#line 451 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 40: -#line 352 "parse.y" +case 50: +#line 454 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 41: -#line 357 "parse.y" +case 51: +#line 459 "parse.y" { yyval.id = "long int"; ; break;} -case 42: -#line 360 "parse.y" +case 52: +#line 462 "parse.y" { yyval.id = "long"; ; break;} -case 43: -#line 363 "parse.y" +case 53: +#line 465 "parse.y" { yyval.id = "short int"; ; break;} -case 44: -#line 366 "parse.y" +case 54: +#line 468 "parse.y" { yyval.id = "short"; ; break;} -case 45: -#line 369 "parse.y" +case 55: +#line 471 "parse.y" { yyval.id = "int"; ; break;} -case 46: -#line 374 "parse.y" +case 56: +#line 476 "parse.y" { yyval.id = "enum "; ; break;} -case 47: -#line 377 "parse.y" +case 57: +#line 479 "parse.y" { yyval.id = "union "; ; break;} -case 48: -#line 380 "parse.y" +case 58: +#line 482 "parse.y" { yyval.id = "struct "; ; break;} -case 49: -#line 385 "parse.y" +case 59: +#line 487 "parse.y" { stars++; ; break;} -case 50: -#line 386 "parse.y" +case 60: +#line 488 "parse.y" { stars++; ; break;} -case 51: -#line 389 "parse.y" +case 61: +#line 492 "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); @@ -1349,29 +1511,14 @@ case 51: g_free(yyvsp[-1].id); ; break;} -case 52: -#line 401 "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 413 "parse.y" +case 62: +#line 504 "parse.y" { - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 54: -#line 416 "parse.y" +case 63: +#line 510 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1385,115 +1532,155 @@ case 54: g_free(yyvsp[-1].id); ; break;} -case 55: -#line 428 "parse.y" +case 64: +#line 522 "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 65: +#line 534 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 433 "parse.y" +case 66: +#line 537 "parse.y" +{ + /* the_scope was default thus public */ + the_scope = PUBLIC_SCOPE; + ; + break;} +case 67: +#line 543 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 57: -#line 438 "parse.y" +case 68: +#line 548 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 58: -#line 441 "parse.y" +case 69: +#line 551 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 59: -#line 446 "parse.y" -{ yyval.cbuf=yyvsp[0].cbuf; ; +case 70: +#line 556 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 60: -#line 447 "parse.y" +case 71: +#line 557 "parse.y" { yyval.cbuf = NULL; ; break;} -case 61: -#line 451 "parse.y" +case 72: +#line 561 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + push_function(the_scope, yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 62: -#line 461 "parse.y" +case 73: +#line 571 "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[-9].line, + ccode_line, vararg, yyvsp[-8].list); + ; + break;} +case 74: +#line 581 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + ccode_line, vararg, NULL); ; break;} -case 63: -#line 471 "parse.y" +case 75: +#line 591 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 64: -#line 481 "parse.y" +case 76: +#line 601 "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, NULL); ; break;} -case 65: -#line 487 "parse.y" +case 77: +#line 611 "parse.y" { - push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, - vararg); - ; + push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, + yyvsp[-10].line, ccode_line, + vararg, NULL); + ; break;} -case 66: -#line 492 "parse.y" +case 78: +#line 617 "parse.y" { - push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, - vararg); + push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + vararg, NULL); ; break;} -case 67: -#line 497 "parse.y" +case 79: +#line 622 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + push_function(NO_SCOPE, INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); } else if(strcmp(yyvsp[-4].id,"class_init")==0) { push_init_arg(yyvsp[-2].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); @@ -1503,40 +1690,31 @@ case 67: } ; break;} -case 68: -#line 518 "parse.y" +case 80: +#line 643 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 69: -#line 519 "parse.y" +case 81: +#line 644 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 70: -#line 523 "parse.y" -{ ; ; - break;} -case 71: -#line 524 "parse.y" +case 82: +#line 648 "parse.y" { yyval.id = NULL; ; break;} -case 72: -#line 527 "parse.y" +case 83: +#line 651 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 73: -#line 528 "parse.y" +case 84: +#line 652 "parse.y" { vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[0].id,"this")==0) { - push_self(yyvsp[0].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[0].id,"self")==0) + if(strcmp(yyvsp[0].id,"self")==0) push_self(yyvsp[0].id); else { g_free(yyvsp[0].id); @@ -1545,16 +1723,11 @@ case 73: } ; break;} -case 74: -#line 544 "parse.y" +case 85: +#line 663 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-2].id,"this")==0) { - push_self(yyvsp[-2].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[-2].id,"self")==0) + if(strcmp(yyvsp[-2].id,"self")==0) push_self(yyvsp[-2].id); else { g_free(yyvsp[-2].id); @@ -1563,53 +1736,70 @@ case 74: } ; break;} -case 75: -#line 559 "parse.y" +case 86: +#line 673 "parse.y" { has_self = FALSE; ; break;} -case 76: -#line 562 "parse.y" +case 87: +#line 676 "parse.y" { vararg = TRUE; ; break;} -case 77: -#line 563 "parse.y" +case 88: +#line 677 "parse.y" { vararg = FALSE; ; break;} -case 78: -#line 566 "parse.y" +case 89: +#line 680 "parse.y" { ; ; break;} -case 79: -#line 567 "parse.y" +case 90: +#line 681 "parse.y" { ; ; break;} -case 80: -#line 570 "parse.y" +case 91: +#line 684 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 81: -#line 573 "parse.y" +case 92: +#line 687 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 93: +#line 690 "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 583 "parse.y" +case 94: +#line 698 "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 95: +#line 708 "parse.y" { ; ; break;} -case 83: -#line 584 "parse.y" +case 96: +#line 709 "parse.y" { ; ; break;} -case 84: -#line 587 "parse.y" +case 97: +#line 712 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1624,61 +1814,61 @@ case 84: g_free(yyvsp[0].id); ; break;} -case 85: -#line 600 "parse.y" +case 98: +#line 725 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 604 "parse.y" +case 99: +#line 729 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 608 "parse.y" +case 100: +#line 733 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 88: -#line 612 "parse.y" +case 101: +#line 737 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 89: -#line 616 "parse.y" +case 102: +#line 741 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 90: -#line 620 "parse.y" +case 103: +#line 745 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 91: -#line 626 "parse.y" +case 104: +#line 751 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 92: -#line 627 "parse.y" +case 105: +#line 752 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 93: -#line 631 "parse.y" +case 106: +#line 756 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1903,5 +2093,5 @@ yyerrhandle: } return 1; } -#line 634 "parse.y" +#line 759 "parse.y"