X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b9f22ab5a7f4d4bfe0932debf8864a21b5c852cd..refs/tags/v0.91.2:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 7d3195d..1d226c4 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,41 +1,38 @@ /* 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 CHECK 273 -#define CNULL 274 -#define TYPE 275 -#define ONERROR 276 -#define TOKEN 277 -#define NUMBER 278 -#define TYPETOKEN 279 -#define CCODE 280 -#define HCODE 281 -#define PUBLIC 282 -#define PRIVATE 283 -#define ARGUMENT 284 -#define VIRTUAL 285 -#define SIGNAL 286 -#define OVERRIDE 287 +#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 ARRAY_DIM 277 +#define CCODE 278 +#define HCODE 279 +#define PUBLIC 280 +#define PRIVATE 281 +#define ARGUMENT 282 +#define VIRTUAL 283 +#define SIGNAL 284 +#define OVERRIDE 285 #line 21 "parse.y" @@ -46,6 +43,7 @@ #include #include "tree.h" +#include "main.h" #define _(x) (x) @@ -60,13 +58,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; void free(void *ptr); int yylex(void); +extern int ccode_line; extern int line_no; extern char *yytext; @@ -97,19 +97,21 @@ 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) + GString *cbuf,int line_no, int ccode_line, int vararg) { Node *node; Type *type; @@ -118,11 +120,25 @@ push_function(int scope, char *oid, char *id, char *onerror, 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); } + /* 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) && + 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); + } node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no); + onerror,cbuf,line_no,ccode_line,vararg); gtktypes = NULL; funcargs = NULL; @@ -130,11 +146,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; @@ -154,31 +172,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 157 "parse.y" +#line 178 "parse.y" typedef union { char *id; GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -194,26 +213,26 @@ typedef union { -#define YYFINAL 202 +#define YYFINAL 216 #define YYFLAG -32768 -#define YYNTBASE 48 +#define YYNTBASE 46 -#define YYTRANSLATE(x) ((unsigned)(x) <= 287 ? yytranslate[x] : 72) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 75) 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, 46, 2, 2, 2, 2, 2, 2, 37, - 38, 40, 2, 41, 47, 2, 2, 2, 43, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 36, 45, - 42, 44, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 34, 39, 35, 2, 2, 2, 2, 2, + 2, 2, 32, 37, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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,75 +248,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, 31, 32, 33 + 27, 28, 29, 30, 31 }; #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, 192, 203, 214, 224, 234, 243, - 256, 266, 276, 282, 289, 292, 295, 299, 302, 303, - 305, 307, 311, 313, 317, 319, 322, 329, 332, 334, - 336, 338, 341, 344, 348, 352, 356, 360, 362 + 31, 36, 39, 42, 45, 47, 49, 51, 56, 62, + 67, 73, 85, 94, 98, 99, 103, 105, 107, 110, + 112, 115, 118, 121, 123, 126, 129, 131, 133, 135, + 137, 140, 142, 144, 147, 149, 152, 154, 156, 158, + 160, 162, 165, 167, 168, 170, 174, 178, 181, 184, + 188, 192, 195, 197, 202, 206, 208, 211, 213, 223, + 233, 243, 256, 266, 276, 282, 285, 289, 292, 293, + 295, 297, 301, 303, 307, 309, 313, 315, 318, 322, + 329, 337, 340, 342, 344, 347, 350, 354, 358, 362, + 366, 368, 371 }; -static const short yyrhs[] = { 49, - 50, 49, 0, 50, 49, 0, 49, 50, 0, 50, - 0, 49, 26, 0, 49, 27, 0, 26, 0, 27, - 0, 51, 34, 52, 35, 0, 3, 25, 4, 25, - 0, 52, 64, 0, 52, 53, 0, 52, 54, 0, - 64, 0, 53, 0, 54, 0, 28, 57, 23, 36, - 0, 29, 57, 23, 36, 0, 30, 55, 23, 23, - 23, 34, 26, 23, 34, 26, 36, 0, 30, 55, - 23, 23, 23, 34, 26, 36, 0, 37, 56, 38, - 0, 0, 23, 39, 56, 0, 23, 0, 58, 0, - 58, 61, 0, 10, 59, 0, 9, 59, 0, 59, - 0, 10, 16, 0, 9, 16, 0, 16, 0, 15, - 0, 14, 0, 23, 0, 60, 23, 0, 25, 0, - 5, 0, 11, 13, 0, 11, 0, 12, 13, 0, - 12, 0, 13, 0, 8, 0, 7, 0, 6, 0, - 40, 61, 0, 40, 0, 23, 37, 63, 38, 0, - 63, 41, 23, 0, 23, 0, 32, 18, 62, 57, - 23, 37, 66, 38, 65, 34, 26, 0, 32, 18, - 62, 57, 23, 37, 66, 38, 65, 36, 0, 32, - 17, 62, 57, 23, 37, 66, 38, 65, 34, 26, - 0, 32, 17, 62, 57, 23, 37, 66, 38, 65, - 36, 0, 32, 62, 57, 23, 37, 66, 38, 65, - 34, 26, 0, 32, 62, 57, 23, 37, 66, 38, - 65, 36, 0, 31, 57, 23, 37, 66, 38, 65, - 34, 26, 0, 31, 57, 23, 37, 66, 38, 65, - 36, 0, 33, 37, 25, 38, 57, 23, 37, 66, - 38, 65, 34, 26, 0, 28, 57, 23, 37, 66, - 38, 65, 34, 26, 0, 29, 57, 23, 37, 66, - 38, 65, 34, 26, 0, 23, 37, 23, 38, 36, - 0, 23, 37, 23, 38, 34, 26, 0, 22, 23, - 0, 22, 71, 0, 22, 34, 26, 0, 42, 43, - 0, 0, 5, 0, 23, 0, 23, 41, 67, 0, - 67, 0, 67, 41, 68, 0, 68, 0, 57, 23, - 0, 57, 23, 37, 19, 69, 38, 0, 69, 70, - 0, 70, 0, 20, 0, 21, 0, 44, 71, 0, - 45, 71, 0, 44, 42, 71, 0, 45, 42, 71, - 0, 42, 42, 71, 0, 46, 42, 71, 0, 24, - 0, 47, 24, 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, 32, 50, 33, 0, 49, 32, 33, 0, + 3, 22, 4, 22, 0, 50, 66, 0, 50, 51, + 0, 50, 52, 0, 66, 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, 0, 26, 0, 27, + 20, 63, 0, 20, 27, 63, 0, 27, 63, 0, + 20, 63, 0, 26, 20, 63, 0, 20, 26, 63, + 0, 26, 63, 0, 63, 0, 20, 35, 64, 36, + 0, 64, 39, 20, 0, 20, 0, 32, 24, 0, + 34, 0, 30, 62, 55, 20, 35, 68, 36, 67, + 65, 0, 29, 27, 55, 20, 35, 68, 36, 67, + 65, 0, 29, 61, 55, 20, 35, 68, 36, 67, + 65, 0, 31, 35, 22, 36, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 26, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 27, 55, 20, 35, 68, + 36, 67, 32, 24, 0, 20, 35, 20, 36, 65, + 0, 19, 74, 0, 19, 32, 24, 0, 40, 41, + 0, 0, 6, 0, 20, 0, 20, 39, 69, 0, + 69, 0, 70, 39, 10, 0, 70, 0, 70, 39, + 71, 0, 71, 0, 55, 20, 0, 55, 20, 23, + 0, 55, 20, 35, 20, 72, 36, 0, 55, 20, + 23, 35, 20, 72, 36, 0, 72, 73, 0, 73, + 0, 20, 0, 42, 74, 0, 43, 74, 0, 42, + 40, 74, 0, 43, 40, 74, 0, 40, 40, 74, + 0, 44, 40, 74, 0, 21, 0, 45, 21, 0, + 20, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 175, 176, 177, 178, 181, 185, 189, 193, 199, 206, - 211, 212, 213, 214, 215, 216, 219, 222, 226, 251, - 275, 276, 279, 282, 288, 292, 299, 302, 305, 308, - 311, 314, 317, 320, 323, 326, 330, 333, 338, 341, - 344, 347, 350, 355, 358, 361, 366, 367, 370, 375, - 378, 384, 393, 402, 411, 420, 429, 438, 442, 446, - 450, 454, 458, 474, 493, 494, 495, 499, 500, 505, - 506, 516, 526, 529, 530, 533, 536, 541, 542, 545, - 549, 553, 557, 561, 565, 569, 573, 579, 580 + 197, 198, 199, 200, 203, 207, 211, 215, 221, 226, + 233, 238, 239, 240, 241, 242, 243, 246, 249, 252, + 255, 259, 288, 314, 315, 318, 321, 327, 328, 336, + 340, 347, 350, 353, 356, 359, 362, 365, 368, 371, + 374, 378, 381, 386, 389, 392, 395, 398, 403, 406, + 409, 414, 415, 418, 419, 422, 434, 446, 449, 461, + 473, 485, 488, 493, 498, 501, 506, 507, 511, 521, + 531, 541, 547, 552, 557, 578, 579, 583, 584, 587, + 588, 599, 609, 612, 613, 616, 617, 620, 623, 626, + 634, 644, 645, 648, 661, 665, 669, 673, 677, 681, + 687, 688, 692 }; #endif @@ -305,159 +329,175 @@ 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","CHECK","CNULL","TYPE","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","ARGUMENT","VIRTUAL","SIGNAL", +"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'", +"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable", +"argument","argflags","flaglist","type","type1","type2","integer","tspecifier", +"stars","optpublic","fullsigtype","sigtype","tokenlist","codenocode","method", +"onerror","funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL }; #endif static const short yyr1[] = { 0, - 48, 48, 48, 48, 49, 49, 49, 49, 50, 51, - 52, 52, 52, 52, 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, 63, - 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 65, 65, 65, 65, 65, 66, - 66, 66, 66, 67, 67, 68, 68, 69, 69, 70, - 70, 70, 70, 70, 70, 70, 70, 71, 71 + 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, + 49, 50, 50, 50, 50, 50, 50, 51, 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, 62, 62, 62, 62, 62, + 62, 62, 62, 63, 64, 64, 65, 65, 66, 66, + 66, 66, 66, 66, 66, 67, 67, 67, 67, 68, + 68, 68, 68, 69, 69, 70, 70, 71, 71, 71, + 71, 72, 72, 73, 73, 73, 73, 73, 73, 73, + 74, 74, 74 }; 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, 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, - 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, 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, 0, 1, 3, 3, 2, 2, 3, + 3, 2, 1, 4, 3, 1, 2, 1, 9, 9, + 9, 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 }; 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, 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, 0, - 0, 51, 0, 0, 0, 0, 63, 38, 35, 0, - 0, 73, 75, 0, 23, 0, 0, 0, 0, 49, - 0, 0, 0, 64, 0, 76, 69, 0, 69, 0, - 69, 0, 0, 50, 0, 0, 72, 0, 0, 0, - 0, 74, 0, 0, 0, 0, 0, 69, 0, 0, - 65, 88, 0, 0, 66, 68, 0, 0, 0, 20, - 0, 59, 69, 69, 0, 0, 80, 81, 0, 0, - 0, 0, 0, 79, 67, 89, 61, 62, 0, 58, - 0, 0, 0, 57, 69, 0, 0, 82, 0, 83, - 0, 77, 78, 0, 0, 55, 0, 53, 56, 0, - 86, 84, 85, 87, 19, 54, 52, 0, 60, 0, - 0, 0 + 2, 0, 0, 1, 0, 0, 0, 25, 54, 0, + 0, 10, 0, 16, 17, 15, 11, 0, 0, 43, + 51, 50, 49, 0, 0, 45, 47, 48, 39, 38, + 37, 40, 42, 0, 28, 30, 34, 0, 0, 0, + 0, 55, 0, 0, 0, 0, 0, 0, 63, 0, + 9, 13, 14, 12, 0, 29, 36, 33, 35, 32, + 44, 46, 0, 53, 31, 41, 0, 27, 0, 0, + 0, 0, 0, 0, 0, 0, 59, 0, 62, 0, + 58, 0, 0, 0, 0, 18, 0, 52, 0, 20, + 0, 0, 24, 0, 0, 0, 61, 57, 66, 0, + 60, 56, 0, 0, 0, 68, 75, 19, 43, 40, + 0, 0, 83, 85, 87, 21, 0, 26, 0, 0, + 0, 64, 0, 0, 0, 67, 0, 88, 79, 0, + 79, 0, 0, 0, 65, 0, 0, 82, 89, 0, + 0, 0, 0, 84, 86, 0, 0, 79, 79, 79, + 0, 0, 0, 103, 101, 0, 0, 76, 78, 0, + 0, 0, 23, 0, 0, 0, 0, 0, 94, 0, + 0, 0, 0, 0, 93, 77, 102, 73, 74, 0, + 70, 71, 69, 79, 0, 0, 0, 95, 0, 96, + 0, 90, 92, 0, 0, 91, 99, 97, 98, 100, + 22, 0, 72, 0, 0, 0 }; -static const short yydefgoto[] = { 200, - 4, 5, 6, 22, 23, 24, 48, 72, 100, 43, - 44, 45, 68, 53, 93, 25, 131, 101, 102, 103, - 163, 164, 145 +static const short yydefgoto[] = { 214, + 4, 5, 6, 23, 24, 25, 51, 79, 121, 45, + 46, 47, 48, 75, 54, 58, 59, 110, 117, 26, + 153, 122, 123, 124, 125, 184, 185, 168 }; -static const short yypact[] = { 3, - -23,-32768,-32768, 23, 69, -25, 19,-32768,-32768, 69, - 104, 105, 2, 104, 36, 75, 75, 40, 75, -5, - 62, 94,-32768,-32768,-32768,-32768, 34,-32768,-32768,-32768, --32768, 81, 102, 126, 132,-32768,-32768,-32768,-32768,-32768, --32768, 93, 80,-32768, 109, 133, 134, 135, 136, 137, - 137, 118, 75, 138,-32768,-32768,-32768,-32768, 123,-32768, --32768,-32768,-32768,-32768,-32768, 111, 80,-32768,-32768, 113, - 125, 124, 142, 129, 75, 75, 144, 145, 131, 30, --32768, 96,-32768,-32768, 96, 134,-32768, 147, 96, 148, - 149,-32768, -22, 139, 75, 151,-32768, 140, -21, 150, - 141, 143,-32768, 152,-32768, 146, 153, 155, 156,-32768, - 158, 96, 159,-32768, 75, 157, 33, 75, 33, 160, - 33, 96, 96,-32768, 161, 163, 143, 164, -9, 154, - 162,-32768, 167, 29, 42, 165, 166, 33, 96, 1, --32768,-32768, 169, 174,-32768,-32768, 176, 179, 172,-32768, - 181,-32768, 33, 33, 106, 170,-32768,-32768, 168, 9, - 20, 171, -10,-32768,-32768,-32768,-32768,-32768, 183,-32768, - 107, 110, 185,-32768, 33, 24, 24,-32768, 24,-32768, - 24,-32768,-32768, 178, 186,-32768, 189,-32768,-32768, 182, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 191,-32768, 175, - 187,-32768 +static const short yypact[] = { 43, + 1,-32768,-32768, 56, 28, 39, 72,-32768,-32768, 28, + 177, 152, 69, 177, 61, 118, 118, 68, 181, 66, + 84,-32768, 164,-32768,-32768,-32768,-32768, 81, 153,-32768, +-32768,-32768,-32768, 185, 191, 106, 113,-32768,-32768,-32768, +-32768,-32768,-32768, 117,-32768, 101,-32768, 126, 135, 137, + 143,-32768, 118, 118, 62, 156, 169, 118,-32768, 174, +-32768,-32768,-32768,-32768, 178,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 13, 101,-32768,-32768, 60, 175, 179, 193, + 196, 197, 183, 199, 199, 200,-32768, 34,-32768, 34, +-32768, 201, 186, 26, 189,-32768, 136,-32768, 190,-32768, + 136, 137,-32768, 205, 192, 194,-32768,-32768,-32768, 51, +-32768,-32768, 195, 118, 202,-32768,-32768,-32768, 198, 138, + 208, 203,-32768, 204,-32768,-32768, 206,-32768, 209, 136, + 136,-32768, 211, 136, 212,-32768, 118, -19, -6, 100, + -6, 213, 210, 214,-32768, 215, 217,-32768, 218, 216, + -15, 207, 222,-32768,-32768, 223, -5, -6, -6, -6, + 136, 220, 35,-32768,-32768, 221, 226,-32768,-32768, 225, + 232, 227,-32768, 26, 26, 26, 224, 35,-32768, 228, + -12, 4, 229, 21,-32768,-32768,-32768,-32768,-32768, 233, +-32768,-32768,-32768, -6, 30, 6, 6,-32768, 6,-32768, + 6,-32768,-32768, 230, 231,-32768,-32768,-32768,-32768,-32768, +-32768, 234,-32768, 235, 238,-32768 }; static const short yypgoto[] = {-32768, - 58, 184,-32768,-32768, 196, 197,-32768, 88, -16,-32768, - 119,-32768, 122, 103,-32768, 198, -114, -81, 70, 108, --32768, 59, -107 + 9, 240,-32768,-32768, 239, 242,-32768, 131, -16, 237, +-32768, 176,-32768, 187,-32768,-32768, -45,-32768, 12, 244, + -138, -99, 133,-32768, 132, 93, -177, -97 }; -#define YYLAST 226 - - -static const short yytable[] = { 42, - 46, 7, 49, 104, 133, 1, 135, 107, 12, 157, - 158, 50, 51, 141, 142, 110, -71, 52, 111, 115, - 157, 158, 13, 155, 143, 1, 26, 182, 2, 3, - 125, 159, 142, 160, 161, 162, 78, 144, 171, 172, - 136, 137, 159, 142, 160, 161, 162, 142, 8, 9, - 177, 149, 178, 180, 129, 144, 59, 156, 90, 91, - 190, 179, 11, 96, 150, 97, 144, 14, 191, 192, - 144, 193, 27, 194, 130, 151, 47, 152, 113, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 34, 35, 36, 2, 3, 60, 40, 54, 41, - 98, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 34, 35, 36, 66, 15, 62, 99, 67, - 41, 16, 17, 18, 19, 20, 21, 15, 55, 8, - 9, 69, 16, 17, 18, 19, 20, 21, 64, 173, - 185, 174, 186, 187, 65, 188, 81, 82, 84, 85, - 61, 63, 75, 76, 77, 70, 71, 73, 74, 52, - 80, 87, 79, 86, 88, 89, 92, 94, 95, 106, - 108, 109, 116, 105, 201, 112, 114, -70, 117, 120, - 124, 126, 140, 118, 127, 134, 202, 10, 83, 119, - 121, 122, 123, 128, 165, 147, 146, 166, 138, 139, - 148, 167, 153, 154, 168, 169, 170, 175, 184, 176, - 189, 196, 181, 195, 197, 198, 199, 56, 57, 58, - 0, 183, 0, 0, 0, 132 +#define YYLAST 272 + + +static const short yytable[] = { 44, + 49, 127, 156, 149, 164, 165, 203, 164, 165, 87, + 89, 91, 151, 11, 172, 150, 166, 203, 14, 174, + 175, 176, 7, 164, 165, 164, 165, 197, 173, 167, + 143, 144, 167, 152, 146, 95, 81, 82, 107, 108, + 179, 92, 111, 199, 112, 1, 96, 97, 167, 179, + 167, 2, 3, 83, 179, 205, 202, 115, 1, 116, + 180, 177, 181, 182, 183, 206, 2, 3, 86, 180, + 12, 181, 182, 183, 180, 13, 181, 182, 183, 8, + 9, 83, 99, 198, 200, 55, 132, 84, 85, 133, + 27, 56, 57, 100, 101, 28, 86, 135, 207, 208, + 65, 209, 50, 210, 29, 30, 31, 32, 33, 154, + 34, 35, 36, 37, 38, 39, 40, 41, 60, 42, + 71, 43, 29, 30, 31, 32, 33, 72, 34, 35, + 36, 37, 38, 39, 40, 41, 73, 42, 74, 43, + 29, 119, 31, 32, 33, 76, 34, 35, 36, 37, + 38, 39, 40, 41, 77, 120, 78, 43, 30, 31, + 32, 33, 80, 34, 35, 36, 37, 38, 39, 40, + 41, 15, 42, -81, 43, 88, 137, 16, 17, 18, + 19, 20, 21, 15, 22, 191, 192, 193, 90, 16, + 17, 18, 19, 20, 21, 93, 61, 36, 37, 38, + 8, 9, 67, 36, 37, 38, 52, 53, 69, 68, + 70, 102, 104, 94, 103, 105, 106, 86, 83, 109, + 113, 114, 118, 126, 129, 136, 130, 138, 131, 134, + 145, 147, 128, -80, 215, 163, 157, 216, 139, 178, + 142, 141, 140, 10, 186, 158, 187, 169, 188, 159, + 160, 161, 162, 170, 171, 189, 204, 213, 190, 194, + 98, 62, 212, 211, 63, 66, 64, 196, 201, 148, + 195, 155 }; static const short yycheck[] = { 16, - 17, 25, 19, 85, 119, 3, 121, 89, 34, 20, - 21, 17, 18, 23, 24, 38, 38, 23, 41, 41, - 20, 21, 4, 138, 34, 3, 25, 38, 26, 27, - 112, 42, 24, 44, 45, 46, 53, 47, 153, 154, - 122, 123, 42, 24, 44, 45, 46, 24, 26, 27, - 42, 23, 160, 161, 22, 47, 23, 139, 75, 76, - 175, 42, 5, 34, 36, 36, 47, 10, 176, 177, - 47, 179, 37, 181, 42, 34, 37, 36, 95, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 11, 12, 13, 26, 27, 16, 23, 37, 25, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 11, 12, 13, 23, 23, 16, 23, 40, - 25, 28, 29, 30, 31, 32, 33, 23, 35, 26, - 27, 23, 28, 29, 30, 31, 32, 33, 13, 34, - 34, 36, 36, 34, 13, 36, 36, 37, 36, 37, - 32, 33, 50, 51, 37, 23, 23, 23, 23, 23, - 38, 38, 25, 39, 23, 37, 23, 23, 38, 23, - 23, 23, 23, 86, 0, 37, 26, 38, 38, 34, - 23, 23, 19, 41, 115, 26, 0, 4, 67, 38, - 38, 37, 37, 37, 26, 34, 43, 24, 38, 37, - 34, 26, 38, 38, 26, 34, 26, 38, 26, 42, - 26, 26, 42, 36, 26, 34, 26, 22, 22, 22, - -1, 163, -1, -1, -1, 118 + 17, 101, 141, 23, 20, 21, 184, 20, 21, 55, + 56, 57, 19, 5, 20, 35, 32, 195, 10, 158, + 159, 160, 22, 20, 21, 20, 21, 40, 34, 45, + 130, 131, 45, 40, 134, 23, 53, 54, 84, 85, + 20, 58, 88, 40, 90, 3, 34, 35, 45, 20, + 45, 24, 25, 20, 20, 194, 36, 32, 3, 34, + 40, 161, 42, 43, 44, 36, 24, 25, 35, 40, + 32, 42, 43, 44, 40, 4, 42, 43, 44, 24, + 25, 20, 23, 181, 182, 20, 36, 26, 27, 39, + 22, 26, 27, 34, 35, 35, 35, 114, 196, 197, + 20, 199, 35, 201, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 35, 20, + 15, 22, 5, 6, 7, 8, 9, 15, 11, 12, + 13, 14, 15, 16, 17, 18, 20, 20, 38, 22, + 5, 6, 7, 8, 9, 20, 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, 36, 22, 20, 39, 26, 27, 28, + 29, 30, 31, 20, 33, 174, 175, 176, 20, 26, + 27, 28, 29, 30, 31, 22, 33, 13, 14, 15, + 24, 25, 18, 13, 14, 15, 26, 27, 18, 34, + 35, 37, 20, 36, 36, 20, 20, 35, 20, 20, + 20, 36, 34, 34, 20, 24, 35, 20, 35, 35, + 20, 20, 102, 36, 0, 20, 24, 0, 36, 20, + 32, 36, 39, 4, 24, 36, 21, 41, 24, 36, + 36, 35, 35, 32, 32, 24, 24, 24, 32, 36, + 74, 23, 32, 34, 23, 29, 23, 40, 40, 137, + 178, 140 }; /* -*-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. @@ -670,7 +710,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 *. @@ -999,51 +1039,51 @@ yyreduce: switch (yyn) { case 1: -#line 175 "parse.y" +#line 197 "parse.y" { ; ; break;} case 2: -#line 176 "parse.y" +#line 198 "parse.y" { ; ; break;} case 3: -#line 177 "parse.y" +#line 199 "parse.y" { ; ; break;} case 4: -#line 178 "parse.y" +#line 200 "parse.y" { ; ; break;} case 5: -#line 181 "parse.y" +#line 203 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf); + Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 6: -#line 185 "parse.y" +#line 207 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf); + Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 7: -#line 189 "parse.y" +#line 211 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf); + Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 8: -#line 193 "parse.y" +#line 215 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf); + Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 9: -#line 199 "parse.y" +#line 221 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1051,63 +1091,87 @@ case 9: ; break;} case 10: -#line 206 "parse.y" +#line 226 "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 211 "parse.y" -{ ; ; +#line 233 "parse.y" +{ + class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + ; break;} case 12: -#line 212 "parse.y" +#line 238 "parse.y" { ; ; break;} case 13: -#line 213 "parse.y" +#line 239 "parse.y" { ; ; break;} case 14: -#line 214 "parse.y" +#line 240 "parse.y" { ; ; break;} case 15: -#line 215 "parse.y" +#line 241 "parse.y" { ; ; break;} case 16: -#line 216 "parse.y" +#line 242 "parse.y" { ; ; break;} case 17: -#line 219 "parse.y" -{ - push_variable(yyvsp[-1].id,PUBLIC_SCOPE); - ; +#line 243 "parse.y" +{ ; ; break;} case 18: -#line 222 "parse.y" +#line 246 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE); + push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL); ; break;} case 19: -#line 226 "parse.y" +#line 249 "parse.y" +{ + push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ; + break;} +case 20: +#line 252 "parse.y" +{ + push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL); + ; + break;} +case 21: +#line 255 "parse.y" +{ + push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ; + break;} +case 22: +#line 259 "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[-1].cbuf); + yyvsp[-4].cbuf,yyvsp[-5].line, + yyvsp[-1].cbuf,yyvsp[-2].line, + yyvsp[-10].line); 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[-4].cbuf); + yyvsp[-1].cbuf,yyvsp[-2].line, + yyvsp[-4].cbuf,yyvsp[-5].line, + yyvsp[-10].line); class_nodes = g_list_append(class_nodes,node); } else { g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); @@ -1120,20 +1184,22 @@ case 19: } ; break;} -case 20: -#line 251 "parse.y" +case 23: +#line 288 "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,NULL); + yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0, + yyvsp[-7].line); 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,yyvsp[-1].cbuf); + NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line, + yyvsp[-7].line); class_nodes = g_list_append(class_nodes,node); } else { g_free(yyvsp[-3].id); g_free(yyvsp[-5].id); @@ -1145,367 +1211,426 @@ case 20: } ; break;} -case 21: -#line 275 "parse.y" +case 24: +#line 314 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 22: -#line 276 "parse.y" +case 25: +#line 315 "parse.y" { yyval.list = NULL; ; break;} -case 23: -#line 279 "parse.y" +case 26: +#line 318 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 24: -#line 282 "parse.y" +case 27: +#line 321 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 25: -#line 288 "parse.y" +case 28: +#line 327 "parse.y" +{ ; ; + break;} +case 29: +#line 328 "parse.y" { - Node *node = new_type(0,yyvsp[0].id); + Type *type = typestack->data; + char *oldname = type->name; + type->name = g_strconcat("const ",oldname,NULL); + g_free(oldname); + ; + break;} +case 30: +#line 336 "parse.y" +{ + Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} -case 26: -#line 292 "parse.y" +case 31: +#line 340 "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 299 "parse.y" +case 32: +#line 347 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 28: -#line 302 "parse.y" +case 33: +#line 350 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 29: -#line 305 "parse.y" +case 34: +#line 353 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 30: -#line 308 "parse.y" +case 35: +#line 356 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 31: -#line 311 "parse.y" +case 36: +#line 359 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 32: -#line 314 "parse.y" +case 37: +#line 362 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 33: -#line 317 "parse.y" +case 38: +#line 365 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 34: -#line 320 "parse.y" +case 39: +#line 368 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 35: -#line 323 "parse.y" +case 40: +#line 371 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 36: -#line 326 "parse.y" +case 41: +#line 374 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 37: -#line 330 "parse.y" +case 42: +#line 378 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 333 "parse.y" +case 43: +#line 381 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 39: -#line 338 "parse.y" +case 44: +#line 386 "parse.y" { yyval.id = "long int"; ; break;} -case 40: -#line 341 "parse.y" +case 45: +#line 389 "parse.y" { yyval.id = "long"; ; break;} -case 41: -#line 344 "parse.y" +case 46: +#line 392 "parse.y" { yyval.id = "short int"; ; break;} -case 42: -#line 347 "parse.y" +case 47: +#line 395 "parse.y" { yyval.id = "short"; ; break;} -case 43: -#line 350 "parse.y" +case 48: +#line 398 "parse.y" { yyval.id = "int"; ; break;} -case 44: -#line 355 "parse.y" +case 49: +#line 403 "parse.y" { yyval.id = "enum "; ; break;} -case 45: -#line 358 "parse.y" +case 50: +#line 406 "parse.y" { yyval.id = "union "; ; break;} -case 46: -#line 361 "parse.y" +case 51: +#line 409 "parse.y" { yyval.id = "struct "; ; break;} -case 47: -#line 366 "parse.y" +case 52: +#line 414 "parse.y" { stars++; ; break;} -case 48: -#line 367 "parse.y" +case 53: +#line 415 "parse.y" { stars++; ; break;} -case 49: -#line 370 "parse.y" +case 54: +#line 418 "parse.y" +{ ; ; + break;} +case 55: +#line 419 "parse.y" +{ ; ; + break;} +case 56: +#line 422 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); - ; + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; break;} -case 50: -#line 375 "parse.y" +case 57: +#line 434 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; + 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 51: -#line 378 "parse.y" -{ - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; +case 58: +#line 446 "parse.y" +{ + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + ; break;} -case 52: -#line 384 "parse.y" +case 59: +#line 449 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(SIGNAL_LAST_METHOD,NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line); - ; + g_free(yyvsp[-1].id); + ; break;} -case 53: -#line 393 "parse.y" +case 60: +#line 461 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line); - ; + g_free(yyvsp[-1].id); + ; break;} -case 54: -#line 402 "parse.y" +case 61: +#line 473 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(SIGNAL_FIRST_METHOD, NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line); - ; + g_free(yyvsp[-2].id); + ; break;} -case 55: -#line 411 "parse.y" +case 62: +#line 485 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 63: +#line 488 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 64: +#line 493 "parse.y" +{ + gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + ; + break;} +case 65: +#line 498 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " + gtktypes = g_list_append(gtktypes,yyvsp[0].id); + ; + break;} +case 66: +#line 501 "parse.y" +{ + gtktypes = g_list_append(gtktypes,yyvsp[0].id); + ; + break;} +case 67: +#line 506 "parse.y" +{ yyval.cbuf=yyvsp[0].cbuf; ; + break;} +case 68: +#line 507 "parse.y" +{ yyval.cbuf = NULL; ; + break;} +case 69: +#line 511 "parse.y" +{ + if(!has_self) { + yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_FIRST_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-9].line); + push_function(yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 56: -#line 420 "parse.y" +case 70: +#line 521 "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); + push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 57: -#line 429 "parse.y" +case 71: +#line 531 "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); - ; - break;} -case 58: -#line 438 "parse.y" -{ - push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line); - ; - break;} -case 59: -#line 442 "parse.y" -{ push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-7].line); + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 60: -#line 446 "parse.y" +case 72: +#line 541 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line); + yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, + yyvsp[-11].line,yyvsp[-1].line, + vararg); ; break;} -case 61: -#line 450 "parse.y" +case 73: +#line 547 "parse.y" { push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 62: -#line 454 "parse.y" +case 74: +#line 552 "parse.y" { push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 63: -#line 458 "parse.y" +case 75: +#line 557 "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); + push_function(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); + push_function(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 64: -#line 474 "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); - } 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); - } else { - g_free(yyvsp[-5].id); - g_free(yyvsp[-3].id); - g_string_free(yyvsp[-3].cbuf,TRUE); - yyerror(_("parse error")); - YYERROR; - } - ; - break;} -case 65: -#line 493 "parse.y" -{ yyval.id = yyvsp[0].id; ; - break;} -case 66: -#line 494 "parse.y" +case 76: +#line 578 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 67: -#line 495 "parse.y" +case 77: +#line 579 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 68: -#line 499 "parse.y" +case 78: +#line 583 "parse.y" { ; ; break;} -case 69: -#line 500 "parse.y" +case 79: +#line 584 "parse.y" { yyval.id = NULL; ; break;} -case 70: -#line 505 "parse.y" -{ has_this = FALSE; ; +case 80: +#line 587 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 71: -#line 506 "parse.y" +case 81: +#line 588 "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")); @@ -1513,12 +1638,12 @@ case 71: } ; break;} -case 72: -#line 516 "parse.y" +case 82: +#line 599 "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")); @@ -1526,108 +1651,144 @@ case 72: } ; break;} -case 73: -#line 526 "parse.y" -{ has_this = FALSE; ; +case 83: +#line 609 "parse.y" +{ has_self = FALSE; ; break;} -case 74: -#line 529 "parse.y" +case 84: +#line 612 "parse.y" +{ vararg = TRUE; ; + break;} +case 85: +#line 613 "parse.y" +{ vararg = FALSE; ; + break;} +case 86: +#line 616 "parse.y" { ; ; break;} -case 75: -#line 530 "parse.y" +case 87: +#line 617 "parse.y" { ; ; break;} -case 76: -#line 533 "parse.y" +case 88: +#line 620 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 77: -#line 536 "parse.y" +case 89: +#line 623 "parse.y" { - push_funcarg(yyvsp[-4].id); + push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 78: -#line 541 "parse.y" -{ ; ; +case 90: +#line 626 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"check")!=0) { + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-2].id); + push_funcarg(yyvsp[-4].id,NULL); + ; break;} -case 79: -#line 542 "parse.y" +case 91: +#line 634 "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 92: +#line 644 "parse.y" { ; ; break;} -case 80: -#line 545 "parse.y" -{ - Node *node = new_check(NULL_CHECK,NULL); - checks = g_list_append(checks,node); - ; +case 93: +#line 645 "parse.y" +{ ; ; break;} -case 81: -#line 549 "parse.y" +case 94: +#line 648 "parse.y" { - Node *node = new_check(TYPE_CHECK,NULL); - checks = g_list_append(checks,node); + if(strcmp(yyvsp[0].id,"type")==0) { + Node *node = new_check(TYPE_CHECK,NULL); + checks = g_list_append(checks,node); + } else if(strcmp(yyvsp[0].id,"null")==0) { + Node *node = new_check(NULL_CHECK,NULL); + checks = g_list_append(checks,node); + } else { + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[0].id); ; break;} -case 82: -#line 553 "parse.y" +case 95: +#line 661 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 83: -#line 557 "parse.y" +case 96: +#line 665 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 84: -#line 561 "parse.y" +case 97: +#line 669 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 85: -#line 565 "parse.y" +case 98: +#line 673 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 569 "parse.y" +case 99: +#line 677 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 573 "parse.y" +case 100: +#line 681 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 88: -#line 579 "parse.y" +case 101: +#line 687 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 89: -#line 580 "parse.y" +case 102: +#line 688 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} +case 103: +#line 692 "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; @@ -1847,5 +2008,5 @@ yyerrhandle: } return 1; } -#line 586 "parse.y" +#line 695 "parse.y"