/* A Bison parser, made from parse.y
- by GNU Bison version 1.27
+ by GNU Bison version 1.25
*/
#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 ONERROR 273
-#define TOKEN 274
-#define NUMBER 275
-#define TYPETOKEN 276
-#define CCODE 277
-#define HCODE 278
-#define PUBLIC 279
-#define PRIVATE 280
-#define ARGUMENT 281
-#define VIRTUAL 282
-#define SIGNAL 283
-#define OVERRIDE 284
+#define CLASS 258
+#define FROM 259
+#define VOID 260
+#define STRUCT 261
+#define UNION 262
+#define ENUM 263
+#define SIGNED 264
+#define UNSIGNED 265
+#define LONG 266
+#define SHORT 267
+#define INT 268
+#define FLOAT 269
+#define DOUBLE 270
+#define CHAR 271
+#define FIRST 272
+#define LAST 273
+#define ONERROR 274
+#define TOKEN 275
+#define NUMBER 276
+#define TYPETOKEN 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"
#include <string.h>
#include "tree.h"
+#include "main.h"
#define _(x) (x)
static int stars = 0;
static GList *funcargs = NULL;
static GList *checks = NULL;
-static int has_this = FALSE;
+static int has_self = FALSE;
static GList *gtktypes = NULL;
}
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_this(char *this)
+push_self(char *id)
{
Node *node;
Node *type;
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 159 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 190
+#define YYFINAL 187
#define YYFLAG -32768
#define YYNTBASE 45
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 70)
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, 2, 2, 2, 2, 2, 2, 2, 2,
- 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
+ 2, 2, 2, 2, 2, 1, 2, 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
};
#if YYDEBUG != 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, 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
+ 155, 157, 160, 162, 173, 183, 192, 205, 215, 225,
+ 231, 238, 241, 245, 248, 249, 251, 253, 257, 259,
+ 263, 265, 268, 275, 278, 280, 282, 285, 288, 292,
+ 296, 300, 304, 306, 309
};
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, 62, 0, 49, 50, 0, 49, 51, 0,
+ 62, 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,
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
+ 60, 38, 20, 0, 20, 0, 31, 23, 0, 33,
+ 0, 29, 20, 59, 54, 20, 34, 64, 35, 63,
+ 61, 0, 29, 59, 54, 20, 34, 64, 35, 63,
+ 61, 0, 28, 54, 20, 34, 64, 35, 63, 61,
+ 0, 30, 34, 22, 35, 54, 20, 34, 64, 35,
+ 63, 31, 23, 0, 25, 54, 20, 34, 64, 35,
+ 63, 31, 23, 0, 26, 54, 20, 34, 64, 35,
+ 63, 31, 23, 0, 20, 34, 20, 35, 33, 0,
+ 20, 34, 20, 35, 31, 23, 0, 19, 69, 0,
+ 19, 31, 23, 0, 39, 40, 0, 0, 5, 0,
+ 20, 0, 20, 38, 65, 0, 65, 0, 65, 38,
+ 66, 0, 66, 0, 54, 20, 0, 54, 20, 34,
+ 20, 67, 35, 0, 67, 68, 0, 68, 0, 20,
+ 0, 41, 69, 0, 42, 69, 0, 41, 39, 69,
+ 0, 42, 39, 69, 0, 39, 39, 69, 0, 43,
+ 39, 69, 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
+ 177, 178, 179, 180, 183, 187, 191, 195, 201, 208,
+ 213, 214, 215, 216, 217, 218, 221, 224, 228, 257,
+ 283, 284, 287, 290, 296, 300, 307, 310, 313, 316,
+ 319, 322, 325, 328, 331, 334, 338, 341, 346, 349,
+ 352, 355, 358, 363, 366, 369, 374, 375, 378, 383,
+ 386, 391, 392, 396, 417, 426, 435, 439, 443, 447,
+ 463, 484, 485, 489, 490, 495, 496, 511, 526, 529,
+ 530, 533, 536, 546, 547, 550, 563, 567, 571, 575,
+ 579, 583, 589, 590, 594
};
#endif
"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'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
+"codenocode","method","onerror","funcargs","arglist","arg","checklist","check",
+"numtok", NULL
};
#endif
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
+ 60, 61, 61, 62, 62, 62, 62, 62, 62, 62,
+ 62, 63, 63, 63, 63, 64, 64, 64, 64, 65,
+ 65, 66, 66, 67, 67, 68, 68, 68, 68, 68,
+ 68, 68, 69, 69, 69
};
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, 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
+ 1, 2, 1, 10, 9, 8, 12, 9, 9, 5,
+ 6, 2, 3, 2, 0, 1, 1, 3, 1, 3,
+ 1, 2, 6, 2, 1, 1, 2, 2, 3, 3,
+ 3, 3, 1, 2, 1
};
static const short yydefact[] = { 0,
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, 0, 60, 38, 35, 0, 0, 69, 71,
+ 0, 23, 0, 0, 49, 0, 0, 0, 0, 61,
+ 0, 72, 65, 0, 65, 0, 65, 50, 0, 0,
+ 0, 68, 0, 0, 0, 0, 70, 0, 0, 0,
+ 0, 65, 0, 0, 85, 83, 0, 0, 62, 64,
+ 0, 0, 0, 20, 0, 53, 56, 65, 0, 0,
+ 76, 0, 0, 0, 0, 0, 75, 63, 84, 58,
+ 59, 0, 52, 0, 55, 65, 0, 0, 77, 0,
+ 78, 0, 73, 74, 0, 54, 0, 81, 79, 80,
+ 82, 19, 0, 57, 0, 0, 0
};
-static const short yydefgoto[] = { 188,
+static const short yydefgoto[] = { 185,
4, 5, 6, 22, 23, 24, 48, 70, 97, 43,
- 44, 45, 66, 51, 89, 25, 126, 98, 99, 100,
- 155, 156, 139
+ 44, 45, 66, 51, 89, 147, 25, 126, 98, 99,
+ 100, 156, 157, 139
};
-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[] = { 26,
+ -14,-32768,-32768, 37, 51, -6, 43,-32768,-32768, 51,
+ 98, 99, 8, 98, 20, 72, 72, 24, 72, 52,
+ 57, 88,-32768,-32768,-32768,-32768, 69,-32768,-32768,-32768,
+-32768, 119, 125, 94, 96,-32768,-32768,-32768,-32768,-32768,
+-32768, 91, 86,-32768, 120, 127, 128, 129, 130, 33,
+ 72, 131,-32768,-32768,-32768,-32768, 116,-32768,-32768,-32768,
+-32768,-32768,-32768, 100, 86,-32768,-32768, 110, 118, 117,
+ 135, 122, 123, 138, 72, 139, 126, 31,-32768, 90,
+-32768,-32768, 90, 128,-32768, 140, 90,-32768, 55, 142,
+ 132, 72, 141,-32768, 133, 104, 143, 134, 136,-32768,
+ 137,-32768, 144, 145,-32768, 147, 148, 90, 150,-32768,
+ 72, 149, -17, 72, -17, 153, -17,-32768, 90, 146,
+ 151, 136, 157, -11, 152, 155,-32768, 156, 36, 40,
+ 154, -17, 90, -15,-32768,-32768, 161, 158,-32768,-32768,
+ 165, 167, 160,-32768, 170,-32768,-32768, -17, 40, 159,
+-32768, 162, -8, -5, 163, 3,-32768,-32768,-32768,-32768,
+-32768, 172,-32768, 40,-32768, -17, -3, -3,-32768, -3,
+-32768, -3,-32768,-32768, 164,-32768, 168,-32768,-32768,-32768,
+-32768,-32768, 173,-32768, 171, 178,-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
+ 9, 169,-32768,-32768, 176, 181,-32768, 81, -16,-32768,
+ 113,-32768, 166, 174,-32768, -101, 182, -111, -76, 89,
+ 92,-32768, 49, -102
};
-#define YYLAST 209
+#define YYLAST 231
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
+ 46, 124, 49, 128, 151, 130, 101, 7, 135, 136,
+ 104, 135, 136, 11, 135, 136, 135, 136, 14, 137,
+ 149, 125, 151, 152, 12, 153, 154, 155, 1, 26,
+ 168, 120, 138, 170, 76, 138, 164, 173, 138, 1,
+ 138, 152, 131, 153, 154, 155, 13, 165, 2, 3,
+ 169, 171, 73, 27, 177, 143, 150, 47, 90, 8,
+ 9, 93, 176, 94, 178, 179, 74, 180, 144, 181,
+ 145, 50, 146, 2, 3, 109, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 57, 105,
+ 52, 40, 106, 41, 95, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 62, 15, 63, 96,
+ 64, 41, 16, 17, 18, 19, 20, 21, 15, 53,
+ 8, 9, 65, 16, 17, 18, 19, 20, 21, 34,
+ 35, 36, 79, 80, 58, 34, 35, 36, -67, 67,
+ 60, 111, 82, 83, 59, 61, 68, 69, 71, 72,
+ 78, 85, 77, 84, 86, 87, 74, 88, 91, 103,
+ 92, 107, 112, 110, 102, 108, 118, -66, 113, 121,
+ 186, 115, 10, 114, 116, 129, 134, 187, 159, 117,
+ 132, 119, 123, 158, 133, 141, 142, 160, 148, 161,
+ 162, 140, 163, 166, 175, 184, 182, 54, 183, 122,
+ 167, 172, 55, 56, 174, 127, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 75, 0, 0, 0, 0, 0, 0,
+ 81
};
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, 19, 19, 115, 20, 117, 83, 22, 20, 21,
+ 87, 20, 21, 5, 20, 21, 20, 21, 10, 31,
+ 132, 39, 20, 39, 31, 41, 42, 43, 3, 22,
+ 39, 108, 44, 39, 51, 44, 148, 35, 44, 3,
+ 44, 39, 119, 41, 42, 43, 4, 149, 23, 24,
+ 153, 154, 20, 34, 166, 20, 133, 34, 75, 23,
+ 24, 31, 164, 33, 167, 168, 34, 170, 33, 172,
+ 31, 20, 33, 23, 24, 92, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 20, 35,
+ 34, 20, 38, 22, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 13, 20, 13, 20,
+ 20, 22, 25, 26, 27, 28, 29, 30, 20, 32,
+ 23, 24, 37, 25, 26, 27, 28, 29, 30, 11,
+ 12, 13, 33, 34, 16, 11, 12, 13, 35, 20,
+ 16, 38, 33, 34, 32, 33, 20, 20, 20, 20,
+ 35, 35, 22, 36, 20, 34, 34, 20, 20, 20,
+ 35, 20, 20, 23, 84, 34, 20, 35, 35, 20,
+ 0, 35, 4, 38, 31, 23, 20, 0, 21, 35,
+ 35, 34, 34, 23, 34, 31, 31, 23, 35, 23,
+ 31, 40, 23, 35, 23, 23, 33, 22, 31, 111,
+ 39, 39, 22, 22, 156, 114, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 50, -1, -1, -1, -1, -1, -1,
+ 65
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.27. */
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
+#ifndef alloca
#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
#include <alloca.h>
#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C. */
-/* This used to test MSDOS, but that is a bad idea
- since that symbol is in the user namespace. */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
- instead, just don't use alloca. */
+#if defined (MSDOS) && !defined (__TURBOC__)
#include <malloc.h>
-#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
- So I turned it off. rms, 2 May 1997. */
-/* #include <malloc.h> */
+#include <malloc.h>
#pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
- and on HPUX 10. Eventually we can turn this on. */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
+#else /* not MSDOS, __TURBOC__, or _AIX */
+#ifdef __hpux
+#ifdef __cplusplus
+extern "C" {
+void *alloca (unsigned int);
+};
+#else /* not __cplusplus */
+void *alloca ();
+#endif /* not __cplusplus */
#endif /* __hpux */
-#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+#endif /* not sparc. */
+#endif /* not GNU C. */
+#endif /* alloca not defined. */
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
+#define YYACCEPT return(0)
+#define YYABORT return(1)
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
-\f
-/* Define __yy_memcpy. Note that the size argument
- should be passed with type unsigned int, because that is what the non-GCC
- definitions require. With GCC, __builtin_memcpy takes an arg
- of type size_t, but it can handle unsigned int. */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+int yyparse (void);
+#endif
+\f
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
__yy_memcpy (to, from, count)
char *to;
char *from;
- unsigned int count;
+ int count;
{
register char *f = from;
register char *t = to;
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+__yy_memcpy (char *to, char *from, int count)
{
- register char *t = to;
register char *f = from;
+ register char *t = to;
register int i = count;
while (i-- > 0)
#endif
#endif
\f
-#line 216 "/usr/lib/bison.simple"
+#line 196 "/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 *.
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
#endif
int yystacksize = YYINITDEPTH;
- int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
- yyfree_stacks = 1;
-#endif
- yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1,
- size * (unsigned int) sizeof (*yyssp));
- yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1,
- size * (unsigned int) sizeof (*yyvsp));
+ yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
+ yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1,
- size * (unsigned int) sizeof (*yylsp));
+ yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
switch (yyn) {
case 1:
-#line 176 "parse.y"
+#line 177 "parse.y"
{ ; ;
break;}
case 2:
-#line 177 "parse.y"
+#line 178 "parse.y"
{ ; ;
break;}
case 3:
-#line 178 "parse.y"
+#line 179 "parse.y"
{ ; ;
break;}
case 4:
-#line 179 "parse.y"
+#line 180 "parse.y"
{ ; ;
break;}
case 5:
-#line 182 "parse.y"
+#line 183 "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 187 "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 191 "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 195 "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 201 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 207 "parse.y"
+#line 208 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
case 11:
-#line 212 "parse.y"
+#line 213 "parse.y"
{ ; ;
break;}
case 12:
-#line 213 "parse.y"
+#line 214 "parse.y"
{ ; ;
break;}
case 13:
-#line 214 "parse.y"
+#line 215 "parse.y"
{ ; ;
break;}
case 14:
-#line 215 "parse.y"
+#line 216 "parse.y"
{ ; ;
break;}
case 15:
-#line 216 "parse.y"
+#line 217 "parse.y"
{ ; ;
break;}
case 16:
-#line 217 "parse.y"
+#line 218 "parse.y"
{ ; ;
break;}
case 17:
-#line 220 "parse.y"
+#line 221 "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 224 "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 228 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
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) {
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);
;
break;}
case 20:
-#line 254 "parse.y"
+#line 257 "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);
;
break;}
case 21:
-#line 278 "parse.y"
+#line 283 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
case 22:
-#line 279 "parse.y"
+#line 284 "parse.y"
{ yyval.list = NULL; ;
break;}
case 23:
-#line 282 "parse.y"
+#line 287 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 24:
-#line 285 "parse.y"
+#line 290 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 25:
-#line 291 "parse.y"
+#line 296 "parse.y"
{
Node *node = new_type(0,yyvsp[0].id);
typestack = g_list_prepend(typestack,node);
;
break;}
case 26:
-#line 295 "parse.y"
+#line 300 "parse.y"
{
Node *node = new_type(stars,yyvsp[-1].id);
stars = 0;
;
break;}
case 27:
-#line 302 "parse.y"
+#line 307 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
case 28:
-#line 305 "parse.y"
+#line 310 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
case 29:
-#line 308 "parse.y"
+#line 313 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
case 30:
-#line 311 "parse.y"
+#line 316 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
case 31:
-#line 314 "parse.y"
+#line 319 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
case 32:
-#line 317 "parse.y"
+#line 322 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
case 33:
-#line 320 "parse.y"
+#line 325 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
case 34:
-#line 323 "parse.y"
+#line 328 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
case 35:
-#line 326 "parse.y"
+#line 331 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
case 36:
-#line 329 "parse.y"
+#line 334 "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"
+#line 338 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
case 38:
-#line 336 "parse.y"
+#line 341 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
case 39:
-#line 341 "parse.y"
+#line 346 "parse.y"
{
yyval.id = "long int";
;
break;}
case 40:
-#line 344 "parse.y"
+#line 349 "parse.y"
{
yyval.id = "long";
;
break;}
case 41:
-#line 347 "parse.y"
+#line 352 "parse.y"
{
yyval.id = "short int";
;
break;}
case 42:
-#line 350 "parse.y"
+#line 355 "parse.y"
{
yyval.id = "short";
;
break;}
case 43:
-#line 353 "parse.y"
+#line 358 "parse.y"
{
yyval.id = "int";
;
break;}
case 44:
-#line 358 "parse.y"
+#line 363 "parse.y"
{
yyval.id = "enum ";
;
break;}
case 45:
-#line 361 "parse.y"
+#line 366 "parse.y"
{
yyval.id = "union ";
;
break;}
case 46:
-#line 364 "parse.y"
+#line 369 "parse.y"
{
yyval.id = "struct ";
;
break;}
case 47:
-#line 369 "parse.y"
+#line 374 "parse.y"
{ stars++; ;
break;}
case 48:
-#line 370 "parse.y"
+#line 375 "parse.y"
{ stars++; ;
break;}
case 49:
-#line 373 "parse.y"
+#line 378 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
case 50:
-#line 378 "parse.y"
+#line 383 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
case 51:
-#line 381 "parse.y"
+#line 386 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
case 52:
-#line 387 "parse.y"
-{
- int sigtype = SIGNAL_LAST_METHOD;
- if(strcmp(yyvsp[-9].id,"first")==0)
- sigtype = SIGNAL_FIRST_METHOD;
- else if(strcmp(yyvsp[-9].id,"last")==0)
- sigtype = SIGNAL_LAST_METHOD;
- else {
- yyerror(_("signal must be 'first' or 'last'"));
- g_free(yyvsp[-9].id);
- YYERROR;
- }
- g_free(yyvsp[-9].id);
-
- if(!has_this) {
- yyerror(_("signal without 'this' as "
- "first parameter"));
- YYERROR;
- }
- push_function(sigtype,NULL,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line,yyvsp[-1].line);
- ;
+#line 391 "parse.y"
+{ yyval.cbuf=yyvsp[0].cbuf; ;
break;}
case 53:
-#line 408 "parse.y"
+#line 392 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 54:
+#line 396 "parse.y"
{
int sigtype = SIGNAL_LAST_METHOD;
if(strcmp(yyvsp[-8].id,"first")==0)
YYERROR;
}
g_free(yyvsp[-8].id);
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(sigtype, NULL,
- yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line,0);
+ push_function(sigtype,NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line,ccode_line);
;
break;}
-case 54:
-#line 428 "parse.y"
+case 55:
+#line 417 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ 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);
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,ccode_line);
;
break;}
-case 55:
-#line 437 "parse.y"
+case 56:
+#line 426 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, NULL,yyvsp[-8].line,0);
- ;
- break;}
-case 56:
-#line 446 "parse.y"
-{
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
- ;
- break;}
-case 57:
-#line 450 "parse.y"
-{
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);
;
break;}
-case 58:
-#line 454 "parse.y"
+case 57:
+#line 435 "parse.y"
{
push_function(OVERRIDE_METHOD, yyvsp[-9].id,
yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line,yyvsp[-1].line);
;
break;}
-case 59:
-#line 458 "parse.y"
+case 58:
+#line 439 "parse.y"
{
push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
;
break;}
-case 60:
-#line 462 "parse.y"
+case 59:
+#line 443 "parse.y"
{
push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
;
break;}
-case 61:
-#line 466 "parse.y"
+case 60:
+#line 447 "parse.y"
{
if(strcmp(yyvsp[-4].id,"init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
}
;
break;}
-case 62:
-#line 482 "parse.y"
+case 61:
+#line 463 "parse.y"
{
if(strcmp(yyvsp[-5].id,"init")==0) {
push_init_arg(yyvsp[-3].id,FALSE);
}
;
break;}
-case 63:
-#line 503 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
- break;}
-case 64:
-#line 504 "parse.y"
+case 62:
+#line 484 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 65:
-#line 505 "parse.y"
+case 63:
+#line 485 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 66:
-#line 509 "parse.y"
+case 64:
+#line 489 "parse.y"
{ ; ;
break;}
-case 67:
-#line 510 "parse.y"
+case 65:
+#line 490 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 68:
-#line 515 "parse.y"
-{ has_this = FALSE; ;
+case 66:
+#line 495 "parse.y"
+{ 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 67:
+#line 496 "parse.y"
+{
+ 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"));
}
;
break;}
-case 70:
-#line 526 "parse.y"
-{
- has_this = TRUE;
- if(strcmp(yyvsp[-2].id,"this")==0)
- push_this(yyvsp[-2].id);
+case 68:
+#line 511 "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"));
}
;
break;}
-case 71:
-#line 536 "parse.y"
-{ has_this = FALSE; ;
+case 69:
+#line 526 "parse.y"
+{ has_self = FALSE; ;
break;}
-case 72:
-#line 539 "parse.y"
+case 70:
+#line 529 "parse.y"
{ ; ;
break;}
-case 73:
-#line 540 "parse.y"
+case 71:
+#line 530 "parse.y"
{ ; ;
break;}
-case 74:
-#line 543 "parse.y"
+case 72:
+#line 533 "parse.y"
{
push_funcarg(yyvsp[0].id);
;
break;}
-case 75:
-#line 546 "parse.y"
+case 73:
+#line 536 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id);
;
break;}
-case 76:
-#line 556 "parse.y"
+case 74:
+#line 546 "parse.y"
{ ; ;
break;}
-case 77:
-#line 557 "parse.y"
+case 75:
+#line 547 "parse.y"
{ ; ;
break;}
-case 78:
-#line 560 "parse.y"
+case 76:
+#line 550 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 79:
-#line 573 "parse.y"
+case 77:
+#line 563 "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 78:
+#line 567 "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 79:
+#line 571 "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 80:
+#line 575 "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 81:
+#line 579 "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 82:
+#line 583 "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 83:
+#line 589 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 86:
-#line 600 "parse.y"
+case 84:
+#line 590 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
+case 85:
+#line 594 "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 498 "/usr/lib/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
yystate = yyn;
goto yynewstate;
-
- yyacceptlab:
- /* YYACCEPT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 0;
-
- yyabortlab:
- /* YYABORT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 1;
}
-#line 606 "parse.y"
+#line 597 "parse.y"