/* 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 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 ARRAY_DIM 277
+#define CCODE 278
+#define HTCODE 279
+#define PHCODE 280
#define HCODE 281
-#define PUBLIC 282
-#define PRIVATE 283
-#define ARGUMENT 284
-#define VIRTUAL 285
-#define SIGNAL 286
-#define OVERRIDE 287
+#define ACODE 282
+#define ATCODE 283
+#define PUBLIC 284
+#define PRIVATE 285
+#define PROTECTED 286
+#define ARGUMENT 287
+#define VIRTUAL 288
+#define SIGNAL 289
+#define OVERRIDE 290
#line 21 "parse.y"
#include <string.h>
#include "tree.h"
+#include "main.h"
+#include "util.h"
#define _(x) (x)
-extern char *filename;
-
GList *nodes = NULL;
static GList *class_nodes = NULL;
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;
+
+/* destructor and initializer for variables */
+static char *destructor = NULL;
+static int destructor_line = 0;
+static gboolean destructor_simple = TRUE;
+static char *initializer = NULL;
+static int initializer_line = 0;
static GList *gtktypes = NULL;
+/* this can be a global as we will only do one function at a time
+ anyway */
+static int the_scope = NO_SCOPE;
+
void free(void *ptr);
int yylex(void);
+extern int ccode_line;
extern int line_no;
extern char *yytext;
if(strcmp(yytext,"\n")==0) {
out=g_strconcat("Error: ",str," before newline",NULL);
} else if(yytext[0]=='\0') {
- out=g_strconcat("Error: ",str," at end of input",NULL);
+ out=g_strconcat("Error: ", str, " at end of input", NULL);
} else {
char *tmp = g_strdup(yytext);
- while((p=strchr(tmp,'\n')))
+ while((p=strchr(tmp, '\n')))
*p='.';
- out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+ out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
g_free(tmp);
}
- fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+ fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
g_free(out);
exit(1);
}
-static void
-push_variable(char *name, int scope)
+static Type *
+pop_type(void)
{
- Node *var;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+ return type;
+}
+
+static void
+push_variable(char *name, int scope, int line_no, char *postfix)
+{
+ Node *var;
+ Type *type = pop_type();
+
+ type->postfix = postfix;
- var = new_variable(scope,type,name);
+ var = new_variable(scope, type, name, line_no,
+ destructor, destructor_line,
+ destructor_simple,
+ initializer, initializer_line);
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)
+push_function(int scope, int method, char *oid, char *id, char *onerror,
+ GString *cbuf, int line_no, int ccode_line, gboolean vararg,
+ GList *flags)
{
Node *node;
Type *type;
+ char *c_cbuf;
- if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
- type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
+ type = pop_type();
} else {
- type = (Type *)new_type(0,g_strdup("void"));
+ type = (Type *)new_type(0,g_strdup("void"),NULL);
}
- node = new_method(scope,type,oid,gtktypes,id,funcargs,
- onerror,cbuf,line_no);
+ /* a complicated and ugly test to figure out if we have
+ the wrong number of types for a signal */
+ if((method == SIGNAL_FIRST_METHOD ||
+ method == 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);
+ }
+ if(cbuf) {
+ char *p;
+ c_cbuf = p = cbuf->str;
+ while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+ p++;
+ if(!p || !*p)
+ c_cbuf = NULL;
+ } else
+ c_cbuf = NULL;
+
+ node = new_method(scope, method, type, oid, gtktypes, flags,
+ id, funcargs, onerror, c_cbuf, line_no,
+ ccode_line, vararg);
+
+ if(cbuf)
+ g_string_free(cbuf,
+ /*only free segment if we haven't passed it
+ above */
+ c_cbuf?FALSE:TRUE);
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 *type = pop_type();
+
+ 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);
}
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+ GList *li;
+ char *s;
+
+ for(li = class_nodes; li != NULL; li = li->next) {
+ Variable *var;
+ Node *node = li->data;
+ if(node->type != VARIABLE_NODE)
+ continue;
+ var = li->data;
+ if(strcmp(var->id, id)==0)
+ return var;
+ }
+
+ s = g_strdup_printf(_("Variable %s not defined here"), id);
+ print_error(FALSE, s, line);
+
+ g_assert_not_reached();
+ return NULL;
+}
+
-#line 157 "parse.y"
+#line 236 "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 239
#define YYFLAG -32768
-#define YYNTBASE 48
+#define YYNTBASE 50
-#define YYTRANSLATE(x) ((unsigned)(x) <= 287 ? yytranslate[x] : 72)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 86)
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, 48, 2, 2, 2, 2, 2, 2, 41,
+ 42, 44, 2, 45, 49, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 39, 47,
+ 40, 46, 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, 37, 43, 38, 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, 31, 32, 33, 34, 35, 36
};
#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
+ 0, 4, 7, 10, 12, 14, 16, 18, 20, 22,
+ 24, 27, 29, 34, 38, 43, 46, 48, 50, 52,
+ 54, 56, 58, 60, 62, 65, 69, 72, 76, 79,
+ 82, 84, 86, 87, 93, 100, 112, 121, 127, 133,
+ 135, 139, 140, 144, 146, 148, 151, 153, 156, 159,
+ 162, 164, 167, 170, 172, 174, 176, 178, 181, 183,
+ 185, 188, 190, 193, 195, 197, 199, 201, 203, 206,
+ 208, 211, 213, 217, 221, 224, 226, 231, 235, 237,
+ 240, 242, 253, 265, 275, 285, 294, 306, 315, 321,
+ 324, 328, 329, 331, 333, 337, 339, 343, 345, 349,
+ 351, 354, 358, 365, 373, 376, 378, 380, 383, 386,
+ 390, 394, 398, 402, 404, 407
};
-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[] = { 52,
+ 53, 52, 0, 53, 52, 0, 52, 53, 0, 53,
+ 0, 24, 0, 27, 0, 25, 0, 26, 0, 28,
+ 0, 29, 0, 52, 51, 0, 51, 0, 54, 37,
+ 55, 38, 0, 54, 37, 38, 0, 3, 22, 4,
+ 22, 0, 55, 56, 0, 56, 0, 77, 0, 61,
+ 0, 62, 0, 39, 0, 30, 0, 31, 0, 32,
+ 0, 20, 20, 0, 20, 37, 24, 0, 40, 85,
+ 0, 40, 37, 24, 0, 58, 59, 0, 59, 58,
+ 0, 59, 0, 58, 0, 0, 57, 66, 20, 60,
+ 39, 0, 57, 66, 20, 23, 60, 39, 0, 33,
+ 64, 63, 20, 20, 37, 24, 20, 37, 24, 39,
+ 0, 33, 64, 63, 20, 20, 37, 24, 39, 0,
+ 33, 64, 63, 20, 20, 0, 20, 41, 20, 66,
+ 42, 0, 20, 0, 41, 65, 42, 0, 0, 20,
+ 43, 65, 0, 20, 0, 67, 0, 5, 67, 0,
+ 68, 0, 68, 71, 0, 12, 69, 0, 11, 69,
+ 0, 69, 0, 12, 18, 0, 11, 18, 0, 18,
+ 0, 17, 0, 16, 0, 20, 0, 70, 20, 0,
+ 22, 0, 6, 0, 13, 15, 0, 13, 0, 14,
+ 15, 0, 14, 0, 15, 0, 9, 0, 8, 0,
+ 7, 0, 44, 71, 0, 44, 0, 20, 74, 0,
+ 74, 0, 57, 20, 74, 0, 20, 57, 74, 0,
+ 57, 74, 0, 72, 0, 20, 41, 75, 42, 0,
+ 75, 45, 20, 0, 20, 0, 37, 24, 0, 39,
+ 0, 35, 64, 73, 66, 20, 41, 79, 42, 78,
+ 76, 0, 57, 35, 64, 72, 66, 20, 41, 79,
+ 42, 78, 76, 0, 34, 57, 66, 20, 41, 79,
+ 42, 78, 76, 0, 57, 34, 66, 20, 41, 79,
+ 42, 78, 76, 0, 34, 66, 20, 41, 79, 42,
+ 78, 76, 0, 36, 41, 22, 42, 66, 20, 41,
+ 79, 42, 78, 76, 0, 57, 66, 20, 41, 79,
+ 42, 78, 76, 0, 20, 41, 20, 42, 76, 0,
+ 19, 85, 0, 19, 37, 24, 0, 0, 6, 0,
+ 20, 0, 20, 45, 80, 0, 80, 0, 81, 45,
+ 10, 0, 81, 0, 81, 45, 82, 0, 82, 0,
+ 66, 20, 0, 66, 20, 23, 0, 66, 20, 41,
+ 20, 83, 42, 0, 66, 20, 23, 41, 20, 83,
+ 42, 0, 83, 84, 0, 84, 0, 20, 0, 46,
+ 85, 0, 47, 85, 0, 46, 40, 85, 0, 47,
+ 40, 85, 0, 40, 40, 85, 0, 48, 40, 85,
+ 0, 21, 0, 49, 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
+ 255, 256, 257, 258, 261, 267, 273, 279, 285, 291,
+ 299, 300, 303, 308, 315, 320, 321, 324, 325, 326,
+ 327, 330, 331, 332, 335, 348, 364, 368, 376, 377,
+ 378, 379, 380, 386, 389, 393, 428, 456, 521, 530,
+ 536, 537, 540, 543, 549, 550, 558, 562, 569, 572,
+ 575, 578, 581, 584, 587, 590, 593, 596, 600, 603,
+ 608, 611, 614, 617, 620, 625, 628, 631, 636, 637,
+ 641, 653, 659, 671, 683, 686, 692, 697, 700, 705,
+ 706, 710, 720, 730, 740, 750, 760, 766, 771, 792,
+ 793, 797, 800, 801, 812, 822, 825, 826, 829, 830,
+ 833, 836, 839, 847, 857, 858, 861, 874, 878, 882,
+ 886, 890, 894, 900, 901, 905
};
#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",
+"ARRAY_DIM","CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE",
+"PROTECTED","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='",
+"'('","')'","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes",
+"class","classdec","classcode","thing","scope","destructor","initializer","varoptions",
+"variable","argument","argtype","flags","flaglist","type","type1","type2","integer",
+"tspecifier","stars","simplesigtype","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
+ 50, 50, 50, 50, 51, 51, 51, 51, 51, 51,
+ 52, 52, 53, 53, 54, 55, 55, 56, 56, 56,
+ 56, 57, 57, 57, 58, 58, 59, 59, 60, 60,
+ 60, 60, 60, 61, 61, 62, 62, 62, 63, 63,
+ 64, 64, 65, 65, 66, 66, 67, 67, 68, 68,
+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+ 69, 69, 69, 69, 69, 70, 70, 70, 71, 71,
+ 72, 72, 73, 73, 73, 73, 74, 75, 75, 76,
+ 76, 77, 77, 77, 77, 77, 77, 77, 77, 78,
+ 78, 78, 79, 79, 79, 79, 80, 80, 81, 81,
+ 82, 82, 82, 82, 83, 83, 84, 84, 84, 84,
+ 84, 84, 84, 85, 85, 85
};
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, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 2, 1, 4, 3, 4, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 2, 3, 2, 3, 2, 2,
+ 1, 1, 0, 5, 6, 11, 8, 5, 5, 1,
+ 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,
+ 2, 1, 3, 3, 2, 1, 4, 3, 1, 2,
+ 1, 10, 11, 9, 9, 8, 11, 8, 5, 2,
+ 3, 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, 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, 5, 7, 8, 6, 9, 10, 12, 0, 4,
+ 0, 0, 11, 3, 2, 0, 0, 1, 0, 22,
+ 23, 24, 42, 0, 42, 0, 14, 21, 0, 17,
+ 0, 19, 20, 18, 15, 0, 0, 0, 0, 60,
+ 68, 67, 66, 0, 0, 62, 64, 65, 56, 55,
+ 54, 57, 59, 0, 0, 45, 47, 51, 0, 0,
+ 0, 13, 16, 0, 42, 0, 0, 44, 0, 40,
+ 0, 46, 53, 50, 52, 49, 61, 63, 0, 0,
+ 70, 48, 58, 0, 0, 76, 0, 72, 0, 0,
+ 0, 33, 0, 0, 41, 0, 0, 0, 0, 69,
+ 0, 0, 0, 71, 0, 75, 0, 0, 0, 0,
+ 0, 0, 33, 0, 0, 32, 31, 0, 0, 81,
+ 89, 43, 0, 38, 0, 60, 57, 0, 0, 96,
+ 98, 100, 79, 0, 74, 73, 0, 0, 0, 0,
+ 25, 0, 0, 116, 114, 0, 0, 27, 0, 29,
+ 30, 34, 80, 0, 0, 0, 0, 101, 92, 0,
+ 77, 0, 0, 0, 0, 0, 26, 35, 28, 115,
+ 92, 39, 0, 92, 95, 102, 0, 0, 0, 97,
+ 99, 78, 0, 0, 92, 0, 0, 0, 37, 0,
+ 0, 0, 0, 90, 86, 92, 0, 0, 0, 88,
+ 0, 84, 0, 107, 0, 0, 0, 0, 0, 106,
+ 91, 0, 92, 85, 92, 0, 0, 0, 0, 108,
+ 0, 109, 0, 103, 105, 82, 0, 0, 36, 104,
+ 112, 110, 111, 113, 87, 83, 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[] = { 237,
+ 8, 9, 10, 11, 29, 30, 31, 116, 117, 118,
+ 32, 33, 71, 38, 69, 128, 56, 57, 58, 59,
+ 82, 86, 87, 88, 134, 121, 34, 179, 129, 130,
+ 131, 132, 209, 210, 148
};
-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[] = { 54,
+ -16,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 54, 156,
+ -19, 38,-32768, 156, 156, 140, 29, 156, 25,-32768,
+-32768,-32768, 35, 137, 35, 47,-32768,-32768, 157,-32768,
+ 89,-32768,-32768,-32768,-32768, 102, 127, 142, 245,-32768,
+-32768,-32768,-32768, 261, 267, 150, 151,-32768,-32768,-32768,
+-32768,-32768,-32768, 210, 166,-32768, 167,-32768, 174, 95,
+ 191,-32768,-32768, 210, 35, 200, 187, 188, 196, 206,
+ 229,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 235, 225,
+ 167,-32768,-32768, -10, 248,-32768, 210,-32768, 227, 251,
+ 252, 45, 92, 127,-32768, 257, 258, 242, 228,-32768,
+ 243, 266, 268,-32768, -17,-32768, 269, 210, 246, -17,
+ 210, 34, -11, 6, 228, 250, 271, 253, 270,-32768,
+-32768,-32768, 210, 256, 228, 254, -1, 275, 259,-32768,
+ 260,-32768,-32768, 119,-32768,-32768, 262, 277, 228, 278,
+-32768, 276, 263,-32768,-32768, 280, 285,-32768, 265,-32768,
+-32768,-32768,-32768, 272, 284, 273, 210, 91, 290, 192,
+-32768, 279, 228, 281, 274, 282,-32768,-32768,-32768,-32768,
+ 290,-32768, -7, 290,-32768, 283, 291, 40, 92,-32768,
+-32768,-32768, 286, 228, 290, 228, 92, 288,-32768, 92,
+ 292, 93, 289,-32768,-32768, 290, 287, 92, 293,-32768,
+ 294,-32768, 93,-32768, 296, 70, 72, 297, 27,-32768,
+-32768, 92, 290,-32768, 290, 295, 88, 15, 15,-32768,
+ 15,-32768, 15,-32768,-32768,-32768, 92, 92,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 310, 317,-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
+ 255, 106, 311,-32768,-32768, 298, -22, 202, 205, 213,
+-32768,-32768,-32768, -6, 236, -24, 299,-32768, 73,-32768,
+ 264, 240,-32768, 53,-32768, -175,-32768, -157, -114, 175,
+-32768, 173, 136, -201, -173
};
-#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 345
+
+
+static const short yytable[] = { 55,
+ 149, 54, 101, 195, 194, 12, 66, 225, 112, 101,
+ 156, 200, 188, 187, 202, 225, 190, 16, 60, 20,
+ 21, 22, 214, 102, 165, 144, 145, 198, 114, 79,
+ 102, 189, 220, 222, 144, 145, 226, 85, 212, 90,
+ -94, 17, 146, 157, 231, 232, 204, 233, 183, 234,
+ 35, 235, 236, 141, 147, 227, 1, 228, 91, 144,
+ 145, 103, 107, 147, 112, 36, 205, 113, 224, 197,
+ 142, 199, 206, 207, 208, 37, 193, 2, 3, 4,
+ 5, 6, 7, 138, 114, 115, 140, 61, 147, 144,
+ 145, 144, 145, 39, 40, 41, 42, 43, 154, 44,
+ 45, 46, 47, 48, 49, 50, 51, 204, 52, 219,
+ 53, 221, 204, 176, 84, 15, 74, 76, 147, 18,
+ 147, 67, 64, 65, 20, 21, 22, 205, 119, 230,
+ 120, 177, 205, 206, 207, 208, 104, 106, 206, 207,
+ 208, 39, 40, 41, 42, 43, 68, 44, 45, 46,
+ 47, 48, 49, 50, 51, 135, 52, 136, 53, 19,
+ 161, 70, 104, 162, 77, 78, 20, 21, 22, 20,
+ 21, 22, 23, 24, 25, 26, 19, 27, 28, 2,
+ 3, 4, 5, 6, 7, 80, 20, 21, 22, 23,
+ 24, 25, 26, 83, 62, 28, 39, 40, 41, 42,
+ 43, 180, 44, 45, 46, 47, 48, 49, 50, 51,
+ 81, 52, 89, 53, 39, 40, 41, 42, 43, 92,
+ 44, 45, 46, 47, 48, 49, 50, 51, 93, 52,
+ 94, 53, 39, 126, 41, 42, 43, 95, 44, 45,
+ 46, 47, 48, 49, 50, 51, 96, 127, 97, 53,
+ 40, 41, 42, 43, 98, 44, 45, 46, 47, 48,
+ 49, 50, 51, 13, 52, 99, 53, 105, 108, 13,
+ 109, 110, 13, 46, 47, 48, 123, 124, 73, 46,
+ 47, 48, 125, 102, 75, 133, 139, 101, 137, 114,
+ 112, 152, 155, 153, 158, -93, 164, 166, 182, 167,
+ 159, 168, 163, 169, 160, 170, 171, 173, 178, 238,
+ 192, 203, 211, 172, 174, 185, 239, 216, 151, 14,
+ 150, 184, 186, 191, 201, 143, 63, 196, 213, 122,
+ 111, 175, 181, 229, 215, 218, 223, 72, 217, 0,
+ 0, 0, 0, 0, 100
};
-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
+static const short yycheck[] = { 24,
+ 115, 24, 20, 179, 178, 22, 31, 209, 20, 20,
+ 125, 187, 20, 171, 190, 217, 174, 37, 25, 30,
+ 31, 32, 198, 41, 139, 20, 21, 185, 40, 54,
+ 41, 39, 206, 207, 20, 21, 212, 60, 196, 64,
+ 42, 4, 37, 45, 218, 219, 20, 221, 163, 223,
+ 22, 227, 228, 20, 49, 213, 3, 215, 65, 20,
+ 21, 84, 87, 49, 20, 41, 40, 23, 42, 184,
+ 37, 186, 46, 47, 48, 41, 37, 24, 25, 26,
+ 27, 28, 29, 108, 40, 41, 111, 41, 49, 20,
+ 21, 20, 21, 5, 6, 7, 8, 9, 123, 11,
+ 12, 13, 14, 15, 16, 17, 18, 20, 20, 40,
+ 22, 40, 20, 23, 20, 10, 44, 45, 49, 14,
+ 49, 20, 34, 35, 30, 31, 32, 40, 37, 42,
+ 39, 41, 40, 46, 47, 48, 84, 85, 46, 47,
+ 48, 5, 6, 7, 8, 9, 20, 11, 12, 13,
+ 14, 15, 16, 17, 18, 103, 20, 105, 22, 20,
+ 42, 20, 110, 45, 15, 15, 30, 31, 32, 30,
+ 31, 32, 33, 34, 35, 36, 20, 38, 39, 24,
+ 25, 26, 27, 28, 29, 20, 30, 31, 32, 33,
+ 34, 35, 36, 20, 38, 39, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 44, 20, 22, 22, 5, 6, 7, 8, 9, 20,
+ 11, 12, 13, 14, 15, 16, 17, 18, 42, 20,
+ 43, 22, 5, 6, 7, 8, 9, 42, 11, 12,
+ 13, 14, 15, 16, 17, 18, 41, 20, 20, 22,
+ 6, 7, 8, 9, 20, 11, 12, 13, 14, 15,
+ 16, 17, 18, 9, 20, 41, 22, 20, 42, 15,
+ 20, 20, 18, 13, 14, 15, 20, 20, 18, 13,
+ 14, 15, 41, 41, 18, 20, 41, 20, 20, 40,
+ 20, 39, 37, 24, 20, 42, 20, 20, 20, 24,
+ 42, 39, 41, 24, 45, 21, 42, 24, 19, 0,
+ 20, 20, 24, 42, 42, 42, 0, 24, 117, 9,
+ 116, 41, 41, 41, 37, 113, 29, 42, 42, 94,
+ 91, 157, 160, 39, 42, 40, 40, 39, 203, -1,
+ -1, -1, -1, -1, 81
};
/* -*-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 255 "parse.y"
{ ; ;
break;}
case 2:
-#line 176 "parse.y"
+#line 256 "parse.y"
{ ; ;
break;}
case 3:
-#line 177 "parse.y"
+#line 257 "parse.y"
{ ; ;
break;}
case 4:
-#line 178 "parse.y"
+#line 258 "parse.y"
{ ; ;
break;}
case 5:
-#line 181 "parse.y"
+#line 261 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf);
+ Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 6:
-#line 185 "parse.y"
+#line 267 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf);
+ Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 7:
-#line 189 "parse.y"
+#line 273 "parse.y"
{
- Node *node = new_ccode(FALSE,yyvsp[0].cbuf);
+ Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 8:
-#line 193 "parse.y"
+#line 279 "parse.y"
{
- Node *node = new_ccode(TRUE,yyvsp[0].cbuf);
+ Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
case 9:
-#line 199 "parse.y"
+#line 285 "parse.y"
+{
+ Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
+ nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
+ ;
+ break;}
+case 10:
+#line 291 "parse.y"
+{
+ Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
+ ccode_line);
+ nodes = g_list_append(nodes,node);
+ g_string_free(yyvsp[0].cbuf,FALSE);
+ ;
+ break;}
+case 11:
+#line 299 "parse.y"
+{ ; ;
+ break;}
+case 12:
+#line 300 "parse.y"
+{ ; ;
+ break;}
+case 13:
+#line 303 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
nodes = g_list_append(nodes,class);
;
break;}
-case 10:
-#line 206 "parse.y"
+case 14:
+#line 308 "parse.y"
+{
+ ((Class *)class)->nodes = NULL;
+ class_nodes = NULL;
+ nodes = g_list_append(nodes,class);
+ ;
+ break;}
+case 15:
+#line 315 "parse.y"
{
class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
;
break;}
-case 11:
-#line 211 "parse.y"
+case 16:
+#line 320 "parse.y"
{ ; ;
break;}
-case 12:
-#line 212 "parse.y"
+case 17:
+#line 321 "parse.y"
{ ; ;
break;}
-case 13:
-#line 213 "parse.y"
+case 18:
+#line 324 "parse.y"
{ ; ;
break;}
-case 14:
-#line 214 "parse.y"
+case 19:
+#line 325 "parse.y"
{ ; ;
break;}
-case 15:
-#line 215 "parse.y"
+case 20:
+#line 326 "parse.y"
{ ; ;
break;}
-case 16:
-#line 216 "parse.y"
+case 21:
+#line 327 "parse.y"
{ ; ;
break;}
-case 17:
-#line 219 "parse.y"
+case 22:
+#line 330 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+ break;}
+case 23:
+#line 331 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+ break;}
+case 24:
+#line 332 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+ break;}
+case 25:
+#line 335 "parse.y"
+{
+ if(strcmp(yyvsp[-1].id, "destroywith")==0) {
+ g_free(yyvsp[-1].id);
+ destructor = yyvsp[0].id;
+ destructor_line = line_no;
+ destructor_simple = TRUE;
+ } else {
+ g_free(yyvsp[-1].id);
+ g_free(yyvsp[0].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 26:
+#line 348 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id, "destroy")==0) {
+ g_free(yyvsp[-2].id);
+ destructor = (yyvsp[0].cbuf)->str;
+ g_string_free(yyvsp[0].cbuf, FALSE);
+ destructor_line = ccode_line;
+ destructor_simple = FALSE;
+ } else {
+ g_free(yyvsp[-2].id);
+ g_string_free(yyvsp[0].cbuf, TRUE);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 27:
+#line 364 "parse.y"
+{
+ initializer = yyvsp[0].id;
+ initializer_line = ccode_line;
+ ;
+ break;}
+case 28:
+#line 368 "parse.y"
+{
+ initializer = (yyvsp[0].cbuf)->str;
+ initializer_line = ccode_line;
+ g_string_free(yyvsp[0].cbuf, FALSE);
+ ;
+ break;}
+case 29:
+#line 376 "parse.y"
+{ ; ;
+ break;}
+case 30:
+#line 377 "parse.y"
+{ ; ;
+ break;}
+case 31:
+#line 378 "parse.y"
+{ destructor = NULL; ;
+ break;}
+case 32:
+#line 379 "parse.y"
+{ initializer = NULL; ;
+ break;}
+case 33:
+#line 380 "parse.y"
+{
+ destructor = NULL;
+ initializer = NULL;
+ ;
+ break;}
+case 34:
+#line 386 "parse.y"
{
- push_variable(yyvsp[-1].id,PUBLIC_SCOPE);
+ push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
-case 18:
-#line 222 "parse.y"
+case 35:
+#line 389 "parse.y"
{
- push_variable(yyvsp[-1].id,PRIVATE_SCOPE);
+ push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
-case 19:
-#line 226 "parse.y"
+case 36:
+#line 393 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
+ Type *type = pop_type();
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);
+ node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+ (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
+ (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+ yyvsp[-10].line);
+ g_string_free(yyvsp[-4].cbuf,FALSE);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp(yyvsp[-6].id,"set")==0 &&
strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
+ Type *type = pop_type();
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);
+ node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id,
+ (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+ (yyvsp[-4].cbuf)->str,yyvsp[-5].line,
+ yyvsp[-10].line);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
+ g_string_free(yyvsp[-4].cbuf,FALSE);
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"
+case 37:
+#line 428 "parse.y"
{
if(strcmp(yyvsp[-3].id,"get")==0) {
Node *node;
+ Type *type = pop_type();
g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
- yyvsp[-1].cbuf,NULL);
+ node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
+ (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
+ NULL,0, yyvsp[-7].line);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp(yyvsp[-3].id,"set")==0) {
Node *node;
+ Type *type = pop_type();
g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
- NULL,yyvsp[-1].cbuf);
+ node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
+ NULL,0,(yyvsp[-1].cbuf)->str,
+ yyvsp[-2].line, yyvsp[-7].line);
+ g_string_free(yyvsp[-1].cbuf,FALSE);
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"
+case 38:
+#line 456 "parse.y"
+{
+ Node *node;
+ char *get, *set = NULL;
+ Variable *var;
+ Type *type;
+ char *root;
+
+ if(strcmp(yyvsp[0].id,"link")!=0 &&
+ strcmp(yyvsp[0].id,"stringlink")!=0 &&
+ strcmp(yyvsp[0].id,"objectlink")!=0) {
+ g_free(yyvsp[0].id); g_free(yyvsp[-2].id);
+ g_free(yyvsp[-1].id);
+ g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+
+ type = pop_type();
+
+ var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line);
+ if(var->scope == PRIVATE_SCOPE)
+ root = "self->_priv";
+ else
+ root = "self";
+
+ if(strcmp(yyvsp[0].id,"link")==0) {
+ set = g_strdup_printf("%s->%s = ARG;",
+ root, yyvsp[-1].id);
+ } else if(strcmp(yyvsp[0].id,"stringlink")==0) {
+ set = g_strdup_printf("g_free(%s->%s); "
+ "%s->%s = g_strdup(ARG);",
+ root, yyvsp[-1].id,
+ root, yyvsp[-1].id);
+ } else if(strcmp(yyvsp[0].id,"objectlink")==0) {
+ set = g_strdup_printf(
+ "if(%s->%s) "
+ "gtk_object_unref(GTK_OBJECT(%s->%s)); "
+ "%s->%s = ARG; "
+ "if(%s->%s) "
+ "gtk_object_ref(GTK_OBJECT(%s->%s)); ",
+ root, yyvsp[-1].id,
+ root, yyvsp[-1].id,
+ root, yyvsp[-1].id,
+ root, yyvsp[-1].id,
+ root, yyvsp[-1].id);
+ } else {
+ g_assert_not_reached();
+ }
+
+ /* get is the same for everything */
+ get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id);
+
+ g_free(yyvsp[0].id);
+
+
+ if(!type)
+ type = copy_type(var->vtype);
+
+ node = new_argument(yyvsp[-2].id, type, yyvsp[-3].list,
+ yyvsp[-1].id, get, yyvsp[-4].line,
+ set, yyvsp[-4].line, yyvsp[-4].line);
+ class_nodes = g_list_append(class_nodes,node);
+ ;
+ break;}
+case 39:
+#line 521 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"type")!=0) {
+ g_free(yyvsp[-4].id);
+ g_free(yyvsp[-2].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ yyval.id = yyvsp[-4].id;
+ ;
+ break;}
+case 40:
+#line 530 "parse.y"
+{
+ yyval.id = yyvsp[0].id;
+ typestack = g_list_prepend(typestack,NULL);
+ ;
+ break;}
+case 41:
+#line 536 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 22:
-#line 276 "parse.y"
+case 42:
+#line 537 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 23:
-#line 279 "parse.y"
+case 43:
+#line 540 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 24:
-#line 282 "parse.y"
+case 44:
+#line 543 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 25:
-#line 288 "parse.y"
+case 45:
+#line 549 "parse.y"
+{ ; ;
+ break;}
+case 46:
+#line 550 "parse.y"
+{
+ Type *type = typestack->data;
+ char *oldname = type->name;
+ type->name = g_strconcat("const ",oldname,NULL);
+ g_free(oldname);
+ ;
+ break;}
+case 47:
+#line 558 "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 292 "parse.y"
+case 48:
+#line 562 "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 299 "parse.y"
+case 49:
+#line 569 "parse.y"
{
yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
;
break;}
-case 28:
-#line 302 "parse.y"
+case 50:
+#line 572 "parse.y"
{
yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
;
break;}
-case 29:
-#line 305 "parse.y"
+case 51:
+#line 575 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 30:
-#line 308 "parse.y"
+case 52:
+#line 578 "parse.y"
{
yyval.id = g_strdup("unsigned char");
;
break;}
-case 31:
-#line 311 "parse.y"
+case 53:
+#line 581 "parse.y"
{
yyval.id = g_strdup("signed char");
;
break;}
-case 32:
-#line 314 "parse.y"
+case 54:
+#line 584 "parse.y"
{
yyval.id = g_strdup("char");
;
break;}
-case 33:
-#line 317 "parse.y"
+case 55:
+#line 587 "parse.y"
{
yyval.id = g_strdup("double");
;
break;}
-case 34:
-#line 320 "parse.y"
+case 56:
+#line 590 "parse.y"
{
yyval.id = g_strdup("float");
;
break;}
-case 35:
-#line 323 "parse.y"
+case 57:
+#line 593 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 36:
-#line 326 "parse.y"
+case 58:
+#line 596 "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 59:
+#line 600 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 38:
-#line 333 "parse.y"
+case 60:
+#line 603 "parse.y"
{
yyval.id = g_strdup("void");
;
break;}
-case 39:
-#line 338 "parse.y"
+case 61:
+#line 608 "parse.y"
{
yyval.id = "long int";
;
break;}
-case 40:
-#line 341 "parse.y"
+case 62:
+#line 611 "parse.y"
{
yyval.id = "long";
;
break;}
-case 41:
-#line 344 "parse.y"
+case 63:
+#line 614 "parse.y"
{
yyval.id = "short int";
;
break;}
-case 42:
-#line 347 "parse.y"
+case 64:
+#line 617 "parse.y"
{
yyval.id = "short";
;
break;}
-case 43:
-#line 350 "parse.y"
+case 65:
+#line 620 "parse.y"
{
yyval.id = "int";
;
break;}
-case 44:
-#line 355 "parse.y"
+case 66:
+#line 625 "parse.y"
{
yyval.id = "enum ";
;
break;}
-case 45:
-#line 358 "parse.y"
+case 67:
+#line 628 "parse.y"
{
yyval.id = "union ";
;
break;}
-case 46:
-#line 361 "parse.y"
+case 68:
+#line 631 "parse.y"
{
yyval.id = "struct ";
;
break;}
-case 47:
-#line 366 "parse.y"
+case 69:
+#line 636 "parse.y"
{ stars++; ;
break;}
-case 48:
-#line 367 "parse.y"
+case 70:
+#line 637 "parse.y"
{ stars++; ;
break;}
-case 49:
-#line 370 "parse.y"
+case 71:
+#line 641 "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 72:
+#line 653 "parse.y"
+{
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ ;
+ break;}
+case 73:
+#line 659 "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 74:
+#line 671 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"first")==0)
+ yyval.sigtype = SIGNAL_FIRST_METHOD;
+ else if(strcmp(yyvsp[-2].id,"last")==0)
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free(yyvsp[-2].id);
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ ;
+ break;}
+case 75:
+#line 683 "parse.y"
+{
+ yyval.sigtype = SIGNAL_LAST_METHOD;
+ ;
+ break;}
+case 76:
+#line 686 "parse.y"
+{
+ /* the_scope was default thus public */
+ the_scope = PUBLIC_SCOPE;
+ ;
+ break;}
+case 77:
+#line 692 "parse.y"
{
gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
;
break;}
-case 50:
-#line 375 "parse.y"
+case 78:
+#line 697 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 51:
-#line 378 "parse.y"
+case 79:
+#line 700 "parse.y"
{
gtktypes = g_list_append(gtktypes,yyvsp[0].id);
;
break;}
-case 52:
-#line 384 "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[-10].line);
- ;
+case 80:
+#line 705 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 53:
-#line 393 "parse.y"
+case 81:
+#line 706 "parse.y"
+{ yyval.cbuf = NULL; ;
+ break;}
+case 82:
+#line 710 "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[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line);
+ push_function(the_scope, yyvsp[-7].sigtype,NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line,
+ ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 54:
-#line 402 "parse.y"
+case 83:
+#line 720 "parse.y"
{
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_FIRST_METHOD, NULL,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line);
+ push_function(the_scope, yyvsp[-7].sigtype, NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-9].line,
+ ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 55:
-#line 411 "parse.y"
+case 84:
+#line 730 "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_FIRST_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, NULL,yyvsp[-9].line);
+ push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 56:
-#line 420 "parse.y"
+case 85:
+#line 740 "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);
+ push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 57:
-#line 429 "parse.y"
+case 86:
+#line 750 "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);
- ;
- break;}
-case 58:
-#line 438 "parse.y"
-{
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
+ push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line,
+ ccode_line, vararg, NULL);
;
break;}
-case 59:
-#line 442 "parse.y"
-{
- push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
- yyvsp[-1].id, NULL,yyvsp[-7].line);
- ;
- break;}
-case 60:
-#line 446 "parse.y"
+case 87:
+#line 760 "parse.y"
{
- push_function(OVERRIDE_METHOD, yyvsp[-9].id,
- yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line);
+ push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+ yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,
+ yyvsp[-10].line, ccode_line,
+ vararg, NULL);
;
break;}
-case 61:
-#line 450 "parse.y"
-{
- push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
- ;
- break;}
-case 62:
-#line 454 "parse.y"
+case 88:
+#line 766 "parse.y"
{
- push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
- yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line);
+ push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+ yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+ vararg, NULL);
;
break;}
-case 63:
-#line 458 "parse.y"
+case 89:
+#line 771 "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(NO_SCOPE, INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line,
+ ccode_line, FALSE, NULL);
} 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(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+ yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line,
+ ccode_line, FALSE, NULL);
} 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"
+case 90:
+#line 792 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 66:
-#line 494 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
- break;}
-case 67:
-#line 495 "parse.y"
+case 91:
+#line 793 "parse.y"
{
yyval.id = (yyvsp[0].cbuf)->str;
g_string_free(yyvsp[0].cbuf,FALSE);
;
break;}
-case 68:
-#line 499 "parse.y"
-{ ; ;
- break;}
-case 69:
-#line 500 "parse.y"
+case 92:
+#line 797 "parse.y"
{ yyval.id = NULL; ;
break;}
-case 70:
-#line 505 "parse.y"
-{ has_this = FALSE; ;
+case 93:
+#line 800 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 71:
-#line 506 "parse.y"
+case 94:
+#line 801 "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 72:
-#line 516 "parse.y"
+case 95:
+#line 812 "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 73:
-#line 526 "parse.y"
-{ has_this = FALSE; ;
+case 96:
+#line 822 "parse.y"
+{ has_self = FALSE; ;
break;}
-case 74:
-#line 529 "parse.y"
+case 97:
+#line 825 "parse.y"
+{ vararg = TRUE; ;
+ break;}
+case 98:
+#line 826 "parse.y"
+{ vararg = FALSE; ;
+ break;}
+case 99:
+#line 829 "parse.y"
{ ; ;
break;}
-case 75:
-#line 530 "parse.y"
+case 100:
+#line 830 "parse.y"
{ ; ;
break;}
-case 76:
-#line 533 "parse.y"
+case 101:
+#line 833 "parse.y"
{
- push_funcarg(yyvsp[0].id);
+ push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 77:
-#line 536 "parse.y"
+case 102:
+#line 836 "parse.y"
{
- push_funcarg(yyvsp[-4].id);
+ push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 78:
-#line 541 "parse.y"
-{ ; ;
+case 103:
+#line 839 "parse.y"
+{
+ if(strcmp(yyvsp[-2].id,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free(yyvsp[-2].id);
+ push_funcarg(yyvsp[-4].id,NULL);
+ ;
break;}
-case 79:
-#line 542 "parse.y"
+case 104:
+#line 847 "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 105:
+#line 857 "parse.y"
{ ; ;
break;}
-case 80:
-#line 545 "parse.y"
-{
- Node *node = new_check(NULL_CHECK,NULL);
- checks = g_list_append(checks,node);
- ;
+case 106:
+#line 858 "parse.y"
+{ ; ;
break;}
-case 81:
-#line 549 "parse.y"
+case 107:
+#line 861 "parse.y"
{
- Node *node = new_check(TYPE_CHECK,NULL);
- checks = g_list_append(checks,node);
+ if(strcmp(yyvsp[0].id,"type")==0) {
+ Node *node = new_check(TYPE_CHECK,NULL);
+ checks = g_list_append(checks,node);
+ } else if(strcmp(yyvsp[0].id,"null")==0) {
+ Node *node = new_check(NULL_CHECK,NULL);
+ checks = g_list_append(checks,node);
+ } else {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free(yyvsp[0].id);
;
break;}
-case 82:
-#line 553 "parse.y"
+case 108:
+#line 874 "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 109:
+#line 878 "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 110:
+#line 882 "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 111:
+#line 886 "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 112:
+#line 890 "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 113:
+#line 894 "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 114:
+#line 900 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 89:
-#line 580 "parse.y"
+case 115:
+#line 901 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
+case 116:
+#line 905 "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 908 "parse.y"
projects / gob-dx.git / blobdiff