X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b9f22ab5a7f4d4bfe0932debf8864a21b5c852cd..4c9cb9b99991c36920bd17e366e2128d1b22eb6e:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 7d3195d..708486f 100644 --- a/src/parse.c +++ b/src/parse.c @@ -21,21 +21,18 @@ #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 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 #line 21 "parse.y" @@ -67,6 +64,7 @@ static GList *gtktypes = NULL; void free(void *ptr); int yylex(void); +extern int ccode_line; extern int line_no; extern char *yytext; @@ -109,7 +107,7 @@ push_variable(char *name, int scope) 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) { Node *node; Type *type; @@ -122,7 +120,7 @@ push_function(int scope, char *oid, char *id, char *onerror, } node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no); + onerror,cbuf,line_no,ccode_line); gtktypes = NULL; funcargs = NULL; @@ -173,7 +171,7 @@ push_this(char *this) } -#line 157 "parse.y" +#line 158 "parse.y" typedef union { char *id; GString *cbuf; @@ -194,26 +192,26 @@ typedef union { -#define YYFINAL 202 +#define YYFINAL 190 #define YYFLAG -32768 -#define YYNTBASE 48 +#define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 287 ? yytranslate[x] : 72) +#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69) 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, 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, 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, 31, 36, 32, 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,7 +227,7 @@ 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 }; #if YYDEBUG != 0 @@ -239,65 +237,62 @@ static const short yyprhs[] = { 0, 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 + 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 }; -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, +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, 23, 0, 60, 23, 0, 25, 0, + 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, - 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 + 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 }; #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 + 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 }; #endif @@ -306,26 +301,25 @@ static const short yyrline[] = { 0, 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 +"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 }; #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 + 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 }; static const short yyr2[] = { 0, @@ -334,10 +328,10 @@ static const short yyr2[] = { 0, 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 + 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 }; static const short yydefact[] = { 0, @@ -346,114 +340,106 @@ static const short yydefact[] = { 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 + 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 }; -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[] = { 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 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[] = { 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 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 + 10, 168,-32768,-32768, 180, 184,-32768, 80, -16,-32768, + 106,-32768, 110, 115,-32768, 185, -113, -78, 55, 94, +-32768, 54, -95 }; -#define YYLAST 226 +#define YYLAST 209 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 + 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 }; 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, 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 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -999,51 +985,51 @@ yyreduce: switch (yyn) { case 1: -#line 175 "parse.y" +#line 176 "parse.y" { ; ; break;} case 2: -#line 176 "parse.y" +#line 177 "parse.y" { ; ; break;} case 3: -#line 177 "parse.y" +#line 178 "parse.y" { ; ; break;} case 4: -#line 178 "parse.y" +#line 179 "parse.y" { ; ; break;} case 5: -#line 181 "parse.y" +#line 182 "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 186 "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 190 "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 194 "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 200 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1051,63 +1037,65 @@ case 9: ; break;} case 10: -#line 206 "parse.y" +#line 207 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 211 "parse.y" +#line 212 "parse.y" { ; ; break;} case 12: -#line 212 "parse.y" +#line 213 "parse.y" { ; ; break;} case 13: -#line 213 "parse.y" +#line 214 "parse.y" { ; ; break;} case 14: -#line 214 "parse.y" +#line 215 "parse.y" { ; ; break;} case 15: -#line 215 "parse.y" +#line 216 "parse.y" { ; ; break;} case 16: -#line 216 "parse.y" +#line 217 "parse.y" { ; ; break;} case 17: -#line 219 "parse.y" +#line 220 "parse.y" { push_variable(yyvsp[-1].id,PUBLIC_SCOPE); ; break;} case 18: -#line 222 "parse.y" +#line 223 "parse.y" { push_variable(yyvsp[-1].id,PRIVATE_SCOPE); ; break;} case 19: -#line 226 "parse.y" +#line 227 "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); 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); class_nodes = g_list_append(class_nodes,node); } else { g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); @@ -1121,19 +1109,19 @@ case 19: ; break;} case 20: -#line 251 "parse.y" +#line 254 "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); 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); class_nodes = g_list_append(class_nodes,node); } else { g_free(yyvsp[-3].id); g_free(yyvsp[-5].id); @@ -1146,34 +1134,34 @@ case 20: ; break;} case 21: -#line 275 "parse.y" +#line 278 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 22: -#line 276 "parse.y" +#line 279 "parse.y" { yyval.list = NULL; ; break;} case 23: -#line 279 "parse.y" +#line 282 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 24: -#line 282 "parse.y" +#line 285 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 25: -#line 288 "parse.y" +#line 291 "parse.y" { Node *node = new_type(0,yyvsp[0].id); typestack = g_list_prepend(typestack,node); ; break;} case 26: -#line 292 "parse.y" +#line 295 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id); stars = 0; @@ -1181,202 +1169,201 @@ case 26: ; break;} case 27: -#line 299 "parse.y" +#line 302 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} case 28: -#line 302 "parse.y" +#line 305 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} case 29: -#line 305 "parse.y" +#line 308 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} case 30: -#line 308 "parse.y" +#line 311 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} case 31: -#line 311 "parse.y" +#line 314 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} case 32: -#line 314 "parse.y" +#line 317 "parse.y" { yyval.id = g_strdup("char"); ; break;} case 33: -#line 317 "parse.y" +#line 320 "parse.y" { yyval.id = g_strdup("double"); ; break;} case 34: -#line 320 "parse.y" +#line 323 "parse.y" { yyval.id = g_strdup("float"); ; break;} case 35: -#line 323 "parse.y" +#line 326 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 36: -#line 326 "parse.y" +#line 329 "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" +#line 333 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 38: -#line 333 "parse.y" +#line 336 "parse.y" { yyval.id = g_strdup("void"); ; break;} case 39: -#line 338 "parse.y" +#line 341 "parse.y" { yyval.id = "long int"; ; break;} case 40: -#line 341 "parse.y" +#line 344 "parse.y" { yyval.id = "long"; ; break;} case 41: -#line 344 "parse.y" +#line 347 "parse.y" { yyval.id = "short int"; ; break;} case 42: -#line 347 "parse.y" +#line 350 "parse.y" { yyval.id = "short"; ; break;} case 43: -#line 350 "parse.y" +#line 353 "parse.y" { yyval.id = "int"; ; break;} case 44: -#line 355 "parse.y" +#line 358 "parse.y" { yyval.id = "enum "; ; break;} case 45: -#line 358 "parse.y" +#line 361 "parse.y" { yyval.id = "union "; ; break;} case 46: -#line 361 "parse.y" +#line 364 "parse.y" { yyval.id = "struct "; ; break;} case 47: -#line 366 "parse.y" +#line 369 "parse.y" { stars++; ; break;} case 48: -#line 367 "parse.y" +#line 370 "parse.y" { stars++; ; break;} case 49: -#line 370 "parse.y" +#line 373 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} case 50: -#line 375 "parse.y" +#line 378 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} case 51: -#line 378 "parse.y" +#line 381 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} case 52: -#line 384 "parse.y" +#line 387 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(SIGNAL_LAST_METHOD,NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line); - ; - break;} -case 53: -#line 393 "parse.y" -{ + g_free(yyvsp[-9].id); + if(!has_this) { yyerror(_("signal without 'this' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line); + push_function(sigtype,NULL, + yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line,yyvsp[-1].line); ; break;} -case 54: -#line 402 "parse.y" +case 53: +#line 408 "parse.y" { - if(!has_this) { - yyerror(_("signal without 'this' as " - "first parameter")); + 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; } - push_function(SIGNAL_FIRST_METHOD, NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line); - ; - break;} -case 55: -#line 411 "parse.y" -{ + g_free(yyvsp[-8].id); if(!has_this) { yyerror(_("signal without 'this' as " "first parameter")); YYERROR; } - push_function(SIGNAL_FIRST_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-9].line); + push_function(sigtype, NULL, + yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line,0); ; break;} -case 56: -#line 420 "parse.y" +case 54: +#line 428 "parse.y" { if(!has_this) { yyerror(_("signal without 'this' as " @@ -1384,11 +1371,11 @@ case 56: YYERROR; } push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line); + yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line,yyvsp[-1].line); ; break;} -case 57: -#line 429 "parse.y" +case 55: +#line 437 "parse.y" { if(!has_this) { yyerror(_("signal without 'this' as " @@ -1396,55 +1383,55 @@ case 57: YYERROR; } push_function(SIGNAL_LAST_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-8].line); + yyvsp[-1].id, NULL,yyvsp[-8].line,0); ; break;} -case 58: -#line 438 "parse.y" +case 56: +#line 446 "parse.y" { push_function(VIRTUAL_METHOD, 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); ; break;} -case 59: -#line 442 "parse.y" +case 57: +#line 450 "parse.y" { push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, NULL,yyvsp[-7].line); + yyvsp[-1].id, NULL,yyvsp[-7].line,0); ; break;} -case 60: -#line 446 "parse.y" +case 58: +#line 454 "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); ; break;} -case 61: -#line 450 "parse.y" +case 59: +#line 458 "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); ; break;} -case 62: -#line 454 "parse.y" +case 60: +#line 462 "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); ; break;} -case 63: -#line 458 "parse.y" +case 61: +#line 466 "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); + NULL, NULL,yyvsp[-3].line,0); } 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); + yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); @@ -1453,17 +1440,19 @@ case 63: } ; break;} -case 64: -#line 474 "parse.y" +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[-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[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, + yyvsp[-1].line); } else { g_free(yyvsp[-5].id); g_free(yyvsp[-3].id); @@ -1473,35 +1462,35 @@ case 64: } ; break;} -case 65: -#line 493 "parse.y" +case 63: +#line 503 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 66: -#line 494 "parse.y" +case 64: +#line 504 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 67: -#line 495 "parse.y" +case 65: +#line 505 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 68: -#line 499 "parse.y" +case 66: +#line 509 "parse.y" { ; ; break;} -case 69: -#line 500 "parse.y" +case 67: +#line 510 "parse.y" { yyval.id = NULL; ; break;} -case 70: -#line 505 "parse.y" +case 68: +#line 515 "parse.y" { has_this = FALSE; ; break;} -case 71: -#line 506 "parse.y" +case 69: +#line 516 "parse.y" { has_this = TRUE; if(strcmp(yyvsp[0].id,"this")==0) @@ -1513,8 +1502,8 @@ case 71: } ; break;} -case 72: -#line 516 "parse.y" +case 70: +#line 526 "parse.y" { has_this = TRUE; if(strcmp(yyvsp[-2].id,"this")==0) @@ -1526,100 +1515,107 @@ case 72: } ; break;} -case 73: -#line 526 "parse.y" +case 71: +#line 536 "parse.y" { has_this = FALSE; ; break;} -case 74: -#line 529 "parse.y" +case 72: +#line 539 "parse.y" { ; ; break;} -case 75: -#line 530 "parse.y" +case 73: +#line 540 "parse.y" { ; ; break;} -case 76: -#line 533 "parse.y" +case 74: +#line 543 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 77: -#line 536 "parse.y" +case 75: +#line 546 "parse.y" { + if(strcmp(yyvsp[-2].id,"check")!=0) { + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-2].id); push_funcarg(yyvsp[-4].id); ; break;} -case 78: -#line 541 "parse.y" +case 76: +#line 556 "parse.y" { ; ; break;} -case 79: -#line 542 "parse.y" +case 77: +#line 557 "parse.y" { ; ; break;} -case 80: -#line 545 "parse.y" -{ - Node *node = new_check(NULL_CHECK,NULL); - checks = g_list_append(checks,node); - ; - break;} -case 81: -#line 549 "parse.y" -{ - Node *node = new_check(TYPE_CHECK,NULL); - checks = g_list_append(checks,node); +case 78: +#line 560 "parse.y" +{ + 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 79: +#line 573 "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 80: +#line 577 "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 81: +#line 581 "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 82: +#line 585 "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 83: +#line 589 "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 84: +#line 593 "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 85: +#line 599 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 89: -#line 580 "parse.y" +case 86: +#line 600 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); @@ -1847,5 +1843,5 @@ yyerrhandle: } return 1; } -#line 586 "parse.y" +#line 606 "parse.y"