X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2255b3d84eeb947d4c065332f16e410ae4704c63..5b42e9400440d86723a27747b2191ab8cd59c2ee:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 6614f29..3eeb82b 100644 --- a/src/parse.c +++ b/src/parse.c @@ -26,14 +26,18 @@ #define TYPETOKEN 276 #define ARRAY_DIM 277 #define CCODE 278 -#define HCODE 279 -#define PUBLIC 280 -#define PRIVATE 281 -#define PROTECTED 282 -#define ARGUMENT 283 -#define VIRTUAL 284 -#define SIGNAL 285 -#define OVERRIDE 286 +#define HTCODE 279 +#define PHCODE 280 +#define HCODE 281 +#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" @@ -45,11 +49,10 @@ #include "tree.h" #include "main.h" +#include "util.h" #define _(x) (x) -extern char *filename; - GList *nodes = NULL; static GList *class_nodes = NULL; @@ -62,6 +65,13 @@ static GList *checks = NULL; 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 @@ -85,46 +95,56 @@ yyerror(char *str) 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 Type * +pop_type(void) +{ + 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 = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + Type *type = pop_type(); type->postfix = postfix; - var = new_variable(scope,type,name,line_no); + 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, int method, char *oid, char *id, char *onerror, - GString *cbuf,int line_no, int ccode_line, int vararg) + GString *cbuf, int line_no, int ccode_line, gboolean vararg, + GList *flags) { Node *node; Type *type; char *c_cbuf; if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) { - type = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + type = pop_type(); } else { type = (Type *)new_type(0,g_strdup("void"),NULL); } @@ -139,7 +159,7 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, 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); + "don't seem to match"), line_no); } if(cbuf) { char *p; @@ -151,8 +171,9 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, } else c_cbuf = NULL; - node = new_method(scope,method,type,oid,gtktypes,id,funcargs, - onerror,c_cbuf,line_no,ccode_line,vararg); + 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, @@ -169,8 +190,7 @@ static void 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; @@ -210,8 +230,31 @@ push_self(char *id) 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 197 "parse.y" +#line 236 "parse.y" typedef union { char *id; GString *cbuf; @@ -233,26 +276,26 @@ typedef union { -#define YYFINAL 214 +#define YYFINAL 239 #define YYFLAG -32768 -#define YYNTBASE 46 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 76) +#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, 44, 2, 2, 2, 2, 2, 2, 36, - 37, 39, 2, 40, 45, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 35, 42, - 43, 41, 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, 33, 38, 34, 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, @@ -268,76 +311,85 @@ static const char yytranslate[] = { 0, 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 + 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, - 31, 36, 39, 42, 45, 47, 49, 51, 53, 55, - 57, 62, 68, 80, 89, 93, 94, 98, 100, 102, - 105, 107, 110, 113, 116, 118, 121, 124, 126, 128, - 130, 132, 135, 137, 139, 142, 144, 147, 149, 151, - 153, 155, 157, 160, 162, 165, 167, 171, 175, 178, - 180, 185, 189, 191, 194, 196, 206, 217, 227, 237, - 246, 258, 267, 273, 276, 280, 281, 283, 285, 289, - 291, 295, 297, 301, 303, 306, 310, 317, 325, 328, - 330, 332, 335, 338, 342, 346, 350, 354, 356, 359 + 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[] = { 47, - 48, 47, 0, 48, 47, 0, 47, 48, 0, 48, - 0, 47, 24, 0, 47, 25, 0, 24, 0, 25, - 0, 49, 33, 50, 34, 0, 49, 33, 34, 0, - 3, 22, 4, 22, 0, 50, 67, 0, 50, 52, - 0, 50, 53, 0, 67, 0, 52, 0, 53, 0, - 26, 0, 27, 0, 28, 0, 51, 56, 20, 35, - 0, 51, 56, 20, 23, 35, 0, 29, 54, 20, - 20, 20, 33, 24, 20, 33, 24, 35, 0, 29, - 54, 20, 20, 20, 33, 24, 35, 0, 36, 55, - 37, 0, 0, 20, 38, 55, 0, 20, 0, 57, - 0, 5, 57, 0, 58, 0, 58, 61, 0, 12, - 59, 0, 11, 59, 0, 59, 0, 12, 18, 0, - 11, 18, 0, 18, 0, 17, 0, 16, 0, 20, - 0, 60, 20, 0, 22, 0, 6, 0, 13, 15, - 0, 13, 0, 14, 15, 0, 14, 0, 15, 0, - 9, 0, 8, 0, 7, 0, 39, 61, 0, 39, - 0, 20, 64, 0, 64, 0, 51, 20, 64, 0, - 20, 51, 64, 0, 51, 64, 0, 62, 0, 20, - 36, 65, 37, 0, 65, 40, 20, 0, 20, 0, - 33, 24, 0, 35, 0, 31, 63, 56, 20, 36, - 69, 37, 68, 66, 0, 51, 31, 62, 56, 20, - 36, 69, 37, 68, 66, 0, 30, 51, 56, 20, - 36, 69, 37, 68, 66, 0, 51, 30, 56, 20, - 36, 69, 37, 68, 66, 0, 30, 56, 20, 36, - 69, 37, 68, 66, 0, 32, 36, 22, 37, 56, - 20, 36, 69, 37, 68, 66, 0, 51, 56, 20, - 36, 69, 37, 68, 66, 0, 20, 36, 20, 37, - 66, 0, 19, 75, 0, 19, 33, 24, 0, 0, - 6, 0, 20, 0, 20, 40, 70, 0, 70, 0, - 71, 40, 10, 0, 71, 0, 71, 40, 72, 0, - 72, 0, 56, 20, 0, 56, 20, 23, 0, 56, - 20, 36, 20, 73, 37, 0, 56, 20, 23, 36, - 20, 73, 37, 0, 73, 74, 0, 74, 0, 20, - 0, 41, 75, 0, 42, 75, 0, 41, 43, 75, - 0, 42, 43, 75, 0, 43, 43, 75, 0, 44, - 43, 75, 0, 21, 0, 45, 21, 0, 20, 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, - 216, 217, 218, 219, 222, 228, 233, 239, 246, 251, - 258, 263, 264, 265, 266, 267, 268, 271, 272, 273, - 276, 279, 283, 316, 344, 345, 348, 351, 357, 358, - 366, 370, 377, 380, 383, 386, 389, 392, 395, 398, - 401, 404, 408, 411, 416, 419, 422, 425, 428, 433, - 436, 439, 444, 445, 449, 461, 467, 479, 491, 494, - 500, 505, 508, 513, 514, 518, 528, 538, 548, 558, - 568, 574, 579, 600, 601, 605, 608, 609, 620, 630, - 633, 634, 637, 638, 641, 644, 647, 655, 665, 666, - 669, 682, 686, 690, 694, 698, 702, 708, 709, 713 + 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 @@ -347,179 +399,193 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","CLASS", "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","PROTECTED","ARGUMENT","VIRTUAL", -"SIGNAL","OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'>'","'<'", -"'='","'!'","'-'","prog","ccodes","class","classdec","classcode","scope","variable", -"argument","argflags","flaglist","type","type1","type2","integer","tspecifier", -"stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode","method", -"onerror","funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL +"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, - 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, - 49, 50, 50, 50, 50, 50, 50, 51, 51, 51, - 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, 62, 63, 63, 63, 63, - 64, 65, 65, 66, 66, 67, 67, 67, 67, 67, - 67, 67, 67, 68, 68, 68, 69, 69, 69, 69, - 70, 70, 71, 71, 72, 72, 72, 72, 73, 73, - 74, 74, 74, 74, 74, 74, 74, 75, 75, 75 + 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, 3, - 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 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, 2, 1, 3, 3, 2, 1, - 4, 3, 1, 2, 1, 9, 10, 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 + 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, 18, 19, 20, 26, 0, - 0, 0, 10, 0, 0, 16, 17, 15, 11, 0, - 0, 0, 0, 44, 52, 51, 50, 0, 0, 46, - 48, 49, 40, 39, 38, 41, 43, 0, 0, 29, - 31, 35, 0, 0, 0, 60, 0, 56, 0, 9, - 13, 14, 12, 0, 0, 0, 0, 28, 0, 0, - 30, 37, 34, 36, 33, 45, 47, 0, 0, 54, - 32, 42, 0, 0, 0, 55, 0, 59, 0, 0, - 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, - 53, 63, 0, 58, 57, 0, 0, 0, 0, 0, - 21, 0, 0, 65, 73, 27, 0, 0, 44, 41, - 0, 0, 80, 82, 84, 61, 0, 0, 0, 0, - 0, 22, 0, 64, 0, 0, 0, 85, 76, 0, - 62, 0, 0, 0, 0, 76, 0, 76, 79, 86, - 0, 0, 0, 81, 83, 76, 0, 76, 0, 0, - 0, 24, 0, 0, 0, 100, 98, 0, 0, 74, - 70, 0, 0, 0, 76, 72, 0, 68, 0, 91, - 0, 0, 0, 0, 0, 90, 75, 99, 66, 76, - 69, 0, 0, 0, 0, 92, 0, 93, 0, 0, - 87, 89, 0, 67, 23, 88, 94, 95, 96, 97, - 71, 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[] = { 212, - 4, 5, 6, 24, 25, 26, 27, 32, 69, 121, - 50, 51, 52, 53, 81, 56, 57, 58, 103, 115, - 28, 153, 122, 123, 124, 125, 185, 186, 170 +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[] = { 77, - -16,-32768,-32768, 85, 65, 6, 51,-32768,-32768, 65, - 120, 216, 42, 120, 46,-32768,-32768,-32768, 62, 115, - 15, 89,-32768, 229, 54,-32768,-32768,-32768,-32768, 91, - 116, 131, 206,-32768,-32768,-32768,-32768, 79, 135, 125, - 140,-32768,-32768,-32768,-32768,-32768,-32768, 171, 161,-32768, - 151,-32768, 172, 205, 179,-32768, 171,-32768, 186,-32768, --32768,-32768,-32768, 171, 190, 196, 197, 199, 198, 207, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 218, 203, 151, --32768,-32768, 204, 231, 232,-32768, -7,-32768, 233, 217, - 242, -7, 171, 111, 139, 116,-32768, 244, 230, 189, --32768,-32768, -30,-32768,-32768, 234, 171, 235, 245, 237, --32768, 189, 243,-32768,-32768,-32768, 236, 189, 238, 59, - 248, 239,-32768, 240,-32768,-32768, 253, 189, 254, 189, - 241,-32768, 246,-32768, 255, 247, 171, 9, 259, 153, --32768, 249, 251, 252, 189, 259, -5, 259,-32768, 256, - 261, 5, 139,-32768,-32768, 259, 189, 259, 257, 139, - 258,-32768, 139, 262, 75,-32768,-32768, 264, 269,-32768, --32768, 139, 260, 139, 259,-32768, 271,-32768, 75,-32768, - 13, 32, 250, 263, 63,-32768,-32768,-32768,-32768, 259, --32768, 139, 265, 71, 58,-32768, 58,-32768, 58, 58, --32768,-32768, 139,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 285, 296,-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, - 76, 294,-32768,-32768, 3, 275, 277,-32768, 208, -20, - 270,-32768, 191,-32768, 222, 266,-32768, -38,-32768, -152, - 281, -144, -109, 170,-32768, 168, 130, -167, -43 + 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 331 - - -static const short yytable[] = { 49, - 171, 160, 133, 163, 66, 7, 126, 176, 136, 127, - 178, 172, 83, 174, 161, 86, 88, 202, 142, 189, - 144, 191, 48, 55, 166, 167, 202, 78, 84, 162, - 192, 150, 166, 167, 54, 159, 89, 168, 12, 204, - 16, 17, 18, 91, 151, 203, 104, 173, 105, 169, - 211, 166, 167, 86, 13, 195, 85, 169, 33, 34, - 35, 36, 37, 29, 38, 39, 40, 41, 42, 43, - 44, 45, 109, 46, 197, 47, 169, 166, 167, 1, - 11, 30, 180, 64, 65, 14, 129, 1, 2, 3, - 180, 40, 41, 42, 180, -78, 72, 31, 137, 201, - 2, 3, 169, 181, 182, 183, 184, 206, 8, 9, - 67, 181, 182, 183, 184, 181, 182, 183, 184, 33, - 34, 35, 36, 37, 59, 38, 39, 40, 41, 42, - 43, 44, 45, 110, 46, 68, 47, 196, 198, 76, - 16, 17, 18, 8, 9, 111, 112, 40, 41, 42, - 70, 207, 74, 208, 77, 209, 210, 33, 34, 35, - 36, 37, 154, 38, 39, 40, 41, 42, 43, 44, - 45, 113, 46, 114, 47, 33, 34, 35, 36, 37, - 79, 38, 39, 40, 41, 42, 43, 44, 45, 80, - 46, 82, 47, 33, 119, 35, 36, 37, 87, 38, - 39, 40, 41, 42, 43, 44, 45, 90, 120, 92, - 47, 34, 35, 36, 37, 94, 38, 39, 40, 41, - 42, 43, 44, 45, 83, 46, 98, 47, 73, 75, - 16, 17, 18, 95, 97, 15, 96, 99, 100, 84, - 84, 16, 17, 18, 19, 20, 21, 22, 15, 23, - 102, 83, 106, 107, 16, 17, 18, 19, 20, 21, - 22, 108, 60, 117, 131, 118, 134, 138, 135, 128, - 130, 132, 141, 143, -77, 139, 145, 152, 147, 140, - 165, 179, 146, 148, 213, 156, 157, 187, 158, 188, - 177, 164, 199, 175, 193, 214, 190, 10, 61, 205, - 62, 101, 71, 116, 63, 200, 149, 155, 194, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93 +#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[] = { 20, - 153, 146, 112, 148, 25, 22, 37, 160, 118, 40, - 163, 156, 20, 158, 20, 54, 55, 185, 128, 172, - 130, 174, 20, 21, 20, 21, 194, 48, 36, 35, - 175, 23, 20, 21, 20, 145, 57, 33, 33, 192, - 26, 27, 28, 64, 36, 190, 85, 157, 87, 45, - 203, 20, 21, 92, 4, 43, 54, 45, 5, 6, - 7, 8, 9, 22, 11, 12, 13, 14, 15, 16, - 17, 18, 93, 20, 43, 22, 45, 20, 21, 3, - 5, 36, 20, 30, 31, 10, 107, 3, 24, 25, - 20, 13, 14, 15, 20, 37, 18, 36, 40, 37, - 24, 25, 45, 41, 42, 43, 44, 37, 24, 25, - 20, 41, 42, 43, 44, 41, 42, 43, 44, 5, - 6, 7, 8, 9, 36, 11, 12, 13, 14, 15, - 16, 17, 18, 23, 20, 20, 22, 181, 182, 15, - 26, 27, 28, 24, 25, 35, 36, 13, 14, 15, - 20, 195, 18, 197, 15, 199, 200, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 33, 20, 35, 22, 5, 6, 7, 8, 9, - 20, 11, 12, 13, 14, 15, 16, 17, 18, 39, - 20, 20, 22, 5, 6, 7, 8, 9, 20, 11, - 12, 13, 14, 15, 16, 17, 18, 22, 20, 20, - 22, 6, 7, 8, 9, 20, 11, 12, 13, 14, - 15, 16, 17, 18, 20, 20, 20, 22, 38, 39, - 26, 27, 28, 37, 37, 20, 38, 20, 36, 36, - 36, 26, 27, 28, 29, 30, 31, 32, 20, 34, - 20, 20, 20, 37, 26, 27, 28, 29, 30, 31, - 32, 20, 34, 20, 20, 36, 24, 20, 33, 36, - 36, 35, 20, 20, 37, 37, 36, 19, 24, 40, - 20, 20, 37, 37, 0, 37, 36, 24, 37, 21, - 33, 36, 43, 37, 24, 0, 37, 4, 24, 35, - 24, 80, 33, 96, 24, 43, 137, 140, 179, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65 +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" @@ -1065,133 +1131,233 @@ yyreduce: switch (yyn) { case 1: -#line 216 "parse.y" +#line 255 "parse.y" { ; ; break;} case 2: -#line 217 "parse.y" +#line 256 "parse.y" { ; ; break;} case 3: -#line 218 "parse.y" +#line 257 "parse.y" { ; ; break;} case 4: -#line 219 "parse.y" +#line 258 "parse.y" { ; ; break;} case 5: -#line 222 "parse.y" +#line 261 "parse.y" { - Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str, + 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 228 "parse.y" +#line 267 "parse.y" { - Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line); + 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 233 "parse.y" +#line 273 "parse.y" { - Node *node = new_ccode(FALSE,(yyvsp[0].cbuf)->str, + 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 239 "parse.y" +#line 279 "parse.y" { - Node *node = new_ccode(TRUE,(yyvsp[0].cbuf)->str,ccode_line); + 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 246 "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 251 "parse.y" +case 14: +#line 308 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 11: -#line 258 "parse.y" +case 15: +#line 315 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} -case 12: -#line 263 "parse.y" +case 16: +#line 320 "parse.y" { ; ; break;} -case 13: -#line 264 "parse.y" +case 17: +#line 321 "parse.y" { ; ; break;} -case 14: -#line 265 "parse.y" +case 18: +#line 324 "parse.y" { ; ; break;} -case 15: -#line 266 "parse.y" +case 19: +#line 325 "parse.y" { ; ; break;} -case 16: -#line 267 "parse.y" +case 20: +#line 326 "parse.y" { ; ; break;} -case 17: -#line 268 "parse.y" +case 21: +#line 327 "parse.y" { ; ; break;} -case 18: -#line 271 "parse.y" +case 22: +#line 330 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} -case 19: -#line 272 "parse.y" +case 23: +#line 331 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} -case 20: -#line 273 "parse.y" +case 24: +#line 332 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} -case 21: -#line 276 "parse.y" +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" { - push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL); + 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[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 22: -#line 279 "parse.y" +case 35: +#line 389 "parse.y" { - push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id); + push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 23: -#line 283 "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, + 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); @@ -1201,8 +1367,9 @@ case 23: } 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, + 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); @@ -1220,21 +1387,23 @@ case 23: } ; break;} -case 24: -#line 316 "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, + 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, + 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); @@ -1249,32 +1418,117 @@ case 24: } ; break;} -case 25: -#line 344 "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 26: -#line 345 "parse.y" +case 42: +#line 537 "parse.y" { yyval.list = NULL; ; break;} -case 27: -#line 348 "parse.y" +case 43: +#line 540 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 28: -#line 351 "parse.y" +case 44: +#line 543 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 29: -#line 357 "parse.y" +case 45: +#line 549 "parse.y" { ; ; break;} -case 30: -#line 358 "parse.y" +case 46: +#line 550 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1282,152 +1536,152 @@ case 30: g_free(oldname); ; break;} -case 31: -#line 366 "parse.y" +case 47: +#line 558 "parse.y" { Node *node = new_type(0,yyvsp[0].id,NULL); typestack = g_list_prepend(typestack,node); ; break;} -case 32: -#line 370 "parse.y" +case 48: +#line 562 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id,NULL); stars = 0; typestack = g_list_prepend(typestack,node); ; break;} -case 33: -#line 377 "parse.y" +case 49: +#line 569 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} -case 34: -#line 380 "parse.y" +case 50: +#line 572 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} -case 35: -#line 383 "parse.y" +case 51: +#line 575 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 36: -#line 386 "parse.y" +case 52: +#line 578 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} -case 37: -#line 389 "parse.y" +case 53: +#line 581 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} -case 38: -#line 392 "parse.y" +case 54: +#line 584 "parse.y" { yyval.id = g_strdup("char"); ; break;} -case 39: -#line 395 "parse.y" +case 55: +#line 587 "parse.y" { yyval.id = g_strdup("double"); ; break;} -case 40: -#line 398 "parse.y" +case 56: +#line 590 "parse.y" { yyval.id = g_strdup("float"); ; break;} -case 41: -#line 401 "parse.y" +case 57: +#line 593 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 42: -#line 404 "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 43: -#line 408 "parse.y" +case 59: +#line 600 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 44: -#line 411 "parse.y" +case 60: +#line 603 "parse.y" { yyval.id = g_strdup("void"); ; break;} -case 45: -#line 416 "parse.y" +case 61: +#line 608 "parse.y" { yyval.id = "long int"; ; break;} -case 46: -#line 419 "parse.y" +case 62: +#line 611 "parse.y" { yyval.id = "long"; ; break;} -case 47: -#line 422 "parse.y" +case 63: +#line 614 "parse.y" { yyval.id = "short int"; ; break;} -case 48: -#line 425 "parse.y" +case 64: +#line 617 "parse.y" { yyval.id = "short"; ; break;} -case 49: -#line 428 "parse.y" +case 65: +#line 620 "parse.y" { yyval.id = "int"; ; break;} -case 50: -#line 433 "parse.y" +case 66: +#line 625 "parse.y" { yyval.id = "enum "; ; break;} -case 51: -#line 436 "parse.y" +case 67: +#line 628 "parse.y" { yyval.id = "union "; ; break;} -case 52: -#line 439 "parse.y" +case 68: +#line 631 "parse.y" { yyval.id = "struct "; ; break;} -case 53: -#line 444 "parse.y" +case 69: +#line 636 "parse.y" { stars++; ; break;} -case 54: -#line 445 "parse.y" +case 70: +#line 637 "parse.y" { stars++; ; break;} -case 55: -#line 449 "parse.y" +case 71: +#line 641 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1441,14 +1695,14 @@ case 55: g_free(yyvsp[-1].id); ; break;} -case 56: -#line 461 "parse.y" +case 72: +#line 653 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 57: -#line 467 "parse.y" +case 73: +#line 659 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1462,8 +1716,8 @@ case 57: g_free(yyvsp[-1].id); ; break;} -case 58: -#line 479 "parse.y" +case 74: +#line 671 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1477,47 +1731,47 @@ case 58: g_free(yyvsp[-2].id); ; break;} -case 59: -#line 491 "parse.y" +case 75: +#line 683 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 60: -#line 494 "parse.y" +case 76: +#line 686 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 61: -#line 500 "parse.y" +case 77: +#line 692 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 62: -#line 505 "parse.y" +case 78: +#line 697 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 63: -#line 508 "parse.y" +case 79: +#line 700 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 64: -#line 513 "parse.y" +case 80: +#line 705 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 65: -#line 514 "parse.y" +case 81: +#line 706 "parse.y" { yyval.cbuf = NULL; ; break;} -case 66: -#line 518 "parse.y" +case 82: +#line 710 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1525,25 +1779,25 @@ case 66: YYERROR; } push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 67: -#line 528 "parse.y" +case 83: +#line 720 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + 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 68: -#line 538 "parse.y" +case 84: +#line 730 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1551,12 +1805,12 @@ case 68: YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + ccode_line, vararg, NULL); ; break;} -case 69: -#line 548 "parse.y" +case 85: +#line 740 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1564,12 +1818,12 @@ case 69: YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 70: -#line 558 "parse.y" +case 86: +#line 750 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1577,40 +1831,40 @@ case 70: YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 71: -#line 568 "parse.y" +case 87: +#line 760 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, - yyvsp[-10].line,ccode_line, - vararg); + yyvsp[-10].line, ccode_line, + vararg, NULL); ; break;} -case 72: -#line 574 "parse.y" +case 88: +#line 766 "parse.y" { push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,ccode_line, - vararg); + yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + vararg, NULL); ; break;} -case 73: -#line 579 "parse.y" +case 89: +#line 771 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + 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(NO_SCOPE, CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + 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); @@ -1620,27 +1874,27 @@ case 73: } ; break;} -case 74: -#line 600 "parse.y" +case 90: +#line 792 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 75: -#line 601 "parse.y" +case 91: +#line 793 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 76: -#line 605 "parse.y" +case 92: +#line 797 "parse.y" { yyval.id = NULL; ; break;} -case 77: -#line 608 "parse.y" +case 93: +#line 800 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 78: -#line 609 "parse.y" +case 94: +#line 801 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -1653,8 +1907,8 @@ case 78: } ; break;} -case 79: -#line 620 "parse.y" +case 95: +#line 812 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -1666,40 +1920,40 @@ case 79: } ; break;} -case 80: -#line 630 "parse.y" +case 96: +#line 822 "parse.y" { has_self = FALSE; ; break;} -case 81: -#line 633 "parse.y" +case 97: +#line 825 "parse.y" { vararg = TRUE; ; break;} -case 82: -#line 634 "parse.y" +case 98: +#line 826 "parse.y" { vararg = FALSE; ; break;} -case 83: -#line 637 "parse.y" +case 99: +#line 829 "parse.y" { ; ; break;} -case 84: -#line 638 "parse.y" +case 100: +#line 830 "parse.y" { ; ; break;} -case 85: -#line 641 "parse.y" +case 101: +#line 833 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 86: -#line 644 "parse.y" +case 102: +#line 836 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 87: -#line 647 "parse.y" +case 103: +#line 839 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1709,8 +1963,8 @@ case 87: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 88: -#line 655 "parse.y" +case 104: +#line 847 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1720,16 +1974,16 @@ case 88: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 89: -#line 665 "parse.y" +case 105: +#line 857 "parse.y" { ; ; break;} -case 90: -#line 666 "parse.y" +case 106: +#line 858 "parse.y" { ; ; break;} -case 91: -#line 669 "parse.y" +case 107: +#line 861 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1744,61 +1998,61 @@ case 91: g_free(yyvsp[0].id); ; break;} -case 92: -#line 682 "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 93: -#line 686 "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 94: -#line 690 "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 95: -#line 694 "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 96: -#line 698 "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 97: -#line 702 "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 98: -#line 708 "parse.y" +case 114: +#line 900 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 99: -#line 709 "parse.y" +case 115: +#line 901 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 100: -#line 713 "parse.y" +case 116: +#line 905 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2023,5 +2277,5 @@ yyerrhandle: } return 1; } -#line 716 "parse.y" +#line 908 "parse.y"