/* A Bison parser, made from parse.y
- by GNU Bison version 1.27
- */
+ by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
#define CLASS 257
#define FROM 258
-#define VOID 259
-#define STRUCT 260
-#define UNION 261
-#define ENUM 262
-#define SIGNED 263
-#define UNSIGNED 264
-#define LONG 265
-#define SHORT 266
-#define INT 267
-#define FLOAT 268
-#define DOUBLE 269
-#define CHAR 270
-#define FIRST 271
-#define LAST 272
+#define CONST 259
+#define VOID 260
+#define STRUCT 261
+#define UNION 262
+#define ENUM 263
+#define THREEDOTS 264
+#define SIGNED 265
+#define UNSIGNED 266
+#define LONG 267
+#define SHORT 268
+#define INT 269
+#define FLOAT 270
+#define DOUBLE 271
+#define CHAR 272
#define ONERROR 273
#define TOKEN 274
#define NUMBER 275
#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 ARRAY_DIM 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, char *postfix)
{
Node *var;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+
+ type->postfix = postfix;
- 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;
type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
} else {
- type = (Type *)new_type(0,g_strdup("void"));
+ type = (Type *)new_type(0,g_strdup("void"),NULL);
}
+ /* a complicated and ugly test to figure out if we have
+ the wrong number of types for a signal */
+ if((scope == SIGNAL_FIRST_METHOD ||
+ scope == SIGNAL_LAST_METHOD ||
+ scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+ scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+ g_list_length(gtktypes) != g_list_length(funcargs) &&
+ !(g_list_length(funcargs) == 1 &&
+ g_list_length(gtktypes) == 2 &&
+ strcmp(gtktypes->next->data,"NONE")==0)) {
+ print_error(TRUE, _("The number of GTK arguments and "
+ "function arguments for a signal "
+ "don't seem to match"),line_no);
+ }
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_funcarg(char *name)
+push_funcarg(char *name, char *postfix)
{
Node *node;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+
+ type->postfix = postfix;
node = new_funcarg(type,name,checks);
checks = NULL;
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn);
+ type = new_type(1,tn,NULL);
node = new_funcarg((Type *)type,name,NULL);
funcargs = g_list_prepend(funcargs, node);
}
static void
-push_this(char *this)
+push_self(char *id)
{
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(1,g_strdup(((Class *)class)->otype));
+ type = new_type(1,g_strdup(((Class *)class)->otype),NULL);
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 178 "parse.y"
typedef union {
char *id;
GString *cbuf;
GList *list;
int line;
+ int sigtype;
} YYSTYPE;
#ifndef YYDEBUG
#define YYDEBUG 1
-#define YYFINAL 190
+#define YYFINAL 207
#define YYFLAG -32768
-#define YYNTBASE 45
+#define YYNTBASE 46
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74)
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, 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, 44, 2, 2, 2, 2, 2, 2, 35,
+ 36, 38, 2, 39, 45, 2, 2, 2, 41, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 34, 43,
+ 40, 42, 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, 31, 36, 32, 2, 2, 2, 2, 2,
+ 2, 2, 32, 37, 33, 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
+ 27, 28, 29, 30, 31
};
#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
+ 32, 35, 38, 41, 43, 45, 47, 52, 58, 63,
+ 69, 81, 90, 94, 95, 99, 101, 103, 106, 108,
+ 111, 114, 117, 119, 122, 125, 127, 129, 131, 133,
+ 136, 138, 140, 143, 145, 148, 150, 152, 154, 156,
+ 158, 161, 163, 167, 171, 174, 177, 179, 184, 188,
+ 190, 193, 195, 205, 215, 224, 237, 247, 257, 263,
+ 266, 270, 273, 274, 276, 278, 282, 284, 288, 290,
+ 294, 296, 299, 303, 310, 318, 321, 323, 325, 328,
+ 331, 335, 339, 343, 347, 349, 352
};
-static const short yyrhs[] = { 46,
- 47, 46, 0, 47, 46, 0, 46, 47, 0, 47,
- 0, 46, 23, 0, 46, 24, 0, 23, 0, 24,
- 0, 48, 31, 49, 32, 0, 3, 22, 4, 22,
- 0, 49, 61, 0, 49, 50, 0, 49, 51, 0,
- 61, 0, 50, 0, 51, 0, 25, 54, 20, 33,
- 0, 26, 54, 20, 33, 0, 27, 52, 20, 20,
- 20, 31, 23, 20, 31, 23, 33, 0, 27, 52,
- 20, 20, 20, 31, 23, 33, 0, 34, 53, 35,
- 0, 0, 20, 36, 53, 0, 20, 0, 55, 0,
- 55, 58, 0, 10, 56, 0, 9, 56, 0, 56,
- 0, 10, 16, 0, 9, 16, 0, 16, 0, 15,
- 0, 14, 0, 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
+static const short yyrhs[] = { 47,
+ 48, 47, 0, 48, 47, 0, 47, 48, 0, 48,
+ 0, 47, 24, 0, 47, 25, 0, 24, 0, 25,
+ 0, 49, 32, 50, 33, 0, 3, 22, 4, 22,
+ 0, 50, 65, 0, 50, 51, 0, 50, 52, 0,
+ 65, 0, 51, 0, 52, 0, 26, 55, 20, 34,
+ 0, 26, 55, 20, 23, 34, 0, 27, 55, 20,
+ 34, 0, 27, 55, 20, 23, 34, 0, 28, 53,
+ 20, 20, 20, 32, 24, 20, 32, 24, 34, 0,
+ 28, 53, 20, 20, 20, 32, 24, 34, 0, 35,
+ 54, 36, 0, 0, 20, 37, 54, 0, 20, 0,
+ 56, 0, 5, 56, 0, 57, 0, 57, 60, 0,
+ 12, 58, 0, 11, 58, 0, 58, 0, 12, 18,
+ 0, 11, 18, 0, 18, 0, 17, 0, 16, 0,
+ 20, 0, 59, 20, 0, 22, 0, 6, 0, 13,
+ 15, 0, 13, 0, 14, 15, 0, 14, 0, 15,
+ 0, 9, 0, 8, 0, 7, 0, 38, 60, 0,
+ 38, 0, 27, 20, 62, 0, 20, 27, 62, 0,
+ 27, 62, 0, 20, 62, 0, 62, 0, 20, 35,
+ 63, 36, 0, 63, 39, 20, 0, 20, 0, 32,
+ 24, 0, 34, 0, 30, 61, 55, 20, 35, 67,
+ 36, 66, 64, 0, 29, 27, 55, 20, 35, 67,
+ 36, 66, 64, 0, 29, 55, 20, 35, 67, 36,
+ 66, 64, 0, 31, 35, 22, 36, 55, 20, 35,
+ 67, 36, 66, 32, 24, 0, 26, 55, 20, 35,
+ 67, 36, 66, 32, 24, 0, 27, 55, 20, 35,
+ 67, 36, 66, 32, 24, 0, 20, 35, 20, 36,
+ 64, 0, 19, 73, 0, 19, 32, 24, 0, 40,
+ 41, 0, 0, 6, 0, 20, 0, 20, 39, 68,
+ 0, 68, 0, 69, 39, 10, 0, 69, 0, 69,
+ 39, 70, 0, 70, 0, 55, 20, 0, 55, 20,
+ 23, 0, 55, 20, 35, 20, 71, 36, 0, 55,
+ 20, 23, 35, 20, 71, 36, 0, 71, 72, 0,
+ 72, 0, 20, 0, 42, 73, 0, 43, 73, 0,
+ 42, 40, 73, 0, 43, 40, 73, 0, 40, 40,
+ 73, 0, 44, 40, 73, 0, 21, 0, 45, 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
+ 197, 198, 199, 200, 203, 207, 211, 215, 221, 228,
+ 233, 234, 235, 236, 237, 238, 241, 244, 247, 250,
+ 254, 283, 309, 310, 313, 316, 322, 323, 331, 335,
+ 342, 345, 348, 351, 354, 357, 360, 363, 366, 369,
+ 373, 376, 381, 384, 387, 390, 393, 398, 401, 404,
+ 409, 410, 413, 425, 437, 440, 452, 457, 462, 465,
+ 470, 471, 475, 485, 495, 505, 511, 516, 521, 542,
+ 543, 547, 548, 551, 552, 563, 573, 576, 577, 580,
+ 581, 584, 587, 590, 598, 608, 609, 612, 625, 629,
+ 633, 637, 641, 645, 651, 652, 656
};
#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",
-"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",
+"ARRAY_DIM","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,
- 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
+ 46, 46, 46, 46, 47, 47, 47, 47, 48, 49,
+ 50, 50, 50, 50, 50, 50, 51, 51, 51, 51,
+ 52, 52, 53, 53, 54, 54, 55, 55, 56, 56,
+ 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+ 57, 57, 58, 58, 58, 58, 58, 59, 59, 59,
+ 60, 60, 61, 61, 61, 61, 61, 62, 63, 63,
+ 64, 64, 65, 65, 65, 65, 65, 65, 65, 66,
+ 66, 66, 66, 67, 67, 67, 67, 68, 68, 69,
+ 69, 70, 70, 70, 70, 71, 71, 72, 72, 72,
+ 72, 72, 72, 72, 73, 73, 73
};
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
+ 2, 2, 2, 1, 1, 1, 4, 5, 4, 5,
+ 11, 8, 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, 3, 6, 7, 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
+ 2, 0, 0, 1, 0, 0, 0, 24, 0, 0,
+ 0, 0, 15, 16, 14, 10, 0, 0, 42, 50,
+ 49, 48, 0, 0, 44, 46, 47, 38, 37, 36,
+ 39, 41, 0, 27, 29, 33, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 57, 0, 9, 12, 13,
+ 11, 0, 28, 35, 32, 34, 31, 43, 45, 0,
+ 52, 30, 40, 0, 26, 0, 0, 0, 0, 0,
+ 0, 0, 56, 0, 55, 0, 0, 0, 0, 17,
+ 0, 51, 0, 19, 0, 0, 23, 0, 0, 0,
+ 54, 60, 0, 53, 0, 0, 0, 62, 69, 18,
+ 42, 39, 0, 0, 77, 79, 81, 20, 0, 25,
+ 0, 0, 0, 58, 0, 0, 0, 61, 0, 82,
+ 73, 0, 73, 0, 0, 73, 59, 0, 0, 76,
+ 83, 0, 0, 0, 0, 78, 80, 0, 0, 73,
+ 0, 73, 0, 0, 0, 97, 95, 0, 0, 70,
+ 72, 0, 0, 0, 22, 0, 65, 0, 0, 0,
+ 88, 0, 0, 0, 0, 0, 87, 71, 96, 67,
+ 68, 0, 64, 63, 73, 0, 0, 0, 89, 0,
+ 90, 0, 84, 86, 0, 0, 85, 93, 91, 92,
+ 94, 21, 0, 66, 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[] = { 205,
+ 4, 5, 6, 22, 23, 24, 50, 76, 113, 44,
+ 45, 46, 47, 72, 55, 56, 103, 109, 25, 145,
+ 114, 115, 116, 117, 176, 177, 160
};
-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[] = { 3,
+ 47,-32768,-32768, 70, 169, 94, 75,-32768,-32768, 169,
+ 182, 171, 79, 182, 100, 125, 125, 109, 69, 77,
+ 111, 159,-32768,-32768,-32768,-32768, 108, 160,-32768,-32768,
+-32768,-32768, 190, 196, 138, 147,-32768,-32768,-32768,-32768,
+-32768,-32768, 144,-32768, 132,-32768, 163, 193, 197, 198,
+ 125, 199, 32, 200, 125,-32768, 194,-32768,-32768,-32768,
+-32768, 145,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 65,
+ 132,-32768,-32768, 161, 184, 186, 203, 204, 191, 192,
+ 205, 208,-32768, 26,-32768, 209, 195, 76, 201,-32768,
+ 143,-32768, 202,-32768, 143, 197,-32768, 210, 206, 143,
+-32768,-32768, 66,-32768, 207, 125, 213,-32768,-32768,-32768,
+ 211, 176, 212, 214,-32768, 215,-32768,-32768, 216,-32768,
+ 217, 143, 219,-32768, 218, 143, 220,-32768, 125, 21,
+ -6, 107, -6, 221, 222, -6,-32768, 223, 225,-32768,
+ 226, 224, -9, 227, 230,-32768,-32768, 231, 29, -6,
+ 76, -6, 143, 228, 28,-32768,-32768, 229, 235,-32768,
+-32768, 233, 240, 234,-32768, 76,-32768, 76, 236, 28,
+-32768, 237, -2, 5, 238, 11,-32768,-32768,-32768,-32768,
+-32768, 241,-32768,-32768, -6, 22, -4, -4,-32768, -4,
+-32768, -4,-32768,-32768, 239, 242,-32768,-32768,-32768,-32768,
+-32768,-32768, 243,-32768, 246, 251,-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
+ 93, 265,-32768,-32768, 248, 249,-32768, 137, -16, 247,
+-32768, -13,-32768, 168,-32768, -44,-32768, -136, 254, -128,
+ -93, 105,-32768, 148, 73, -172, -81
};
-#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 280
+
+
+static const short yytable[] = { 43,
+ 48, 119, 52, 194, 148, 1, 123, 151, 83, 85,
+ 156, 157, 143, 194, 167, 156, 157, 156, 157, 65,
+ 67, 166, 158, 168, 156, 157, 2, 3, 135, 183,
+ 171, 184, 138, 144, 78, 159, 101, 188, 86, 104,
+ 159, 171, 159, 141, 190, 80, 193, 171, 164, 159,
+ 172, 80, 173, 174, 175, 142, 196, 197, 81, 169,
+ 82, 172, 165, 173, 174, 175, 82, 172, 7, 173,
+ 174, 175, 1, 28, 29, 30, 31, 32, 13, 33,
+ 34, 35, 36, 37, 38, 39, 40, 89, 41, 127,
+ 42, 189, 191, 8, 9, 51, 53, 11, 90, 91,
+ 26, 124, 14, 54, 125, 198, 199, 107, 200, 108,
+ 201, 28, 29, 30, 31, 32, 146, 33, 34, 35,
+ 36, 37, 38, 39, 40, 12, 41, 62, 42, 28,
+ 29, 30, 31, 32, 27, 33, 34, 35, 36, 37,
+ 38, 39, 40, 49, 41, 57, 42, 28, 111, 30,
+ 31, 32, 68, 33, 34, 35, 36, 37, 38, 39,
+ 40, 69, 112, 70, 42, 29, 30, 31, 32, 71,
+ 33, 34, 35, 36, 37, 38, 39, 40, 15, 41,
+ 88, 42, 73, 93, 16, 17, 18, 19, 20, 21,
+ 15, 58, 2, 3, 94, 95, 16, 17, 18, 19,
+ 20, 21, 35, 36, 37, 8, 9, 64, 35, 36,
+ 37, -75, 74, 66, 129, 87, 75, 77, 79, 84,
+ 96, 97, 98, 99, 80, 100, 82, 102, 105, 121,
+ 106, 130, 120, 140, 110, 118, 128, 137, 92, 139,
+ 122, 126, 186, 155, 149, 206, -74, 170, 134, 131,
+ 207, 133, 178, 132, 136, 179, 180, 150, 152, 153,
+ 154, 162, 163, 181, 195, 182, 204, 161, 10, 59,
+ 60, 185, 202, 203, 63, 61, 187, 192, 0, 147
};
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, 95, 19, 176, 133, 3, 100, 136, 53, 54,
+ 20, 21, 19, 186, 151, 20, 21, 20, 21, 33,
+ 34, 150, 32, 152, 20, 21, 24, 25, 122, 166,
+ 20, 168, 126, 40, 51, 45, 81, 40, 55, 84,
+ 45, 20, 45, 23, 40, 20, 36, 20, 20, 45,
+ 40, 20, 42, 43, 44, 35, 185, 36, 27, 153,
+ 35, 40, 34, 42, 43, 44, 35, 40, 22, 42,
+ 43, 44, 3, 5, 6, 7, 8, 9, 4, 11,
+ 12, 13, 14, 15, 16, 17, 18, 23, 20, 106,
+ 22, 173, 174, 24, 25, 27, 20, 5, 34, 35,
+ 22, 36, 10, 27, 39, 187, 188, 32, 190, 34,
+ 192, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 32, 20, 20, 22, 5,
+ 6, 7, 8, 9, 35, 11, 12, 13, 14, 15,
+ 16, 17, 18, 35, 20, 35, 22, 5, 6, 7,
+ 8, 9, 15, 11, 12, 13, 14, 15, 16, 17,
+ 18, 15, 20, 20, 22, 6, 7, 8, 9, 38,
+ 11, 12, 13, 14, 15, 16, 17, 18, 20, 20,
+ 36, 22, 20, 23, 26, 27, 28, 29, 30, 31,
+ 20, 33, 24, 25, 34, 35, 26, 27, 28, 29,
+ 30, 31, 13, 14, 15, 24, 25, 18, 13, 14,
+ 15, 36, 20, 18, 39, 22, 20, 20, 20, 20,
+ 37, 36, 20, 20, 20, 35, 35, 20, 20, 20,
+ 36, 20, 96, 129, 34, 34, 24, 20, 71, 20,
+ 35, 35, 170, 20, 24, 0, 36, 20, 32, 36,
+ 0, 36, 24, 39, 36, 21, 24, 36, 36, 35,
+ 35, 32, 32, 24, 24, 32, 24, 41, 4, 22,
+ 22, 36, 34, 32, 28, 22, 40, 40, -1, 132
};
/* -*-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 176 "parse.y"
+#line 197 "parse.y"
{ ; ;
break;}
case 2:
-#line 177 "parse.y"
+#line 198 "parse.y"
{ ; ;
break;}
case 3:
-#line 178 "parse.y"
+#line 199 "parse.y"
{ ; ;
break;}
case 4:
-#line 179 "parse.y"
+#line 200 "parse.y"
{ ; ;
break;}
case 5:
-#line 182 "parse.y"
+#line 203 "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 207 "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 211 "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 215 "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 221 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 10:
-#line 207 "parse.y"
+#line 228 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
case 11:
-#line 212 "parse.y"
+#line 233 "parse.y"
{ ; ;
break;}
case 12:
-#line 213 "parse.y"
+#line 234 "parse.y"
{ ; ;
break;}
case 13:
-#line 214 "parse.y"
+#line 235 "parse.y"
{ ; ;
break;}
case 14:
-#line 215 "parse.y"
+#line 236 "parse.y"
{ ; ;
break;}
case 15:
-#line 216 "parse.y"
+#line 237 "parse.y"
{ ; ;
break;}
case 16:
-#line 217 "parse.y"
+#line 238 "parse.y"
{ ; ;
break;}
case 17:
-#line 220 "parse.y"
+#line 241 "parse.y"
{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE);
+ push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL);
;
break;}
case 18:
-#line 223 "parse.y"
+#line 244 "parse.y"
{
- push_variable(yyvsp[-1].id,PRIVATE_SCOPE);
+ push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
;
break;}
case 19:
-#line 227 "parse.y"
+#line 247 "parse.y"
+{
+ push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL);
+ ;
+ break;}
+case 20:
+#line 250 "parse.y"
+{
+ push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id);
+ ;
+ break;}
+case 21:
+#line 254 "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"
+case 22:
+#line 283 "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"
+case 23:
+#line 309 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 22:
-#line 279 "parse.y"
+case 24:
+#line 310 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 23:
-#line 282 "parse.y"
+case 25:
+#line 313 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 24:
-#line 285 "parse.y"
+case 26:
+#line 316 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 25:
-#line 291 "parse.y"
+case 27:
+#line 322 "parse.y"
+{ ; ;
+ break;}
+case 28:
+#line 323 "parse.y"
+{
+ Type *type = typestack->data;
+ char *oldname = type->name;
+ type->name = g_strconcat("const ",oldname,NULL);
+ g_free(oldname);
+ ;
+ break;}
+case 29:
+#line 331 "parse.y"
{
- Node *node = new_type(0,yyvsp[0].id);
+ Node *node = new_type(0,yyvsp[0].id,NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 26:
-#line 295 "parse.y"
+case 30:
+#line 335 "parse.y"
{
- Node *node = new_type(stars,yyvsp[-1].id);
+ Node *node = new_type(stars,yyvsp[-1].id,NULL);
stars = 0;
typestack = g_list_prepend(typestack,node);
;
break;}
-case 27:
-#line 302 "parse.y"
+case 31:
+#line 342 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 28:
-#line 305 "parse.y"
+case 32:
+#line 345 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 29:
-#line 308 "parse.y"
+case 33:
+#line 348 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 30:
-#line 311 "parse.y"
+case 34:
+#line 351 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 31:
-#line 314 "parse.y"
+case 35:
+#line 354 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 32:
-#line 317 "parse.y"
+case 36:
+#line 357 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 33:
-#line 320 "parse.y"
+case 37:
+#line 360 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 34:
-#line 323 "parse.y"
+case 38:
+#line 363 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 35:
-#line 326 "parse.y"
+case 39:
+#line 366 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 36:
-#line 329 "parse.y"
+case 40:
+#line 369 "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 41:
+#line 373 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 38:
-#line 336 "parse.y"
+case 42:
+#line 376 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 39:
-#line 341 "parse.y"
+case 43:
+#line 381 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 40:
-#line 344 "parse.y"
+case 44:
+#line 384 "parse.y"
{
yyval.id = "long";
;
break;}
-case 41:
-#line 347 "parse.y"
+case 45:
+#line 387 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 42:
-#line 350 "parse.y"
+case 46:
+#line 390 "parse.y"
{
yyval.id = "short";
;
break;}
-case 43:
-#line 353 "parse.y"
+case 47:
+#line 393 "parse.y"
{
yyval.id = "int";
;
break;}
-case 44:
-#line 358 "parse.y"
+case 48:
+#line 398 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 45:
-#line 361 "parse.y"
+case 49:
+#line 401 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 46:
-#line 364 "parse.y"
+case 50:
+#line 404 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 47:
-#line 369 "parse.y"
+case 51:
+#line 409 "parse.y"
{ stars++; ;
break;}
-case 48:
-#line 370 "parse.y"
+case 52:
+#line 410 "parse.y"
{ stars++; ;
break;}
-case 49:
-#line 373 "parse.y"
+case 53:
+#line 413 "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 54:
+#line 425 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"first")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-2].id,"last")==0)
+ yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-2].id);
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ ;
+ break;}
+case 55:
+#line 437 "parse.y"
+{
+ yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+ ;
+ break;}
+case 56:
+#line 440 "parse.y"
+{
+ 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;
+ }
+ g_free(yyvsp[-1].id);
+ ;
+ break;}
+case 57:
+#line 452 "parse.y"
+{
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ ;
+ break;}
+case 58:
+#line 457 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 50:
-#line 378 "parse.y"
+case 59:
+#line 462 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 51:
-#line 381 "parse.y"
+case 60:
+#line 465 "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 61:
+#line 470 "parse.y"
+{ yyval.cbuf=yyvsp[0].cbuf; ;
break;}
-case 53:
-#line 408 "parse.y"
+case 62:
+#line 471 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 63:
+#line 475 "parse.y"
{
- int sigtype = SIGNAL_LAST_METHOD;
- if(strcmp(yyvsp[-8].id,"first")==0)
- sigtype = SIGNAL_FIRST_METHOD;
- else if(strcmp(yyvsp[-8].id,"last")==0)
- sigtype = SIGNAL_LAST_METHOD;
- else {
- yyerror(_("signal must be 'first' or 'last'"));
- g_free(yyvsp[-8].id);
- 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(yyvsp[-7].sigtype,NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ ccode_line,vararg);
;
break;}
-case 54:
-#line 428 "parse.y"
+case 64:
+#line 485 "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[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line,yyvsp[-1].line);
+ push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
+ ccode_line,vararg);
;
break;}
-case 55:
-#line 437 "parse.y"
+case 65:
+#line 495 "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 66:
+#line 505 "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 67:
+#line 511 "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 68:
+#line 516 "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 69:
+#line 521 "parse.y"
{
if(strcmp(yyvsp[-4].id,"init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
- push_function(INIT_METHOD, NULL, yyvsp[-4].id,
- NULL, NULL,yyvsp[-3].line,0);
+ push_function(INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
+ ccode_line,FALSE);
} else if(strcmp(yyvsp[-4].id,"class_init")==0) {
push_init_arg(yyvsp[-2].id,TRUE);
- push_function(CLASS_INIT_METHOD, NULL,
- yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0);
+ push_function(CLASS_INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
+ ccode_line,FALSE);
} else {
g_free(yyvsp[-4].id);
g_free(yyvsp[-2].id);
+ g_string_free(yyvsp[-2].cbuf,TRUE);
yyerror(_("parse error"));
YYERROR;
}
;
break;}
-case 62:
-#line 482 "parse.y"
-{
- if(strcmp(yyvsp[-5].id,"init")==0) {
- push_init_arg(yyvsp[-3].id,FALSE);
- push_function(INIT_METHOD, NULL,
- yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line,
- yyvsp[-1].line);
- } else if(strcmp(yyvsp[-5].id,"class_init")==0) {
- push_init_arg(yyvsp[-3].id,TRUE);
- push_function(CLASS_INIT_METHOD, NULL,
- yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line,
- yyvsp[-1].line);
- } else {
- g_free(yyvsp[-5].id);
- g_free(yyvsp[-3].id);
- g_string_free(yyvsp[-3].cbuf,TRUE);
- yyerror(_("parse error"));
- YYERROR;
- }
- ;
- break;}
-case 63:
-#line 503 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
- break;}
-case 64:
-#line 504 "parse.y"
+case 70:
+#line 542 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 65:
-#line 505 "parse.y"
+case 71:
+#line 543 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 66:
-#line 509 "parse.y"
+case 72:
+#line 547 "parse.y"
{ ; ;
break;}
-case 67:
-#line 510 "parse.y"
+case 73:
+#line 548 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 68:
-#line 515 "parse.y"
-{ has_this = FALSE; ;
+case 74:
+#line 551 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 69:
-#line 516 "parse.y"
+case 75:
+#line 552 "parse.y"
{
- has_this = TRUE;
- if(strcmp(yyvsp[0].id,"this")==0)
- push_this(yyvsp[0].id);
+ vararg = FALSE;
+ has_self = TRUE;
+ 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"
+case 76:
+#line 563 "parse.y"
{
- has_this = TRUE;
- if(strcmp(yyvsp[-2].id,"this")==0)
- push_this(yyvsp[-2].id);
+ has_self = TRUE;
+ 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 77:
+#line 573 "parse.y"
+{ has_self = FALSE; ;
break;}
-case 72:
-#line 539 "parse.y"
+case 78:
+#line 576 "parse.y"
+{ vararg = TRUE; ;
+ break;}
+case 79:
+#line 577 "parse.y"
+{ vararg = FALSE; ;
+ break;}
+case 80:
+#line 580 "parse.y"
{ ; ;
break;}
-case 73:
-#line 540 "parse.y"
+case 81:
+#line 581 "parse.y"
{ ; ;
break;}
-case 74:
-#line 543 "parse.y"
+case 82:
+#line 584 "parse.y"
{
- push_funcarg(yyvsp[0].id);
+ push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 75:
-#line 546 "parse.y"
+case 83:
+#line 587 "parse.y"
+{
+ push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+ ;
+ break;}
+case 84:
+#line 590 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
YYERROR;
}
g_free(yyvsp[-2].id);
- push_funcarg(yyvsp[-4].id);
+ push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 76:
-#line 556 "parse.y"
+case 85:
+#line 598 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+ ;
+ break;}
+case 86:
+#line 608 "parse.y"
{ ; ;
break;}
-case 77:
-#line 557 "parse.y"
+case 87:
+#line 609 "parse.y"
{ ; ;
break;}
-case 78:
-#line 560 "parse.y"
+case 88:
+#line 612 "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 89:
+#line 625 "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 90:
+#line 629 "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 91:
+#line 633 "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 92:
+#line 637 "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 93:
+#line 641 "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 94:
+#line 645 "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 95:
+#line 651 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 86:
-#line 600 "parse.y"
+case 96:
+#line 652 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
+case 97:
+#line 656 "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 606 "parse.y"
+#line 659 "parse.y"