/* 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 CONST 260
+#define VOID 261
+#define STRUCT 262
+#define UNION 263
+#define ENUM 264
+#define THREEDOTS 265
+#define SIGNED 266
+#define UNSIGNED 267
+#define LONG 268
+#define SHORT 269
+#define INT 270
+#define FLOAT 271
+#define DOUBLE 272
+#define CHAR 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 int vararg = 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_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;
}
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;
}
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 160 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 190
+#define YYFINAL 192
#define YYFLAG -32768
#define YYNTBASE 45
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 72)
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
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, 156, 160, 162, 165, 167, 178, 188, 197, 210,
+ 220, 230, 236, 243, 246, 250, 253, 254, 256, 258,
+ 262, 264, 268, 270, 274, 276, 279, 286, 289, 291,
+ 293, 296, 299, 303, 307, 311, 315, 317, 320
};
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, 63, 0, 49, 50, 0, 49, 51, 0,
+ 63, 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,
+ 20, 34, 61, 35, 0, 61, 38, 20, 0, 20,
+ 0, 31, 23, 0, 33, 0, 29, 20, 60, 54,
+ 20, 34, 65, 35, 64, 62, 0, 29, 60, 54,
+ 20, 34, 65, 35, 64, 62, 0, 28, 54, 20,
+ 34, 65, 35, 64, 62, 0, 30, 34, 22, 35,
+ 54, 20, 34, 65, 35, 64, 31, 23, 0, 25,
+ 54, 20, 34, 65, 35, 64, 31, 23, 0, 26,
+ 54, 20, 34, 65, 35, 64, 31, 23, 0, 20,
+ 34, 20, 35, 33, 0, 20, 34, 20, 35, 31,
+ 23, 0, 19, 71, 0, 19, 31, 23, 0, 39,
+ 40, 0, 0, 6, 0, 20, 0, 20, 38, 66,
+ 0, 66, 0, 67, 38, 10, 0, 67, 0, 67,
+ 38, 68, 0, 68, 0, 54, 20, 0, 54, 20,
+ 34, 20, 69, 35, 0, 69, 70, 0, 70, 0,
+ 20, 0, 41, 71, 0, 42, 71, 0, 41, 39,
+ 71, 0, 42, 39, 71, 0, 39, 39, 71, 0,
+ 43, 39, 71, 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
+ 178, 179, 180, 181, 184, 188, 192, 196, 202, 209,
+ 214, 215, 216, 217, 218, 219, 222, 225, 229, 258,
+ 284, 285, 288, 291, 297, 298, 306, 310, 317, 320,
+ 323, 326, 329, 332, 335, 338, 341, 344, 348, 351,
+ 356, 359, 362, 365, 368, 373, 376, 379, 384, 385,
+ 388, 393, 396, 401, 402, 406, 428, 438, 448, 454,
+ 459, 464, 482, 503, 504, 508, 509, 512, 513, 528,
+ 543, 546, 547, 550, 551, 554, 557, 567, 568, 571,
+ 584, 588, 592, 596, 600, 604, 610, 611, 615
};
#endif
#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","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, 61, 61, 62, 62, 63, 63, 63, 63, 63,
+ 63, 63, 63, 64, 64, 64, 64, 65, 65, 65,
+ 65, 66, 66, 67, 67, 68, 68, 69, 69, 70,
+ 70, 70, 70, 70, 70, 70, 71, 71, 71
};
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,
+ 4, 3, 1, 2, 1, 10, 9, 8, 12, 9,
+ 9, 5, 6, 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, 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, 0,
+ 0, 17, 0, 49, 18, 0, 0, 21, 0, 0,
+ 53, 0, 0, 0, 0, 0, 62, 40, 37, 0,
+ 0, 71, 73, 75, 0, 23, 0, 0, 51, 0,
+ 0, 0, 0, 63, 0, 76, 67, 0, 67, 0,
+ 67, 52, 0, 0, 0, 70, 0, 0, 0, 0,
+ 72, 74, 0, 0, 0, 0, 67, 0, 0, 89,
+ 87, 0, 0, 64, 66, 0, 0, 0, 20, 0,
+ 55, 58, 67, 0, 0, 80, 0, 0, 0, 0,
+ 0, 79, 65, 88, 60, 61, 0, 54, 0, 57,
+ 67, 0, 0, 81, 0, 82, 0, 77, 78, 0,
+ 56, 0, 85, 83, 84, 86, 19, 0, 59, 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[] = { 190,
+ 4, 5, 6, 22, 23, 24, 50, 73, 100, 44,
+ 45, 46, 47, 69, 53, 92, 152, 25, 130, 101,
+ 102, 103, 104, 161, 162, 144
};
-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[] = { 32,
+ 81,-32768,-32768, 36, 53, -15, 108,-32768,-32768, 53,
+ 137, 138, 92, 137, 87, 93, 93, 96, 93, 3,
+ 98, 127,-32768,-32768,-32768,-32768, 118, 128,-32768,-32768,
+-32768,-32768, 60, 156, 134, 136,-32768,-32768,-32768,-32768,
+-32768,-32768, 157,-32768, 125,-32768, 158, 159, 160, 161,
+ 162, -2, 93, 163,-32768,-32768,-32768,-32768, 148,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 19, 125,-32768,-32768,
+ 139, 150, 149, 167, 154, 155, 170, 93, 171, 164,
+ 10,-32768, 111,-32768,-32768, 111, 160,-32768, 172, 111,
+-32768, 23, 173, 166, 93, 174,-32768, 168, 28, 175,
+ 169,-32768, 176,-32768, 177,-32768, 165, 178,-32768, 181,
+ 182, 111, 185,-32768, 93, 183, -11, 75, -11, 179,
+ -11,-32768, 111, 180, 184,-32768, 186, -14, 187, 188,
+-32768,-32768, 189, -7, 63, 190, -11, 111, 29,-32768,
+-32768, 198, 201,-32768,-32768, 200, 203, 193,-32768, 205,
+-32768,-32768, -11, 63, 194,-32768, 191, -10, -6, 192,
+ 5,-32768,-32768,-32768,-32768,-32768, 209,-32768, 63,-32768,
+ -11, 1, 1,-32768, 1,-32768, 1,-32768,-32768, 202,
+-32768, 206,-32768,-32768,-32768,-32768,-32768, 210,-32768, 207,
+ 208,-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
+ 14, 230,-32768,-32768, 214, 216,-32768, 107, -16, 211,
+-32768, 142,-32768, 130, 195,-32768, -142, 218, -117, -81,
+ 94,-32768, 123,-32768, 49, -108
};
-#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 247
+
+
+static const short yytable[] = { 43,
+ 48, 133, 51, 135, 105, 140, 141, 128, 108, 140,
+ 141, 170, 148, 140, 141, 12, 142, 76, 11, 154,
+ 140, 141, 52, 14, 156, 149, 181, 129, 173, 143,
+ 124, 77, 175, 143, 1, 169, 79, 143, 1, 178,
+ 96, 136, 97, 157, 143, 158, 159, 160, 156, 174,
+ 176, 82, 83, 182, 2, 3, 155, 109, 8, 9,
+ 110, 93, -69, 183, 184, 115, 185, 157, 186, 158,
+ 159, 160, 35, 36, 37, 2, 3, 61, 113, 28,
+ 29, 30, 31, 32, 131, 33, 34, 35, 36, 37,
+ 38, 39, 40, 150, 41, 151, 42, 28, 29, 30,
+ 31, 32, 7, 33, 34, 35, 36, 37, 38, 39,
+ 40, 13, 41, 26, 42, 28, 98, 30, 31, 32,
+ 27, 33, 34, 35, 36, 37, 38, 39, 40, 49,
+ 99, 54, 42, 29, 30, 31, 32, 59, 33, 34,
+ 35, 36, 37, 38, 39, 40, 15, 41, 65, 42,
+ 66, 16, 17, 18, 19, 20, 21, 15, 55, 8,
+ 9, 68, 16, 17, 18, 19, 20, 21, 35, 36,
+ 37, 85, 86, 63, 62, 64, 67, 70, 71, 72,
+ 74, 75, 81, 88, 80, 87, 89, 90, 77, 91,
+ 94, 107, 111, 106, 116, 120, 114, 84, 95, 112,
+ 122, 134, -68, 117, 125, 139, 191, 192, 126, 179,
+ 0, 119, 121, 118, 137, 123, 127, 138, 146, 147,
+ 163, 164, 165, 167, 153, 166, 145, 168, 171, 172,
+ 177, 180, 189, 10, 187, 56, 188, 57, 60, 58,
+ 132, 0, 0, 0, 0, 0, 78
};
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, 119, 19, 121, 86, 20, 21, 19, 90, 20,
+ 21, 154, 20, 20, 21, 31, 31, 20, 5, 137,
+ 20, 21, 20, 10, 20, 33, 169, 39, 39, 44,
+ 112, 34, 39, 44, 3, 153, 53, 44, 3, 35,
+ 31, 123, 33, 39, 44, 41, 42, 43, 20, 158,
+ 159, 33, 34, 171, 23, 24, 138, 35, 23, 24,
+ 38, 78, 35, 172, 173, 38, 175, 39, 177, 41,
+ 42, 43, 13, 14, 15, 23, 24, 18, 95, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 31, 20, 33, 22, 5, 6, 7,
+ 8, 9, 22, 11, 12, 13, 14, 15, 16, 17,
+ 18, 4, 20, 22, 22, 5, 6, 7, 8, 9,
+ 34, 11, 12, 13, 14, 15, 16, 17, 18, 34,
+ 20, 34, 22, 6, 7, 8, 9, 20, 11, 12,
+ 13, 14, 15, 16, 17, 18, 20, 20, 15, 22,
+ 15, 25, 26, 27, 28, 29, 30, 20, 32, 23,
+ 24, 37, 25, 26, 27, 28, 29, 30, 13, 14,
+ 15, 33, 34, 18, 33, 34, 20, 20, 20, 20,
+ 20, 20, 35, 35, 22, 36, 20, 34, 34, 20,
+ 20, 20, 20, 87, 20, 31, 23, 68, 35, 34,
+ 20, 23, 35, 35, 20, 20, 0, 0, 115, 161,
+ -1, 35, 35, 38, 35, 34, 34, 34, 31, 31,
+ 23, 21, 23, 31, 35, 23, 40, 23, 35, 39,
+ 39, 23, 23, 4, 33, 22, 31, 22, 28, 22,
+ 118, -1, -1, -1, -1, -1, 52
};
/* -*-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 178 "parse.y"
{ ; ;
break;}
case 2:
-#line 177 "parse.y"
+#line 179 "parse.y"
{ ; ;
break;}
case 3:
-#line 178 "parse.y"
+#line 180 "parse.y"
{ ; ;
break;}
case 4:
-#line 179 "parse.y"
+#line 181 "parse.y"
{ ; ;
break;}
case 5:
-#line 182 "parse.y"
+#line 184 "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 188 "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 192 "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 196 "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 202 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 207 "parse.y"
+#line 209 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
case 11:
-#line 212 "parse.y"
+#line 214 "parse.y"
{ ; ;
break;}
case 12:
-#line 213 "parse.y"
+#line 215 "parse.y"
{ ; ;
break;}
case 13:
-#line 214 "parse.y"
+#line 216 "parse.y"
{ ; ;
break;}
case 14:
-#line 215 "parse.y"
+#line 217 "parse.y"
{ ; ;
break;}
case 15:
-#line 216 "parse.y"
+#line 218 "parse.y"
{ ; ;
break;}
case 16:
-#line 217 "parse.y"
+#line 219 "parse.y"
{ ; ;
break;}
case 17:
-#line 220 "parse.y"
+#line 222 "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 225 "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 229 "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 258 "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 284 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
case 22:
-#line 279 "parse.y"
+#line 285 "parse.y"
{ yyval.list = NULL; ;
break;}
case 23:
-#line 282 "parse.y"
+#line 288 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 24:
-#line 285 "parse.y"
+#line 291 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 25:
-#line 291 "parse.y"
+#line 297 "parse.y"
+{ ; ;
+ break;}
+case 26:
+#line 298 "parse.y"
+{
+ Type *type = typestack->data;
+ char *oldname = type->name;
+ type->name = g_strconcat("const ",oldname,NULL);
+ g_free(oldname);
+ ;
+ break;}
+case 27:
+#line 306 "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 310 "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 317 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 28:
-#line 305 "parse.y"
+case 30:
+#line 320 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 29:
-#line 308 "parse.y"
+case 31:
+#line 323 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 30:
-#line 311 "parse.y"
+case 32:
+#line 326 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 31:
-#line 314 "parse.y"
+case 33:
+#line 329 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 32:
-#line 317 "parse.y"
+case 34:
+#line 332 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 33:
-#line 320 "parse.y"
+case 35:
+#line 335 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 34:
-#line 323 "parse.y"
+case 36:
+#line 338 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 35:
-#line 326 "parse.y"
+case 37:
+#line 341 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 36:
-#line 329 "parse.y"
+case 38:
+#line 344 "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 348 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 38:
-#line 336 "parse.y"
+case 40:
+#line 351 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 39:
-#line 341 "parse.y"
+case 41:
+#line 356 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 40:
-#line 344 "parse.y"
+case 42:
+#line 359 "parse.y"
{
yyval.id = "long";
;
break;}
-case 41:
-#line 347 "parse.y"
+case 43:
+#line 362 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 42:
-#line 350 "parse.y"
+case 44:
+#line 365 "parse.y"
{
yyval.id = "short";
;
break;}
-case 43:
-#line 353 "parse.y"
+case 45:
+#line 368 "parse.y"
{
yyval.id = "int";
;
break;}
-case 44:
-#line 358 "parse.y"
+case 46:
+#line 373 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 45:
-#line 361 "parse.y"
+case 47:
+#line 376 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 46:
-#line 364 "parse.y"
+case 48:
+#line 379 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 47:
-#line 369 "parse.y"
+case 49:
+#line 384 "parse.y"
{ stars++; ;
break;}
-case 48:
-#line 370 "parse.y"
+case 50:
+#line 385 "parse.y"
{ stars++; ;
break;}
-case 49:
-#line 373 "parse.y"
+case 51:
+#line 388 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 50:
-#line 378 "parse.y"
+case 52:
+#line 393 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 51:
-#line 381 "parse.y"
+case 53:
+#line 396 "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);
- ;
+case 54:
+#line 401 "parse.y"
+{ yyval.cbuf=yyvsp[0].cbuf; ;
break;}
-case 53:
-#line 408 "parse.y"
+case 55:
+#line 402 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 56:
+#line 406 "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,vararg);
;
break;}
-case 54:
+case 57:
#line 428 "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,vararg);
;
break;}
-case 55:
-#line 437 "parse.y"
+case 58:
+#line 438 "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,vararg);
;
break;}
-case 58:
-#line 454 "parse.y"
+case 59:
+#line 448 "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 60:
+#line 454 "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 61:
+#line 459 "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 62:
+#line 464 "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);
+ NULL, NULL,yyvsp[-3].line,0,
+ 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);
+ yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0,
+ FALSE);
} else {
g_free(yyvsp[-4].id);
g_free(yyvsp[-2].id);
}
;
break;}
-case 62:
+case 63:
#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);
+ yyvsp[-1].line,FALSE);
} 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);
+ yyvsp[-1].line,FALSE);
} else {
g_free(yyvsp[-5].id);
g_free(yyvsp[-3].id);
}
;
break;}
-case 63:
-#line 503 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
- break;}
case 64:
-#line 504 "parse.y"
+#line 503 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
case 65:
-#line 505 "parse.y"
+#line 504 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 66:
-#line 509 "parse.y"
+#line 508 "parse.y"
{ ; ;
break;}
case 67:
-#line 510 "parse.y"
+#line 509 "parse.y"
{ yyval.id = NULL; ;
break;}
case 68:
-#line 515 "parse.y"
-{ has_this = FALSE; ;
+#line 512 "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);
+#line 513 "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);
+#line 528 "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; ;
+#line 543 "parse.y"
+{ has_self = FALSE; ;
break;}
case 72:
-#line 539 "parse.y"
-{ ; ;
+#line 546 "parse.y"
+{ vararg = TRUE; ;
break;}
case 73:
-#line 540 "parse.y"
-{ ; ;
+#line 547 "parse.y"
+{ vararg = FALSE; ;
break;}
case 74:
-#line 543 "parse.y"
+#line 550 "parse.y"
+{ ; ;
+ break;}
+case 75:
+#line 551 "parse.y"
+{ ; ;
+ break;}
+case 76:
+#line 554 "parse.y"
{
push_funcarg(yyvsp[0].id);
;
break;}
-case 75:
-#line 546 "parse.y"
+case 77:
+#line 557 "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 78:
+#line 567 "parse.y"
{ ; ;
break;}
-case 77:
-#line 557 "parse.y"
+case 79:
+#line 568 "parse.y"
{ ; ;
break;}
-case 78:
-#line 560 "parse.y"
+case 80:
+#line 571 "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 81:
+#line 584 "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 82:
+#line 588 "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 83:
+#line 592 "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 84:
+#line 596 "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 85:
+#line 600 "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 86:
+#line 604 "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 87:
+#line 610 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 86:
-#line 600 "parse.y"
+case 88:
+#line 611 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
+case 89:
+#line 615 "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 618 "parse.y"