/* A Bison parser, made from parse.y
- by GNU Bison version 1.27
- */
+ by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
#define CLASS 257
#define FROM 258
-#define VOID 259
-#define STRUCT 260
-#define UNION 261
-#define ENUM 262
-#define SIGNED 263
-#define UNSIGNED 264
-#define LONG 265
-#define SHORT 266
-#define INT 267
-#define FLOAT 268
-#define DOUBLE 269
-#define CHAR 270
-#define FIRST 271
-#define LAST 272
-#define CHECK 273
-#define CNULL 274
-#define TYPE 275
-#define ONERROR 276
-#define TOKEN 277
-#define NUMBER 278
-#define TYPETOKEN 279
-#define CCODE 280
-#define HCODE 281
-#define PUBLIC 282
-#define PRIVATE 283
-#define ARGUMENT 284
-#define VIRTUAL 285
-#define SIGNAL 286
-#define OVERRIDE 287
+#define CONST 259
+#define VOID 260
+#define STRUCT 261
+#define UNION 262
+#define ENUM 263
+#define THREEDOTS 264
+#define SIGNED 265
+#define UNSIGNED 266
+#define LONG 267
+#define SHORT 268
+#define INT 269
+#define FLOAT 270
+#define DOUBLE 271
+#define CHAR 272
+#define ONERROR 273
+#define TOKEN 274
+#define NUMBER 275
+#define TYPETOKEN 276
+#define 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"
#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;
void free(void *ptr);
int yylex(void);
+extern int ccode_line;
extern int line_no;
extern char *yytext;
}
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)
+ 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);
+ 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 157 "parse.y"
+#line 160 "parse.y"
typedef union {
char *id;
GString *cbuf;
GList *list;
int line;
+ int sigtype;
} YYSTYPE;
#ifndef YYDEBUG
#define YYDEBUG 1
-#define YYFINAL 202
+#define YYFINAL 198
#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] : 73)
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,
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
static const short yyprhs[] = { 0,
0, 4, 7, 10, 12, 15, 18, 20, 22, 27,
32, 35, 38, 41, 43, 45, 47, 52, 57, 69,
- 78, 82, 83, 87, 89, 91, 94, 97, 100, 102,
- 105, 108, 110, 112, 114, 116, 119, 121, 123, 126,
- 128, 131, 133, 135, 137, 139, 141, 144, 146, 151,
- 155, 157, 169, 180, 192, 203, 214, 224, 234, 243,
- 256, 266, 276, 282, 289, 292, 295, 299, 302, 303,
- 305, 307, 311, 313, 317, 319, 322, 329, 332, 334,
- 336, 338, 341, 344, 348, 352, 356, 360, 362
+ 78, 82, 83, 87, 89, 91, 94, 96, 99, 102,
+ 105, 107, 110, 113, 115, 117, 119, 121, 124, 126,
+ 128, 131, 133, 136, 138, 140, 142, 144, 146, 149,
+ 151, 155, 159, 162, 165, 167, 172, 176, 178, 181,
+ 183, 193, 203, 212, 225, 235, 245, 251, 254, 258,
+ 261, 262, 264, 266, 270, 272, 276, 278, 282, 284,
+ 287, 294, 297, 299, 301, 304, 307, 311, 315, 319,
+ 323, 325, 328
};
-static const short yyrhs[] = { 49,
- 50, 49, 0, 50, 49, 0, 49, 50, 0, 50,
- 0, 49, 26, 0, 49, 27, 0, 26, 0, 27,
- 0, 51, 34, 52, 35, 0, 3, 25, 4, 25,
- 0, 52, 64, 0, 52, 53, 0, 52, 54, 0,
- 64, 0, 53, 0, 54, 0, 28, 57, 23, 36,
- 0, 29, 57, 23, 36, 0, 30, 55, 23, 23,
- 23, 34, 26, 23, 34, 26, 36, 0, 30, 55,
- 23, 23, 23, 34, 26, 36, 0, 37, 56, 38,
- 0, 0, 23, 39, 56, 0, 23, 0, 58, 0,
- 58, 61, 0, 10, 59, 0, 9, 59, 0, 59,
- 0, 10, 16, 0, 9, 16, 0, 16, 0, 15,
- 0, 14, 0, 23, 0, 60, 23, 0, 25, 0,
- 5, 0, 11, 13, 0, 11, 0, 12, 13, 0,
- 12, 0, 13, 0, 8, 0, 7, 0, 6, 0,
- 40, 61, 0, 40, 0, 23, 37, 63, 38, 0,
- 63, 41, 23, 0, 23, 0, 32, 18, 62, 57,
- 23, 37, 66, 38, 65, 34, 26, 0, 32, 18,
- 62, 57, 23, 37, 66, 38, 65, 36, 0, 32,
- 17, 62, 57, 23, 37, 66, 38, 65, 34, 26,
- 0, 32, 17, 62, 57, 23, 37, 66, 38, 65,
- 36, 0, 32, 62, 57, 23, 37, 66, 38, 65,
- 34, 26, 0, 32, 62, 57, 23, 37, 66, 38,
- 65, 36, 0, 31, 57, 23, 37, 66, 38, 65,
- 34, 26, 0, 31, 57, 23, 37, 66, 38, 65,
- 36, 0, 33, 37, 25, 38, 57, 23, 37, 66,
- 38, 65, 34, 26, 0, 28, 57, 23, 37, 66,
- 38, 65, 34, 26, 0, 29, 57, 23, 37, 66,
- 38, 65, 34, 26, 0, 23, 37, 23, 38, 36,
- 0, 23, 37, 23, 38, 34, 26, 0, 22, 23,
- 0, 22, 71, 0, 22, 34, 26, 0, 42, 43,
- 0, 0, 5, 0, 23, 0, 23, 41, 67, 0,
- 67, 0, 67, 41, 68, 0, 68, 0, 57, 23,
- 0, 57, 23, 37, 19, 69, 38, 0, 69, 70,
- 0, 70, 0, 20, 0, 21, 0, 44, 71, 0,
- 45, 71, 0, 44, 42, 71, 0, 45, 42, 71,
- 0, 42, 42, 71, 0, 46, 42, 71, 0, 24,
- 0, 47, 24, 0
+static const short yyrhs[] = { 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, 64, 0, 49, 50, 0, 49, 51, 0,
+ 64, 0, 50, 0, 51, 0, 25, 54, 20, 33,
+ 0, 26, 54, 20, 33, 0, 27, 52, 20, 20,
+ 20, 31, 23, 20, 31, 23, 33, 0, 27, 52,
+ 20, 20, 20, 31, 23, 33, 0, 34, 53, 35,
+ 0, 0, 20, 36, 53, 0, 20, 0, 55, 0,
+ 5, 55, 0, 56, 0, 56, 59, 0, 12, 57,
+ 0, 11, 57, 0, 57, 0, 12, 18, 0, 11,
+ 18, 0, 18, 0, 17, 0, 16, 0, 20, 0,
+ 58, 20, 0, 22, 0, 6, 0, 13, 15, 0,
+ 13, 0, 14, 15, 0, 14, 0, 15, 0, 9,
+ 0, 8, 0, 7, 0, 37, 59, 0, 37, 0,
+ 26, 20, 61, 0, 20, 26, 61, 0, 26, 61,
+ 0, 20, 61, 0, 61, 0, 20, 34, 62, 35,
+ 0, 62, 38, 20, 0, 20, 0, 31, 23, 0,
+ 33, 0, 29, 60, 54, 20, 34, 66, 35, 65,
+ 63, 0, 28, 26, 54, 20, 34, 66, 35, 65,
+ 63, 0, 28, 54, 20, 34, 66, 35, 65, 63,
+ 0, 30, 34, 22, 35, 54, 20, 34, 66, 35,
+ 65, 31, 23, 0, 25, 54, 20, 34, 66, 35,
+ 65, 31, 23, 0, 26, 54, 20, 34, 66, 35,
+ 65, 31, 23, 0, 20, 34, 20, 35, 63, 0,
+ 19, 72, 0, 19, 31, 23, 0, 39, 40, 0,
+ 0, 6, 0, 20, 0, 20, 38, 67, 0, 67,
+ 0, 68, 38, 10, 0, 68, 0, 68, 38, 69,
+ 0, 69, 0, 54, 20, 0, 54, 20, 34, 20,
+ 70, 35, 0, 70, 71, 0, 71, 0, 20, 0,
+ 41, 72, 0, 42, 72, 0, 41, 39, 72, 0,
+ 42, 39, 72, 0, 39, 39, 72, 0, 43, 39,
+ 72, 0, 21, 0, 44, 21, 0, 20, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 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
+ 179, 180, 181, 182, 185, 189, 193, 197, 203, 210,
+ 215, 216, 217, 218, 219, 220, 223, 226, 230, 259,
+ 285, 286, 289, 292, 298, 299, 307, 311, 318, 321,
+ 324, 327, 330, 333, 336, 339, 342, 345, 349, 352,
+ 357, 360, 363, 366, 369, 374, 377, 380, 385, 386,
+ 389, 401, 413, 416, 428, 433, 438, 441, 446, 447,
+ 451, 461, 471, 481, 487, 492, 497, 518, 519, 523,
+ 524, 527, 528, 544, 559, 562, 563, 566, 567, 570,
+ 573, 583, 584, 587, 600, 604, 608, 612, 616, 620,
+ 626, 627, 631
};
#endif
#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
static const char * const yytname[] = { "$","error","$undefined.","CLASS",
-"FROM","VOID","STRUCT","UNION","ENUM","SIGNED","UNSIGNED","LONG","SHORT","INT",
-"FLOAT","DOUBLE","CHAR","FIRST","LAST","CHECK","CNULL","TYPE","ONERROR","TOKEN",
-"NUMBER","TYPETOKEN","CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL",
-"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'",
-"'>'","'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable",
-"argument","argflags","flaglist","type","type1","integer","tspecifier","stars",
-"sigtype","tokenlist","method","onerror","funcargs","arglist","arg","checklist",
-"check","number", NULL
+"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
+"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
+"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
+"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
+"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
+"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype",
+"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
+"arg","checklist","check","numtok", NULL
};
#endif
static const short yyr1[] = { 0,
- 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, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 57, 57, 57, 57, 57, 58, 58, 58, 59, 59,
+ 60, 60, 60, 60, 60, 61, 62, 62, 63, 63,
+ 64, 64, 64, 64, 64, 64, 64, 65, 65, 65,
+ 65, 66, 66, 66, 66, 67, 67, 68, 68, 69,
+ 69, 70, 70, 71, 71, 71, 71, 71, 71, 71,
+ 72, 72, 72
};
static const short yyr2[] = { 0,
3, 2, 2, 1, 2, 2, 1, 1, 4, 4,
2, 2, 2, 1, 1, 1, 4, 4, 11, 8,
- 3, 0, 3, 1, 1, 2, 2, 2, 1, 2,
- 2, 1, 1, 1, 1, 2, 1, 1, 2, 1,
- 2, 1, 1, 1, 1, 1, 2, 1, 4, 3,
- 1, 11, 10, 11, 10, 10, 9, 9, 8, 12,
- 9, 9, 5, 6, 2, 2, 3, 2, 0, 1,
- 1, 3, 1, 3, 1, 2, 6, 2, 1, 1,
- 1, 2, 2, 3, 3, 3, 3, 1, 2
+ 3, 0, 3, 1, 1, 2, 1, 2, 2, 2,
+ 1, 2, 2, 1, 1, 1, 1, 2, 1, 1,
+ 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,
+ 3, 3, 2, 2, 1, 4, 3, 1, 2, 1,
+ 9, 9, 8, 12, 9, 9, 5, 2, 3, 2,
+ 0, 1, 1, 3, 1, 3, 1, 3, 1, 2,
+ 6, 2, 1, 1, 2, 2, 3, 3, 3, 3,
+ 1, 2, 1
};
static const short yydefact[] = { 0,
0, 7, 8, 0, 4, 0, 0, 5, 6, 3,
2, 0, 0, 1, 0, 0, 0, 22, 0, 0,
- 0, 0, 15, 16, 14, 10, 0, 38, 46, 45,
- 44, 0, 0, 40, 42, 43, 34, 33, 32, 35,
- 37, 0, 25, 29, 0, 0, 0, 0, 0, 0,
- 0, 0, 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, 15, 16, 14, 10, 0, 0, 40, 48,
+ 47, 46, 0, 0, 42, 44, 45, 36, 35, 34,
+ 37, 39, 0, 25, 27, 31, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 55, 0, 9, 12, 13,
+ 11, 0, 26, 33, 30, 32, 29, 41, 43, 0,
+ 50, 28, 38, 0, 24, 0, 0, 0, 0, 0,
+ 0, 0, 54, 0, 53, 0, 0, 0, 17, 0,
+ 49, 18, 0, 0, 21, 0, 0, 0, 52, 58,
+ 0, 51, 0, 0, 0, 60, 67, 40, 37, 0,
+ 0, 75, 77, 79, 0, 23, 0, 0, 0, 56,
+ 0, 0, 0, 59, 0, 80, 71, 0, 71, 0,
+ 0, 71, 57, 0, 0, 74, 0, 0, 0, 0,
+ 76, 78, 0, 0, 71, 0, 71, 0, 0, 93,
+ 91, 0, 0, 68, 70, 0, 0, 0, 20, 0,
+ 63, 0, 0, 84, 0, 0, 0, 0, 0, 83,
+ 69, 92, 65, 66, 0, 62, 61, 71, 0, 0,
+ 85, 0, 86, 0, 81, 82, 0, 0, 89, 87,
+ 88, 90, 19, 0, 64, 0, 0, 0
};
-static const short yydefgoto[] = { 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[] = { 196,
+ 4, 5, 6, 22, 23, 24, 50, 76, 110, 44,
+ 45, 46, 47, 72, 55, 56, 101, 107, 25, 140,
+ 111, 112, 113, 114, 169, 170, 154
};
-static const short yypact[] = { 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[] = { 21,
+ -18,-32768,-32768, 68, 66, 20, 54,-32768,-32768, 66,
+ 155, 171, 0, 155, 48, 116, 116, 52, 61, -14,
+ 59, 160,-32768,-32768,-32768,-32768, 29, 151,-32768,-32768,
+-32768,-32768, 81, 189, 111, 120,-32768,-32768,-32768,-32768,
+-32768,-32768, 117,-32768, 64,-32768, 124, 133, 135, 152,
+ 116, 154, 150, 163, 116,-32768, 186,-32768,-32768,-32768,
+-32768, 158,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 148,
+ 64,-32768,-32768, 161, 173, 175, 191, 192, 179, 180,
+ 195, 196,-32768, 28,-32768, 197, 183, 86,-32768, 134,
+-32768,-32768, 134, 135,-32768, 199, 187, 134,-32768,-32768,
+ -22,-32768, 188, 116, 200,-32768,-32768, 185, 18, 204,
+ 190,-32768, 193,-32768, 194,-32768, 201, 134, 198,-32768,
+ 206, 134, 207,-32768, 116, 202, 41, 98, 41, 205,
+ 203, 41,-32768, 208, 210,-32768, 214, -6, 209, 211,
+-32768,-32768, 215, 26, 41, 86, 41, 134, 22,-32768,
+-32768, 212, 216,-32768,-32768, 217, 218, 219,-32768, 86,
+-32768, 86, 213,-32768, 220, -3, 8, 221, -9,-32768,
+-32768,-32768,-32768,-32768, 222,-32768,-32768, 41, -1, -1,
+-32768, -1,-32768, -1,-32768,-32768, 223, 224,-32768,-32768,
+-32768,-32768,-32768, 228,-32768, 230, 239,-32768
};
static const short yypgoto[] = {-32768,
- 58, 184,-32768,-32768, 196, 197,-32768, 88, -16,-32768,
- 119,-32768, 122, 103,-32768, 198, -114, -81, 70, 108,
--32768, 59, -107
+ 45, 243,-32768,-32768, 231, 232,-32768, 164, -16, 229,
+-32768, 172,-32768, 181,-32768, -44,-32768, 15, 240, -124,
+ -91, 136,-32768, 137,-32768, 94, -82
};
-#define YYLAST 226
-
-
-static const short yytable[] = { 42,
- 46, 7, 49, 104, 133, 1, 135, 107, 12, 157,
- 158, 50, 51, 141, 142, 110, -71, 52, 111, 115,
- 157, 158, 13, 155, 143, 1, 26, 182, 2, 3,
- 125, 159, 142, 160, 161, 162, 78, 144, 171, 172,
- 136, 137, 159, 142, 160, 161, 162, 142, 8, 9,
- 177, 149, 178, 180, 129, 144, 59, 156, 90, 91,
- 190, 179, 11, 96, 150, 97, 144, 14, 191, 192,
- 144, 193, 27, 194, 130, 151, 47, 152, 113, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 34, 35, 36, 2, 3, 60, 40, 54, 41,
- 98, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 34, 35, 36, 66, 15, 62, 99, 67,
- 41, 16, 17, 18, 19, 20, 21, 15, 55, 8,
- 9, 69, 16, 17, 18, 19, 20, 21, 64, 173,
- 185, 174, 186, 187, 65, 188, 81, 82, 84, 85,
- 61, 63, 75, 76, 77, 70, 71, 73, 74, 52,
- 80, 87, 79, 86, 88, 89, 92, 94, 95, 106,
- 108, 109, 116, 105, 201, 112, 114, -70, 117, 120,
- 124, 126, 140, 118, 127, 134, 202, 10, 83, 119,
- 121, 122, 123, 128, 165, 147, 146, 166, 138, 139,
- 148, 167, 153, 154, 168, 169, 170, 175, 184, 176,
- 189, 196, 181, 195, 197, 198, 199, 56, 57, 58,
- 0, 183, 0, 0, 0, 132
+#define YYLAST 265
+
+
+static const short yytable[] = { 43,
+ 48, 115, 52, 7, 143, 53, 119, 146, 83, 85,
+ 164, 54, 120, 150, 151, 121, 150, 151, 150, 151,
+ 160, 26, 162, 1, 152, 185, 131, 150, 151, 165,
+ 134, 166, 167, 168, 78, 180, 99, 153, 86, 102,
+ 153, 164, 153, 2, 3, 158, 182, 80, 62, 11,
+ 12, 153, -73, 188, 14, 125, 163, 13, 159, 138,
+ 165, 82, 166, 167, 168, 28, 29, 30, 31, 32,
+ 1, 33, 34, 35, 36, 37, 38, 39, 40, 139,
+ 41, 27, 42, 181, 183, 49, 51, 123, 2, 3,
+ 8, 9, 57, 35, 36, 37, 189, 190, 64, 191,
+ 71, 192, 28, 29, 30, 31, 32, 141, 33, 34,
+ 35, 36, 37, 38, 39, 40, 105, 41, 106, 42,
+ 28, 29, 30, 31, 32, 68, 33, 34, 35, 36,
+ 37, 38, 39, 40, 69, 41, 70, 42, 28, 108,
+ 30, 31, 32, 73, 33, 34, 35, 36, 37, 38,
+ 39, 40, 74, 109, 75, 42, 29, 30, 31, 32,
+ 161, 33, 34, 35, 36, 37, 38, 39, 40, 80,
+ 41, 77, 42, 79, 176, 81, 177, 8, 9, 15,
+ 89, 90, 84, 82, 16, 17, 18, 19, 20, 21,
+ 15, 58, 88, 92, 93, 16, 17, 18, 19, 20,
+ 21, 35, 36, 37, 65, 67, 66, 87, 94, 95,
+ 96, 97, 98, 82, 80, 100, 103, 104, 117, -72,
+ 118, 122, 124, 126, 127, 133, 135, 144, 129, 197,
+ 128, 130, 132, 149, 171, 137, 172, 145, 198, 173,
+ 174, 156, 147, 148, 187, 157, 10, 178, 155, 175,
+ 195, 91, 59, 60, 194, 193, 63, 116, 179, 184,
+ 136, 61, 186, 0, 142
};
static const short yycheck[] = { 16,
- 17, 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, 93, 19, 22, 129, 20, 98, 132, 53, 54,
+ 20, 26, 35, 20, 21, 38, 20, 21, 20, 21,
+ 145, 22, 147, 3, 31, 35, 118, 20, 21, 39,
+ 122, 41, 42, 43, 51, 39, 81, 44, 55, 84,
+ 44, 20, 44, 23, 24, 20, 39, 20, 20, 5,
+ 31, 44, 35, 178, 10, 38, 148, 4, 33, 19,
+ 39, 34, 41, 42, 43, 5, 6, 7, 8, 9,
+ 3, 11, 12, 13, 14, 15, 16, 17, 18, 39,
+ 20, 34, 22, 166, 167, 34, 26, 104, 23, 24,
+ 23, 24, 34, 13, 14, 15, 179, 180, 18, 182,
+ 37, 184, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 31, 20, 33, 22,
+ 5, 6, 7, 8, 9, 15, 11, 12, 13, 14,
+ 15, 16, 17, 18, 15, 20, 20, 22, 5, 6,
+ 7, 8, 9, 20, 11, 12, 13, 14, 15, 16,
+ 17, 18, 20, 20, 20, 22, 6, 7, 8, 9,
+ 146, 11, 12, 13, 14, 15, 16, 17, 18, 20,
+ 20, 20, 22, 20, 160, 26, 162, 23, 24, 20,
+ 33, 34, 20, 34, 25, 26, 27, 28, 29, 30,
+ 20, 32, 35, 33, 34, 25, 26, 27, 28, 29,
+ 30, 13, 14, 15, 33, 34, 18, 22, 36, 35,
+ 20, 20, 34, 34, 20, 20, 20, 35, 20, 35,
+ 34, 34, 23, 20, 35, 20, 20, 23, 35, 0,
+ 38, 31, 35, 20, 23, 34, 21, 35, 0, 23,
+ 23, 31, 35, 34, 23, 31, 4, 35, 40, 31,
+ 23, 71, 22, 22, 31, 33, 28, 94, 39, 39,
+ 125, 22, 169, -1, 128
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.27. */
+/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
#endif
#endif
\f
-#line 216 "/usr/lib/bison.simple"
+#line 217 "/usr/lib/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
switch (yyn) {
case 1:
-#line 175 "parse.y"
+#line 179 "parse.y"
{ ; ;
break;}
case 2:
-#line 176 "parse.y"
+#line 180 "parse.y"
{ ; ;
break;}
case 3:
-#line 177 "parse.y"
+#line 181 "parse.y"
{ ; ;
break;}
case 4:
-#line 178 "parse.y"
+#line 182 "parse.y"
{ ; ;
break;}
case 5:
-#line 181 "parse.y"
+#line 185 "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 189 "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 193 "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 197 "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 203 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 206 "parse.y"
+#line 210 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
case 11:
-#line 211 "parse.y"
+#line 215 "parse.y"
{ ; ;
break;}
case 12:
-#line 212 "parse.y"
+#line 216 "parse.y"
{ ; ;
break;}
case 13:
-#line 213 "parse.y"
+#line 217 "parse.y"
{ ; ;
break;}
case 14:
-#line 214 "parse.y"
+#line 218 "parse.y"
{ ; ;
break;}
case 15:
-#line 215 "parse.y"
+#line 219 "parse.y"
{ ; ;
break;}
case 16:
-#line 216 "parse.y"
+#line 220 "parse.y"
{ ; ;
break;}
case 17:
-#line 219 "parse.y"
+#line 223 "parse.y"
{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE);
+ push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line);
;
break;}
case 18:
-#line 222 "parse.y"
+#line 226 "parse.y"
{
- push_variable(yyvsp[-1].id,PRIVATE_SCOPE);
+ push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line);
;
break;}
case 19:
-#line 226 "parse.y"
+#line 230 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
- yyvsp[-4].cbuf,yyvsp[-1].cbuf);
+ yyvsp[-4].cbuf,yyvsp[-5].line,
+ yyvsp[-1].cbuf,yyvsp[-2].line,
+ yyvsp[-10].line);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp(yyvsp[-6].id,"set")==0 &&
strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
- yyvsp[-1].cbuf,yyvsp[-4].cbuf);
+ yyvsp[-1].cbuf,yyvsp[-2].line,
+ yyvsp[-4].cbuf,yyvsp[-5].line,
+ yyvsp[-10].line);
class_nodes = g_list_append(class_nodes,node);
} else {
g_free(yyvsp[-8].id); g_free(yyvsp[-7].id);
;
break;}
case 20:
-#line 251 "parse.y"
+#line 259 "parse.y"
{
if(strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
g_free(yyvsp[-3].id);
node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
- yyvsp[-1].cbuf,NULL);
+ yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0,
+ yyvsp[-7].line);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
g_free(yyvsp[-3].id);
node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
- NULL,yyvsp[-1].cbuf);
+ NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line,
+ yyvsp[-7].line);
class_nodes = g_list_append(class_nodes,node);
} else {
g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
;
break;}
case 21:
-#line 275 "parse.y"
+#line 285 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
case 22:
-#line 276 "parse.y"
+#line 286 "parse.y"
{ yyval.list = NULL; ;
break;}
case 23:
-#line 279 "parse.y"
+#line 289 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 24:
-#line 282 "parse.y"
+#line 292 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 25:
-#line 288 "parse.y"
+#line 298 "parse.y"
+{ ; ;
+ break;}
+case 26:
+#line 299 "parse.y"
+{
+ Type *type = typestack->data;
+ char *oldname = type->name;
+ type->name = g_strconcat("const ",oldname,NULL);
+ g_free(oldname);
+ ;
+ break;}
+case 27:
+#line 307 "parse.y"
{
Node *node = new_type(0,yyvsp[0].id);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 26:
-#line 292 "parse.y"
+case 28:
+#line 311 "parse.y"
{
Node *node = new_type(stars,yyvsp[-1].id);
stars = 0;
typestack = g_list_prepend(typestack,node);
;
break;}
-case 27:
-#line 299 "parse.y"
+case 29:
+#line 318 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 28:
-#line 302 "parse.y"
+case 30:
+#line 321 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 29:
-#line 305 "parse.y"
+case 31:
+#line 324 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 30:
-#line 308 "parse.y"
+case 32:
+#line 327 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 31:
-#line 311 "parse.y"
+case 33:
+#line 330 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 32:
-#line 314 "parse.y"
+case 34:
+#line 333 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 33:
-#line 317 "parse.y"
+case 35:
+#line 336 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 34:
-#line 320 "parse.y"
+case 36:
+#line 339 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 35:
-#line 323 "parse.y"
+case 37:
+#line 342 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 36:
-#line 326 "parse.y"
+case 38:
+#line 345 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 37:
-#line 330 "parse.y"
+case 39:
+#line 349 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 38:
-#line 333 "parse.y"
+case 40:
+#line 352 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 39:
-#line 338 "parse.y"
+case 41:
+#line 357 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 40:
-#line 341 "parse.y"
+case 42:
+#line 360 "parse.y"
{
yyval.id = "long";
;
break;}
-case 41:
-#line 344 "parse.y"
+case 43:
+#line 363 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 42:
-#line 347 "parse.y"
+case 44:
+#line 366 "parse.y"
{
yyval.id = "short";
;
break;}
-case 43:
-#line 350 "parse.y"
+case 45:
+#line 369 "parse.y"
{
yyval.id = "int";
;
break;}
-case 44:
-#line 355 "parse.y"
+case 46:
+#line 374 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 45:
-#line 358 "parse.y"
+case 47:
+#line 377 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 46:
-#line 361 "parse.y"
+case 48:
+#line 380 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 47:
-#line 366 "parse.y"
-{ stars++; ;
- break;}
-case 48:
-#line 367 "parse.y"
-{ stars++; ;
- break;}
case 49:
-#line 370 "parse.y"
-{
- gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
- ;
+#line 385 "parse.y"
+{ stars++; ;
break;}
case 50:
-#line 375 "parse.y"
-{
- gtktypes = g_list_append(gtktypes,yyvsp[0].id);
- ;
+#line 386 "parse.y"
+{ stars++; ;
break;}
case 51:
-#line 378 "parse.y"
-{
- gtktypes = g_list_append(gtktypes,yyvsp[0].id);
- ;
+#line 389 "parse.y"
+{
+ if(strcmp(yyvsp[-1].id,"first")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-1].id,"last")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-1].id);
+ YYERROR;
+ }
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 52:
-#line 384 "parse.y"
+#line 401 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
- "first parameter"));
+ if(strcmp(yyvsp[-2].id,"first")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-2].id,"last")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-2].id);
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD,NULL,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line);
- ;
+ g_free(yyvsp[-2].id);
+ ;
break;}
case 53:
-#line 393 "parse.y"
+#line 413 "parse.y"
{
- 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);
- ;
+ yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ ;
break;}
case 54:
-#line 402 "parse.y"
+#line 416 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
- "first parameter"));
+ if(strcmp(yyvsp[-1].id,"first")==0)
+ yyval.sigtype = SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-1].id,"last")==0)
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-1].id);
YYERROR;
}
- push_function(SIGNAL_FIRST_METHOD, NULL,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line);
- ;
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 55:
-#line 411 "parse.y"
+#line 428 "parse.y"
{
- 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);
- ;
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ ;
break;}
case 56:
-#line 420 "parse.y"
+#line 433 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
- "first parameter"));
- YYERROR;
- }
- push_function(SIGNAL_LAST_METHOD, NULL,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line);
- ;
+ gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+ ;
break;}
case 57:
-#line 429 "parse.y"
+#line 438 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+ ;
+ break;}
+case 58:
+#line 441 "parse.y"
+{
+ gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+ ;
+ break;}
+case 59:
+#line 446 "parse.y"
+{ yyval.cbuf=yyvsp[0].cbuf; ;
+ break;}
+case 60:
+#line 447 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 61:
+#line 451 "parse.y"
+{
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, NULL,yyvsp[-8].line);
+ push_function(yyvsp[-7].sigtype,NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ ccode_line,vararg);
;
break;}
-case 58:
-#line 438 "parse.y"
+case 62:
+#line 461 "parse.y"
{
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
+ "first parameter"));
+ YYERROR;
+ }
+ push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ ccode_line,vararg);
;
break;}
-case 59:
-#line 442 "parse.y"
+case 63:
+#line 471 "parse.y"
{
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
+ "first parameter"));
+ YYERROR;
+ }
push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, NULL,yyvsp[-7].line);
+ yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
+ ccode_line,vararg);
;
break;}
-case 60:
-#line 446 "parse.y"
+case 64:
+#line 481 "parse.y"
{
push_function(OVERRIDE_METHOD, yyvsp[-9].id,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line);
+ yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,
+ yyvsp[-11].line,yyvsp[-1].line,
+ vararg);
;
break;}
-case 61:
-#line 450 "parse.y"
+case 65:
+#line 487 "parse.y"
{
push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
+ yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
+ vararg);
;
break;}
-case 62:
-#line 454 "parse.y"
+case 66:
+#line 492 "parse.y"
{
push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
+ yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
+ vararg);
;
break;}
-case 63:
-#line 458 "parse.y"
+case 67:
+#line 497 "parse.y"
{
if(strcmp(yyvsp[-4].id,"init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
- push_function(INIT_METHOD, NULL, yyvsp[-4].id,
- NULL, NULL,yyvsp[-3].line);
+ push_function(INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
+ ccode_line,FALSE);
} else if(strcmp(yyvsp[-4].id,"class_init")==0) {
push_init_arg(yyvsp[-2].id,TRUE);
- push_function(CLASS_INIT_METHOD, NULL,
- yyvsp[-4].id, NULL, NULL,yyvsp[-3].line);
+ push_function(CLASS_INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
+ ccode_line,FALSE);
} else {
g_free(yyvsp[-4].id);
g_free(yyvsp[-2].id);
+ g_string_free(yyvsp[-2].cbuf,TRUE);
yyerror(_("parse error"));
YYERROR;
}
;
break;}
-case 64:
-#line 474 "parse.y"
-{
- if(strcmp(yyvsp[-5].id,"init")==0) {
- push_init_arg(yyvsp[-3].id,FALSE);
- push_function(INIT_METHOD, NULL,
- yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line);
- } else if(strcmp(yyvsp[-5].id,"class_init")==0) {
- push_init_arg(yyvsp[-3].id,TRUE);
- push_function(CLASS_INIT_METHOD, NULL,
- yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line);
- } else {
- g_free(yyvsp[-5].id);
- g_free(yyvsp[-3].id);
- g_string_free(yyvsp[-3].cbuf,TRUE);
- yyerror(_("parse error"));
- YYERROR;
- }
- ;
- break;}
-case 65:
-#line 493 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
- break;}
-case 66:
-#line 494 "parse.y"
+case 68:
+#line 518 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 67:
-#line 495 "parse.y"
+case 69:
+#line 519 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 68:
-#line 499 "parse.y"
+case 70:
+#line 523 "parse.y"
{ ; ;
break;}
-case 69:
-#line 500 "parse.y"
+case 71:
+#line 524 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 70:
-#line 505 "parse.y"
-{ has_this = FALSE; ;
+case 72:
+#line 527 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 71:
-#line 506 "parse.y"
-{
- has_this = TRUE;
- if(strcmp(yyvsp[0].id,"this")==0)
- push_this(yyvsp[0].id);
+case 73:
+#line 528 "parse.y"
+{
+ vararg = FALSE;
+ has_self = TRUE;
+ if(strcmp(yyvsp[0].id,"this")==0) {
+ push_self(yyvsp[0].id);
+ print_error(TRUE,_("Use of 'this' is "
+ "depreciated, use 'self' "
+ "instead"),line_no);
+ } else if(strcmp(yyvsp[0].id,"self")==0)
+ push_self(yyvsp[0].id);
else {
g_free(yyvsp[0].id);
yyerror(_("parse error"));
}
;
break;}
-case 72:
-#line 516 "parse.y"
-{
- has_this = TRUE;
- if(strcmp(yyvsp[-2].id,"this")==0)
- push_this(yyvsp[-2].id);
+case 74:
+#line 544 "parse.y"
+{
+ has_self = TRUE;
+ if(strcmp(yyvsp[-2].id,"this")==0) {
+ push_self(yyvsp[-2].id);
+ print_error(TRUE,_("Use of 'this' is "
+ "depreciated, use 'self' "
+ "instead"),line_no);
+ } else if(strcmp(yyvsp[-2].id,"self")==0)
+ push_self(yyvsp[-2].id);
else {
g_free(yyvsp[-2].id);
yyerror(_("parse error"));
}
;
break;}
-case 73:
-#line 526 "parse.y"
-{ has_this = FALSE; ;
- break;}
-case 74:
-#line 529 "parse.y"
-{ ; ;
- break;}
case 75:
-#line 530 "parse.y"
-{ ; ;
+#line 559 "parse.y"
+{ has_self = FALSE; ;
break;}
case 76:
-#line 533 "parse.y"
-{
- push_funcarg(yyvsp[0].id);
- ;
+#line 562 "parse.y"
+{ vararg = TRUE; ;
break;}
case 77:
-#line 536 "parse.y"
-{
- push_funcarg(yyvsp[-4].id);
- ;
+#line 563 "parse.y"
+{ vararg = FALSE; ;
break;}
case 78:
-#line 541 "parse.y"
+#line 566 "parse.y"
{ ; ;
break;}
case 79:
-#line 542 "parse.y"
+#line 567 "parse.y"
{ ; ;
break;}
case 80:
-#line 545 "parse.y"
+#line 570 "parse.y"
{
- Node *node = new_check(NULL_CHECK,NULL);
- checks = g_list_append(checks,node);
- ;
+ push_funcarg(yyvsp[0].id);
+ ;
break;}
case 81:
-#line 549 "parse.y"
+#line 573 "parse.y"
{
- Node *node = new_check(TYPE_CHECK,NULL);
- checks = g_list_append(checks,node);
- ;
+ if(strcmp(yyvsp[-2].id,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ push_funcarg(yyvsp[-4].id);
+ ;
break;}
case 82:
-#line 553 "parse.y"
+#line 583 "parse.y"
+{ ; ;
+ break;}
+case 83:
+#line 584 "parse.y"
+{ ; ;
+ break;}
+case 84:
+#line 587 "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 85:
+#line 600 "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 86:
+#line 604 "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 87:
+#line 608 "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 88:
+#line 612 "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 89:
+#line 616 "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 90:
+#line 620 "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 91:
+#line 626 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 89:
-#line 580 "parse.y"
+case 92:
+#line 627 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
+case 93:
+#line 631 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
+ break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 542 "/usr/lib/bison.simple"
+#line 543 "/usr/lib/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
return 1;
}
-#line 586 "parse.y"
+#line 634 "parse.y"
projects / gob-dx.git / blobdiff