X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/4c9cb9b99991c36920bd17e366e2128d1b22eb6e..refs/tags/v0.92.0:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 708486f..6614f29 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,38 +1,39 @@ /* A Bison parser, made from parse.y - by GNU Bison version 1.27 - */ + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ #define CLASS 257 #define FROM 258 -#define VOID 259 -#define STRUCT 260 -#define UNION 261 -#define ENUM 262 -#define SIGNED 263 -#define UNSIGNED 264 -#define LONG 265 -#define SHORT 266 -#define INT 267 -#define FLOAT 268 -#define DOUBLE 269 -#define CHAR 270 -#define FIRST 271 -#define LAST 272 +#define CONST 259 +#define VOID 260 +#define STRUCT 261 +#define UNION 262 +#define ENUM 263 +#define THREEDOTS 264 +#define SIGNED 265 +#define UNSIGNED 266 +#define LONG 267 +#define SHORT 268 +#define INT 269 +#define FLOAT 270 +#define DOUBLE 271 +#define CHAR 272 #define ONERROR 273 #define TOKEN 274 #define NUMBER 275 #define TYPETOKEN 276 -#define CCODE 277 -#define HCODE 278 -#define PUBLIC 279 -#define PRIVATE 280 -#define ARGUMENT 281 -#define VIRTUAL 282 -#define SIGNAL 283 -#define OVERRIDE 284 +#define ARRAY_DIM 277 +#define CCODE 278 +#define HCODE 279 +#define PUBLIC 280 +#define PRIVATE 281 +#define PROTECTED 282 +#define ARGUMENT 283 +#define VIRTUAL 284 +#define SIGNAL 285 +#define OVERRIDE 286 #line 21 "parse.y" @@ -43,6 +44,7 @@ #include #include "tree.h" +#include "main.h" #define _(x) (x) @@ -57,10 +59,15 @@ static GList *typestack = NULL; static int stars = 0; static GList *funcargs = NULL; static GList *checks = NULL; -static int has_this = FALSE; +static int has_self = FALSE; +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,32 +102,63 @@ yyerror(char *str) } static void -push_variable(char *name, int scope) +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->postfix = postfix; - var = new_variable(scope,type,name); + 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) +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 { - 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); + /* 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,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; @@ -128,11 +166,13 @@ 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->postfix = postfix; node = new_funcarg(type,name,checks); checks = NULL; @@ -152,31 +192,32 @@ 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); } static void -push_this(char *this) +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,this,ch); + node = new_funcarg((Type *)type,id,ch); funcargs = g_list_prepend(funcargs, node); } -#line 158 "parse.y" +#line 197 "parse.y" typedef union { char *id; GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -192,26 +233,26 @@ typedef union { -#define YYFINAL 190 +#define YYFINAL 214 #define YYFLAG -32768 -#define YYNTBASE 45 +#define YYNTBASE 46 -#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69) +#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, 43, 2, 2, 2, 2, 2, 2, 34, - 35, 37, 2, 38, 44, 2, 2, 2, 40, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 33, 42, - 39, 41, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 44, 2, 2, 2, 2, 2, 2, 36, + 37, 39, 2, 40, 45, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 35, 42, + 43, 41, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 31, 36, 32, 2, 2, 2, 2, 2, + 2, 2, 33, 38, 34, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -227,72 +268,76 @@ 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 }; #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, 97, 100, 102, - 105, 108, 110, 112, 114, 116, 119, 121, 123, 126, - 128, 131, 133, 135, 137, 139, 141, 144, 146, 151, - 155, 157, 169, 180, 191, 201, 211, 220, 233, 243, - 253, 259, 266, 269, 272, 276, 279, 280, 282, 284, - 288, 290, 294, 296, 299, 306, 309, 311, 313, 316, - 319, 323, 327, 331, 335, 337 + 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[] = { 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, 61, 0, 49, 50, 0, 49, 51, 0, - 61, 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, - 55, 58, 0, 10, 56, 0, 9, 56, 0, 56, - 0, 10, 16, 0, 9, 16, 0, 16, 0, 15, - 0, 14, 0, 20, 0, 57, 20, 0, 22, 0, - 5, 0, 11, 13, 0, 11, 0, 12, 13, 0, - 12, 0, 13, 0, 8, 0, 7, 0, 6, 0, - 37, 58, 0, 37, 0, 20, 34, 60, 35, 0, - 60, 38, 20, 0, 20, 0, 29, 20, 59, 54, - 20, 34, 63, 35, 62, 31, 23, 0, 29, 20, - 59, 54, 20, 34, 63, 35, 62, 33, 0, 29, - 59, 54, 20, 34, 63, 35, 62, 31, 23, 0, - 29, 59, 54, 20, 34, 63, 35, 62, 33, 0, - 28, 54, 20, 34, 63, 35, 62, 31, 23, 0, - 28, 54, 20, 34, 63, 35, 62, 33, 0, 30, - 34, 22, 35, 54, 20, 34, 63, 35, 62, 31, - 23, 0, 25, 54, 20, 34, 63, 35, 62, 31, - 23, 0, 26, 54, 20, 34, 63, 35, 62, 31, - 23, 0, 20, 34, 20, 35, 33, 0, 20, 34, - 20, 35, 31, 23, 0, 19, 20, 0, 19, 68, - 0, 19, 31, 23, 0, 39, 40, 0, 0, 5, - 0, 20, 0, 20, 38, 64, 0, 64, 0, 64, - 38, 65, 0, 65, 0, 54, 20, 0, 54, 20, - 34, 20, 66, 35, 0, 66, 67, 0, 67, 0, - 20, 0, 41, 68, 0, 42, 68, 0, 41, 39, - 68, 0, 42, 39, 68, 0, 39, 39, 68, 0, - 43, 39, 68, 0, 21, 0, 44, 21, 0 +static const short yyrhs[] = { 47, + 48, 47, 0, 48, 47, 0, 47, 48, 0, 48, + 0, 47, 24, 0, 47, 25, 0, 24, 0, 25, + 0, 49, 33, 50, 34, 0, 49, 33, 34, 0, + 3, 22, 4, 22, 0, 50, 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, - 176, 177, 178, 179, 182, 186, 190, 194, 200, 207, - 212, 213, 214, 215, 216, 217, 220, 223, 227, 254, - 278, 279, 282, 285, 291, 295, 302, 305, 308, 311, - 314, 317, 320, 323, 326, 329, 333, 336, 341, 344, - 347, 350, 353, 358, 361, 364, 369, 370, 373, 378, - 381, 387, 408, 428, 437, 446, 450, 454, 458, 462, - 466, 482, 503, 504, 505, 509, 510, 515, 516, 526, - 536, 539, 540, 543, 546, 556, 557, 560, 573, 577, - 581, 585, 589, 593, 599, 600 + 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 @@ -300,150 +345,185 @@ static const short yyrline[] = { 0, #if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","CLASS", -"FROM","VOID","STRUCT","UNION","ENUM","SIGNED","UNSIGNED","LONG","SHORT","INT", -"FLOAT","DOUBLE","CHAR","FIRST","LAST","ONERROR","TOKEN","NUMBER","TYPETOKEN", -"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE", -"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'", -"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags", -"flaglist","type","type1","integer","tspecifier","stars","sigtype","tokenlist", -"method","onerror","funcargs","arglist","arg","checklist","check","number", NULL +"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","PROTECTED","ARGUMENT","VIRTUAL", +"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'", +"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable", +"argument","argflags","flaglist","type","type1","type2","integer","tspecifier", +"stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode","method", +"onerror","funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL }; #endif static const short yyr1[] = { 0, - 45, 45, 45, 45, 46, 46, 46, 46, 47, 48, - 49, 49, 49, 49, 49, 49, 50, 50, 51, 51, - 52, 52, 53, 53, 54, 54, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, - 56, 56, 56, 57, 57, 57, 58, 58, 59, 60, - 60, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, - 63, 64, 64, 65, 65, 66, 66, 67, 67, 67, - 67, 67, 67, 67, 68, 68 + 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, 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, 4, 11, 8, - 3, 0, 3, 1, 1, 2, 2, 2, 1, 2, - 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, - 2, 1, 1, 1, 1, 1, 2, 1, 4, 3, - 1, 11, 10, 10, 9, 9, 8, 12, 9, 9, - 5, 6, 2, 2, 3, 2, 0, 1, 1, 3, - 1, 3, 1, 2, 6, 2, 1, 1, 2, 2, - 3, 3, 3, 3, 1, 2 + 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, 22, 0, 0, - 0, 0, 15, 16, 14, 10, 0, 38, 46, 45, - 44, 0, 0, 40, 42, 43, 34, 33, 32, 35, - 37, 0, 25, 29, 0, 0, 0, 0, 0, 0, - 0, 0, 9, 12, 13, 11, 0, 31, 28, 30, - 27, 39, 41, 0, 48, 26, 36, 0, 24, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, - 47, 18, 0, 0, 21, 0, 0, 51, 0, 0, - 0, 0, 0, 61, 38, 35, 0, 0, 71, 73, - 0, 23, 0, 0, 49, 0, 0, 0, 0, 62, - 0, 74, 67, 0, 67, 0, 67, 50, 0, 0, - 0, 70, 0, 0, 0, 0, 72, 0, 0, 0, - 0, 67, 0, 0, 63, 85, 0, 0, 64, 66, - 0, 0, 0, 20, 0, 57, 67, 0, 0, 78, - 0, 0, 0, 0, 0, 77, 65, 86, 59, 60, - 0, 56, 0, 0, 55, 67, 0, 0, 79, 0, - 80, 0, 75, 76, 0, 0, 53, 54, 0, 83, - 81, 82, 84, 19, 52, 0, 58, 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[] = { 188, - 4, 5, 6, 22, 23, 24, 48, 70, 97, 43, - 44, 45, 66, 51, 89, 25, 126, 98, 99, 100, - 155, 156, 139 +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[] = { 20, - 34,-32768,-32768, 42, 37, -9, 60,-32768,-32768, 37, - 44, 100, 69, 44, 78, 73, 73, 88, 73, 74, - 97, 89,-32768,-32768,-32768,-32768, 120,-32768,-32768,-32768, --32768, 0, 58, 128, 129,-32768,-32768,-32768,-32768,-32768, --32768, 123, 107,-32768, 125, 126, 127, 130, 131, 28, - 73, 132,-32768,-32768,-32768,-32768, 113,-32768,-32768,-32768, --32768,-32768,-32768, 90, 107,-32768,-32768, 103, 116, 114, - 133, 121, 122, 137, 73, 138, 124, 59,-32768, 91, --32768,-32768, 91, 127,-32768, 140, 91,-32768, 14, 141, - 134, 73, 139,-32768, 135, 16, 143, 136, 142,-32768, - 144,-32768, 145, 146,-32768, 147, 148, 91, 149,-32768, - 73, 150, 7, 73, 7, 151, 7,-32768, 91, 152, - 154, 142, 153, -13, 155, 158,-32768, 159, 30, 77, - 156, 7, 91, -3,-32768,-32768, 160, 157,-32768,-32768, - 162, 163, 161,-32768, 170,-32768, 7, 101, 164,-32768, - 165, -7, 3, 166, -14,-32768,-32768,-32768,-32768,-32768, - 171,-32768, 102, 173,-32768, 7, -11, -11,-32768, -11, --32768, -11,-32768,-32768, 167, 174,-32768,-32768, 172,-32768, --32768,-32768,-32768,-32768,-32768, 175,-32768, 177, 201,-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, - 10, 168,-32768,-32768, 180, 184,-32768, 80, -16,-32768, - 106,-32768, 110, 115,-32768, 185, -113, -78, 55, 94, --32768, 54, -95 + 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 209 - - -static const short yytable[] = { 42, - 46, 128, 49, 130, 101, 150, 135, 136, 104, 136, - 34, 35, 36, 136, 11, 58, 150, 137, 148, 14, - 173, 12, 1, 136, 151, 124, 152, 153, 154, 120, - 138, 168, 138, 163, 76, 151, 138, 152, 153, 154, - 131, 170, 2, 3, 1, 125, 138, 73, 105, 143, - -69, 106, 179, 111, 149, 7, 169, 171, 90, 2, - 3, 74, 144, 13, 8, 9, 8, 9, 34, 35, - 36, 180, 181, 60, 182, 109, 183, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 93, - 26, 94, 40, 50, 41, 95, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 145, 15, 146, - 96, 27, 41, 16, 17, 18, 19, 20, 21, 15, - 53, 47, 79, 80, 16, 17, 18, 19, 20, 21, - 52, 164, 176, 165, 177, 82, 83, 59, 61, 57, - 62, 63, 64, 65, 67, 68, 69, 78, 85, 71, - 72, 84, 86, 77, 87, 74, 88, 91, 92, 103, - 107, 110, 112, 102, 75, 122, 118, 108, 121, -68, - 113, 10, 134, 129, 81, 116, 189, 158, 115, 114, - 117, 119, 157, 123, 159, 160, 132, 133, 141, 142, - 147, 161, 162, 175, 140, 178, 185, 187, 166, 184, - 190, 54, 186, 167, 172, 55, 56, 127, 174 +#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, 115, 19, 117, 83, 20, 20, 21, 87, 21, - 11, 12, 13, 21, 5, 16, 20, 31, 132, 10, - 35, 31, 3, 21, 39, 19, 41, 42, 43, 108, - 44, 39, 44, 147, 51, 39, 44, 41, 42, 43, - 119, 39, 23, 24, 3, 39, 44, 20, 35, 20, - 35, 38, 166, 38, 133, 22, 152, 153, 75, 23, - 24, 34, 33, 4, 23, 24, 23, 24, 11, 12, - 13, 167, 168, 16, 170, 92, 172, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 31, - 22, 33, 20, 20, 22, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 31, 20, 33, - 20, 34, 22, 25, 26, 27, 28, 29, 30, 20, - 32, 34, 33, 34, 25, 26, 27, 28, 29, 30, - 34, 31, 31, 33, 33, 33, 34, 32, 33, 20, - 13, 13, 20, 37, 20, 20, 20, 35, 35, 20, - 20, 36, 20, 22, 34, 34, 20, 20, 35, 20, - 20, 23, 20, 84, 50, 111, 20, 34, 20, 35, - 35, 4, 20, 23, 65, 31, 0, 21, 35, 38, - 35, 34, 23, 34, 23, 23, 35, 34, 31, 31, - 35, 31, 23, 23, 40, 23, 23, 23, 35, 33, - 0, 22, 31, 39, 39, 22, 22, 114, 155 +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" -/* This file comes from bison-1.27. */ +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -656,7 +736,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif -#line 216 "/usr/lib/bison.simple" +#line 217 "/usr/lib/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -985,51 +1065,57 @@ yyreduce: switch (yyn) { case 1: -#line 176 "parse.y" +#line 216 "parse.y" { ; ; break;} case 2: -#line 177 "parse.y" +#line 217 "parse.y" { ; ; break;} case 3: -#line 178 "parse.y" +#line 218 "parse.y" { ; ; break;} case 4: -#line 179 "parse.y" +#line 219 "parse.y" { ; ; break;} case 5: -#line 182 "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 186 "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 190 "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 194 "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 200 "parse.y" +#line 246 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1037,65 +1123,91 @@ case 9: ; break;} case 10: -#line 207 "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 212 "parse.y" -{ ; ; +#line 258 "parse.y" +{ + class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + ; break;} case 12: -#line 213 "parse.y" +#line 263 "parse.y" { ; ; break;} case 13: -#line 214 "parse.y" +#line 264 "parse.y" { ; ; break;} case 14: -#line 215 "parse.y" +#line 265 "parse.y" { ; ; break;} case 15: -#line 216 "parse.y" +#line 266 "parse.y" { ; ; break;} case 16: -#line 217 "parse.y" +#line 267 "parse.y" { ; ; break;} case 17: -#line 220 "parse.y" +#line 268 "parse.y" +{ ; ; + break;} +case 18: +#line 271 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 19: +#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,PUBLIC_SCOPE); + push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL); ; break;} -case 18: -#line 223 "parse.y" +case 22: +#line 279 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE); + push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id); ; break;} -case 19: -#line 227 "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); @@ -1108,20 +1220,24 @@ case 19: } ; break;} -case 20: -#line 254 "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[-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); + 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); @@ -1133,368 +1249,403 @@ case 20: } ; break;} -case 21: -#line 278 "parse.y" +case 25: +#line 344 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 279 "parse.y" +case 26: +#line 345 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 282 "parse.y" +case 27: +#line 348 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 285 "parse.y" +case 28: +#line 351 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 291 "parse.y" +case 29: +#line 357 "parse.y" +{ ; ; + break;} +case 30: +#line 358 "parse.y" +{ + Type *type = typestack->data; + char *oldname = type->name; + type->name = g_strconcat("const ",oldname,NULL); + g_free(oldname); + ; + break;} +case 31: +#line 366 "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 26: -#line 295 "parse.y" +case 32: +#line 370 "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 27: -#line 302 "parse.y" +case 33: +#line 377 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 28: -#line 305 "parse.y" +case 34: +#line 380 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 29: -#line 308 "parse.y" +case 35: +#line 383 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 30: -#line 311 "parse.y" +case 36: +#line 386 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 31: -#line 314 "parse.y" +case 37: +#line 389 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 32: -#line 317 "parse.y" +case 38: +#line 392 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 33: -#line 320 "parse.y" +case 39: +#line 395 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 34: -#line 323 "parse.y" +case 40: +#line 398 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 35: -#line 326 "parse.y" +case 41: +#line 401 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 36: -#line 329 "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 37: -#line 333 "parse.y" +case 43: +#line 408 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 336 "parse.y" +case 44: +#line 411 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 39: -#line 341 "parse.y" +case 45: +#line 416 "parse.y" { yyval.id = "long int"; ; break;} -case 40: -#line 344 "parse.y" +case 46: +#line 419 "parse.y" { yyval.id = "long"; ; break;} -case 41: -#line 347 "parse.y" +case 47: +#line 422 "parse.y" { yyval.id = "short int"; ; break;} -case 42: -#line 350 "parse.y" +case 48: +#line 425 "parse.y" { yyval.id = "short"; ; break;} -case 43: -#line 353 "parse.y" +case 49: +#line 428 "parse.y" { yyval.id = "int"; ; break;} -case 44: -#line 358 "parse.y" +case 50: +#line 433 "parse.y" { yyval.id = "enum "; ; break;} -case 45: -#line 361 "parse.y" +case 51: +#line 436 "parse.y" { yyval.id = "union "; ; break;} -case 46: -#line 364 "parse.y" +case 52: +#line 439 "parse.y" { yyval.id = "struct "; ; break;} -case 47: -#line 369 "parse.y" +case 53: +#line 444 "parse.y" { stars++; ; break;} -case 48: -#line 370 "parse.y" +case 54: +#line 445 "parse.y" { stars++; ; break;} -case 49: -#line 373 "parse.y" +case 55: +#line 449 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 56: +#line 461 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 57: +#line 467 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +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 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 50: -#line 378 "parse.y" +case 62: +#line 505 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 51: -#line 381 "parse.y" +case 63: +#line 508 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 52: -#line 387 "parse.y" +case 64: +#line 513 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; + break;} +case 65: +#line 514 "parse.y" +{ yyval.cbuf = NULL; ; + break;} +case 66: +#line 518 "parse.y" { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp(yyvsp[-9].id,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-9].id,"last")==0) - sigtype = SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-9].id); - YYERROR; - } - g_free(yyvsp[-9].id); - - if(!has_this) { - yyerror(_("signal without 'this' as " + if(!has_self) { + yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(sigtype,NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line,yyvsp[-1].line); + 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 53: -#line 408 "parse.y" +case 67: +#line 528 "parse.y" { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp(yyvsp[-8].id,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-8].id,"last")==0) - sigtype = SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-8].id); - YYERROR; - } - g_free(yyvsp[-8].id); - if(!has_this) { - yyerror(_("signal without 'this' as " + if(!has_self) { + yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(sigtype, NULL, - yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line,0); + 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 54: -#line 428 "parse.y" +case 68: +#line 538 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " + if(!has_self) { + yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line,yyvsp[-1].line); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 55: -#line 437 "parse.y" +case 69: +#line 548 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " + if(!has_self) { + yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-8].line,0); - ; - break;} -case 56: -#line 446 "parse.y" -{ - push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, + ccode_line,vararg); ; break;} -case 57: -#line 450 "parse.y" +case 70: +#line 558 "parse.y" { - push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-7].line,0); + 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 58: -#line 454 "parse.y" +case 71: +#line 568 "parse.y" { - push_function(OVERRIDE_METHOD, yyvsp[-9].id, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].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 59: -#line 458 "parse.y" -{ - push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); - ; - break;} -case 60: -#line 462 "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 61: -#line 466 "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, yyvsp[-4].id, - NULL, NULL,yyvsp[-3].line,0); + 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, - yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0); + push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, + ccode_line,FALSE); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); + g_string_free(yyvsp[-2].cbuf,TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 62: -#line 482 "parse.y" -{ - if(strcmp(yyvsp[-5].id,"init")==0) { - push_init_arg(yyvsp[-3].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line); - } else if(strcmp(yyvsp[-5].id,"class_init")==0) { - push_init_arg(yyvsp[-3].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line); - } else { - g_free(yyvsp[-5].id); - g_free(yyvsp[-3].id); - g_string_free(yyvsp[-3].cbuf,TRUE); - yyerror(_("parse error")); - YYERROR; - } - ; - break;} -case 63: -#line 503 "parse.y" -{ yyval.id = yyvsp[0].id; ; - break;} -case 64: -#line 504 "parse.y" +case 74: +#line 600 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 65: -#line 505 "parse.y" +case 75: +#line 601 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 66: -#line 509 "parse.y" -{ ; ; - break;} -case 67: -#line 510 "parse.y" +case 76: +#line 605 "parse.y" { yyval.id = NULL; ; break;} -case 68: -#line 515 "parse.y" -{ has_this = FALSE; ; +case 77: +#line 608 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 69: -#line 516 "parse.y" +case 78: +#line 609 "parse.y" { - has_this = TRUE; - if(strcmp(yyvsp[0].id,"this")==0) - push_this(yyvsp[0].id); + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[0].id,"self")==0) + push_self(yyvsp[0].id); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -1502,12 +1653,12 @@ case 69: } ; break;} -case 70: -#line 526 "parse.y" +case 79: +#line 620 "parse.y" { - has_this = TRUE; - if(strcmp(yyvsp[-2].id,"this")==0) - push_this(yyvsp[-2].id); + has_self = TRUE; + if(strcmp(yyvsp[-2].id,"self")==0) + push_self(yyvsp[-2].id); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -1515,45 +1666,70 @@ case 70: } ; break;} -case 71: -#line 536 "parse.y" -{ has_this = FALSE; ; +case 80: +#line 630 "parse.y" +{ has_self = FALSE; ; break;} -case 72: -#line 539 "parse.y" +case 81: +#line 633 "parse.y" +{ vararg = TRUE; ; + break;} +case 82: +#line 634 "parse.y" +{ vararg = FALSE; ; + break;} +case 83: +#line 637 "parse.y" { ; ; break;} -case 73: -#line 540 "parse.y" +case 84: +#line 638 "parse.y" { ; ; break;} -case 74: -#line 543 "parse.y" +case 85: +#line 641 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 75: -#line 546 "parse.y" +case 86: +#line 644 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 87: +#line 647 "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 76: -#line 556 "parse.y" +case 88: +#line 655 "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 89: +#line 665 "parse.y" { ; ; break;} -case 77: -#line 557 "parse.y" +case 90: +#line 666 "parse.y" { ; ; break;} -case 78: -#line 560 "parse.y" +case 91: +#line 669 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1568,62 +1744,66 @@ case 78: g_free(yyvsp[0].id); ; break;} -case 79: -#line 573 "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 80: -#line 577 "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 81: -#line 581 "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 82: -#line 585 "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 83: -#line 589 "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 84: -#line 593 "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 85: -#line 599 "parse.y" +case 98: +#line 708 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 86: -#line 600 "parse.y" +case 99: +#line 709 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} +case 100: +#line 713 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} } /* the action file gets copied in in place of this dollarsign */ -#line 542 "/usr/lib/bison.simple" +#line 543 "/usr/lib/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1843,5 +2023,5 @@ yyerrhandle: } return 1; } -#line 606 "parse.y" +#line 716 "parse.y"