X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/4c9cb9b99991c36920bd17e366e2128d1b22eb6e..8cb6370effd9f2dacc6dc9b662a43ea19ee637ac:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 708486f..51a215a 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,26 +1,25 @@ /* 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 @@ -43,6 +42,7 @@ #include #include "tree.h" +#include "main.h" #define _(x) (x) @@ -57,7 +57,8 @@ 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; @@ -95,19 +96,19 @@ yyerror(char *str) } static void -push_variable(char *name, int scope) +push_variable(char *name, int scope, int line_no) { Node *var; Type *type = typestack->data; typestack = g_list_remove(typestack,typestack->data); - 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) + GString *cbuf,int line_no, int ccode_line, int vararg) { Node *node; Type *type; @@ -120,7 +121,7 @@ push_function(int scope, char *oid, char *id, char *onerror, } node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no,ccode_line); + onerror,cbuf,line_no,ccode_line,vararg); gtktypes = NULL; funcargs = NULL; @@ -158,7 +159,7 @@ push_init_arg(char *name, int is_class) } static void -push_this(char *this) +push_self(char *id) { Node *node; Node *type; @@ -166,17 +167,18 @@ push_this(char *this) type = new_type(1,g_strdup(((Class *)class)->otype)); 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 160 "parse.y" typedef union { char *id; GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -192,11 +194,11 @@ typedef union { -#define YYFINAL 190 +#define YYFINAL 198 #define YYFLAG -32768 #define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69) +#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -234,65 +236,66 @@ static const char yytranslate[] = { 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 + 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 }; 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, 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, - 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 + 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 }; #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 + 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 }; #endif @@ -300,150 +303,167 @@ 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", +"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","integer","tspecifier","stars","sigtype","tokenlist", -"method","onerror","funcargs","arglist","arg","checklist","check","number", NULL +"flaglist","type","type1","type2","integer","tspecifier","stars","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 + 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 }; 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, 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 }; 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 + 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 }; -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[] = { 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 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[] = { 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 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 + 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 }; -#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 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 }; 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 + 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 }; /* -*-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 +676,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 +1005,51 @@ yyreduce: switch (yyn) { case 1: -#line 176 "parse.y" +#line 179 "parse.y" { ; ; break;} case 2: -#line 177 "parse.y" +#line 180 "parse.y" { ; ; break;} case 3: -#line 178 "parse.y" +#line 181 "parse.y" { ; ; break;} case 4: -#line 179 "parse.y" +#line 182 "parse.y" { ; ; break;} case 5: -#line 182 "parse.y" +#line 185 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 6: -#line 186 "parse.y" +#line 189 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 7: -#line 190 "parse.y" +#line 193 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 8: -#line 194 "parse.y" +#line 197 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 9: -#line 200 "parse.y" +#line 203 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1037,49 +1057,49 @@ case 9: ; break;} case 10: -#line 207 "parse.y" +#line 210 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 212 "parse.y" +#line 215 "parse.y" { ; ; break;} case 12: -#line 213 "parse.y" +#line 216 "parse.y" { ; ; break;} case 13: -#line 214 "parse.y" +#line 217 "parse.y" { ; ; break;} case 14: -#line 215 "parse.y" +#line 218 "parse.y" { ; ; break;} case 15: -#line 216 "parse.y" +#line 219 "parse.y" { ; ; break;} case 16: -#line 217 "parse.y" +#line 220 "parse.y" { ; ; break;} case 17: -#line 220 "parse.y" +#line 223 "parse.y" { - push_variable(yyvsp[-1].id,PUBLIC_SCOPE); + push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); ; break;} case 18: -#line 223 "parse.y" +#line 226 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE); + push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); ; break;} case 19: -#line 227 "parse.y" +#line 230 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1087,7 +1107,8 @@ case 19: 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[-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) { @@ -1095,7 +1116,8 @@ case 19: 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[-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); @@ -1109,19 +1131,21 @@ case 19: ; break;} case 20: -#line 254 "parse.y" +#line 259 "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,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,0,yyvsp[-1].cbuf,yyvsp[-2].line); + 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); @@ -1134,367 +1158,386 @@ case 20: ; break;} case 21: -#line 278 "parse.y" +#line 285 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 22: -#line 279 "parse.y" +#line 286 "parse.y" { yyval.list = NULL; ; break;} case 23: -#line 282 "parse.y" +#line 289 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 24: -#line 285 "parse.y" +#line 292 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 25: -#line 291 "parse.y" +#line 298 "parse.y" +{ ; ; + break;} +case 26: +#line 299 "parse.y" +{ + Type *type = typestack->data; + char *oldname = type->name; + type->name = g_strconcat("const ",oldname,NULL); + g_free(oldname); + ; + break;} +case 27: +#line 307 "parse.y" { Node *node = new_type(0,yyvsp[0].id); typestack = g_list_prepend(typestack,node); ; break;} -case 26: -#line 295 "parse.y" +case 28: +#line 311 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 27: -#line 302 "parse.y" +case 29: +#line 318 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 28: -#line 305 "parse.y" +case 30: +#line 321 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 29: -#line 308 "parse.y" +case 31: +#line 324 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 30: -#line 311 "parse.y" +case 32: +#line 327 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 31: -#line 314 "parse.y" +case 33: +#line 330 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 32: -#line 317 "parse.y" +case 34: +#line 333 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 33: -#line 320 "parse.y" +case 35: +#line 336 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 34: -#line 323 "parse.y" +case 36: +#line 339 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 35: -#line 326 "parse.y" +case 37: +#line 342 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 36: -#line 329 "parse.y" +case 38: +#line 345 "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 39: +#line 349 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 38: -#line 336 "parse.y" +case 40: +#line 352 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 39: -#line 341 "parse.y" +case 41: +#line 357 "parse.y" { yyval.id = "long int"; ; break;} -case 40: -#line 344 "parse.y" +case 42: +#line 360 "parse.y" { yyval.id = "long"; ; break;} -case 41: -#line 347 "parse.y" +case 43: +#line 363 "parse.y" { yyval.id = "short int"; ; break;} -case 42: -#line 350 "parse.y" +case 44: +#line 366 "parse.y" { yyval.id = "short"; ; break;} -case 43: -#line 353 "parse.y" +case 45: +#line 369 "parse.y" { yyval.id = "int"; ; break;} -case 44: -#line 358 "parse.y" +case 46: +#line 374 "parse.y" { yyval.id = "enum "; ; break;} -case 45: -#line 361 "parse.y" +case 47: +#line 377 "parse.y" { yyval.id = "union "; ; break;} -case 46: -#line 364 "parse.y" +case 48: +#line 380 "parse.y" { yyval.id = "struct "; ; break;} -case 47: -#line 369 "parse.y" -{ stars++; ; - break;} -case 48: -#line 370 "parse.y" -{ stars++; ; - break;} case 49: -#line 373 "parse.y" -{ - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); - ; +#line 385 "parse.y" +{ stars++; ; break;} case 50: -#line 378 "parse.y" -{ - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; +#line 386 "parse.y" +{ stars++; ; break;} case 51: -#line 381 "parse.y" -{ - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; - break;} -case 52: -#line 387 "parse.y" +#line 389 "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; + 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[-9].id); + g_free(yyvsp[-1].id); YYERROR; } - g_free(yyvsp[-9].id); - - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(sigtype,NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line,yyvsp[-1].line); - ; + g_free(yyvsp[-2].id); + ; break;} case 53: -#line 408 "parse.y" +#line 413 "parse.y" +{ + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + ; + break;} +case 54: +#line 416 "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; + 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[-8].id); + g_free(yyvsp[-1].id); YYERROR; } - g_free(yyvsp[-8].id); - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); - YYERROR; - } - push_function(sigtype, NULL, - yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line,0); - ; + g_free(yyvsp[-1].id); + ; break;} -case 54: +case 55: #line 428 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 56: +#line 433 "parse.y" +{ + gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + ; + break;} +case 57: +#line 438 "parse.y" +{ + gtktypes = g_list_append(gtktypes,yyvsp[0].id); + ; + break;} +case 58: +#line 441 "parse.y" +{ + gtktypes = g_list_append(gtktypes,yyvsp[0].id); + ; + break;} +case 59: +#line 446 "parse.y" +{ yyval.cbuf=yyvsp[0].cbuf; ; + break;} +case 60: +#line 447 "parse.y" +{ yyval.cbuf = NULL; ; + break;} +case 61: +#line 451 "parse.y" +{ + if(!has_self) { + yyerror(_("signal 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(yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; break;} -case 55: -#line 437 "parse.y" +case 62: +#line 461 "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); + push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + ccode_line,vararg); ; 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); - ; - break;} -case 57: -#line 450 "parse.y" +case 63: +#line 471 "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, NULL,yyvsp[-7].line,0); + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, + ccode_line,vararg); ; break;} -case 58: -#line 454 "parse.y" +case 64: +#line 481 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line,yyvsp[-1].line); + yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, + yyvsp[-11].line,yyvsp[-1].line, + vararg); ; break;} -case 59: -#line 458 "parse.y" +case 65: +#line 487 "parse.y" { push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 60: -#line 462 "parse.y" +case 66: +#line 492 "parse.y" { push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line); + yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, + vararg); ; break;} -case 61: -#line 466 "parse.y" +case 67: +#line 497 "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(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(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 68: +#line 518 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 65: -#line 505 "parse.y" +case 69: +#line 519 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 66: -#line 509 "parse.y" +case 70: +#line 523 "parse.y" { ; ; break;} -case 67: -#line 510 "parse.y" +case 71: +#line 524 "parse.y" { yyval.id = NULL; ; break;} -case 68: -#line 515 "parse.y" -{ has_this = FALSE; ; +case 72: +#line 527 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 69: -#line 516 "parse.y" -{ - has_this = TRUE; - if(strcmp(yyvsp[0].id,"this")==0) - push_this(yyvsp[0].id); +case 73: +#line 528 "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) + push_self(yyvsp[0].id); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -1502,12 +1545,17 @@ case 69: } ; break;} -case 70: -#line 526 "parse.y" -{ - has_this = TRUE; - if(strcmp(yyvsp[-2].id,"this")==0) - push_this(yyvsp[-2].id); +case 74: +#line 544 "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) + push_self(yyvsp[-2].id); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -1515,26 +1563,34 @@ case 70: } ; break;} -case 71: -#line 536 "parse.y" -{ has_this = FALSE; ; +case 75: +#line 559 "parse.y" +{ has_self = FALSE; ; break;} -case 72: -#line 539 "parse.y" +case 76: +#line 562 "parse.y" +{ vararg = TRUE; ; + break;} +case 77: +#line 563 "parse.y" +{ vararg = FALSE; ; + break;} +case 78: +#line 566 "parse.y" { ; ; break;} -case 73: -#line 540 "parse.y" +case 79: +#line 567 "parse.y" { ; ; break;} -case 74: -#line 543 "parse.y" +case 80: +#line 570 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 75: -#line 546 "parse.y" +case 81: +#line 573 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1544,16 +1600,16 @@ case 75: push_funcarg(yyvsp[-4].id); ; break;} -case 76: -#line 556 "parse.y" +case 82: +#line 583 "parse.y" { ; ; break;} -case 77: -#line 557 "parse.y" +case 83: +#line 584 "parse.y" { ; ; break;} -case 78: -#line 560 "parse.y" +case 84: +#line 587 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1568,62 +1624,66 @@ case 78: g_free(yyvsp[0].id); ; break;} -case 79: -#line 573 "parse.y" +case 85: +#line 600 "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 86: +#line 604 "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 87: +#line 608 "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 88: +#line 612 "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 89: +#line 616 "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 90: +#line 620 "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 91: +#line 626 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 86: -#line 600 "parse.y" +case 92: +#line 627 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} +case 93: +#line 631 "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 +1903,5 @@ yyerrhandle: } return 1; } -#line 606 "parse.y" +#line 634 "parse.y"