X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/3b10bbd3a88d6e16146414d91d06bb2f36347bfc..c9914e54f16c3315d47040f4cca2d3788228c504:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 4e7592d..c41f9e4 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,20 +20,20 @@ #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 ACODE 282 -#define ATCODE 283 -#define PUBLIC 284 -#define PRIVATE 285 -#define PROTECTED 286 +#define TOKEN 273 +#define NUMBER 274 +#define TYPETOKEN 275 +#define ARRAY_DIM 276 +#define CCODE 277 +#define HTCODE 278 +#define PHCODE 279 +#define HCODE 280 +#define ACODE 281 +#define ATCODE 282 +#define PUBLIC 283 +#define PRIVATE 284 +#define PROTECTED 285 +#define CLASSWIDE 286 #define ARGUMENT 287 #define VIRTUAL 288 #define SIGNAL 289 @@ -45,9 +45,10 @@ #include "config.h" #include #include +#include #include -#include "tree.h" +#include "treefuncs.h" #include "main.h" #include "util.h" @@ -57,9 +58,9 @@ GList *nodes = NULL; static GList *class_nodes = NULL; Node *class = NULL; +char *chunk_size = NULL; static GList *typestack = NULL; -static int stars = 0; static GList *funcargs = NULL; static GList *checks = NULL; static int has_self = FALSE; @@ -72,6 +73,9 @@ static gboolean destructor_simple = TRUE; static char *initializer = NULL; static int initializer_line = 0; +static char *onerror = NULL; +static char *defreturn = NULL; + static GList *gtktypes = NULL; /* this can be a global as we will only do one function at a time @@ -95,17 +99,17 @@ 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); @@ -135,18 +139,20 @@ push_variable(char *name, int scope, int line_no, char *postfix) } static void -push_function(int scope, int method, char *oid, char *id, char *onerror, - GString *cbuf, int line_no, int ccode_line, gboolean vararg, - GList *flags) +push_function(int scope, int method, char *oid, char *id, + GString *cbuf, int line_no, int ccode_line, + gboolean vararg, GList *flags) { Node *node; Type *type; char *c_cbuf; + + g_assert(scope != CLASS_SCOPE); - if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) { - type = pop_type(); + if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + type = (Type *)new_type(g_strdup("void"), NULL, NULL); } else { - type = (Type *)new_type(0,g_strdup("void"),NULL); + type = pop_type(); } /* a complicated and ugly test to figure out if we have @@ -156,10 +162,21 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, g_list_length(gtktypes) != g_list_length(funcargs) && !(g_list_length(funcargs) == 1 && g_list_length(gtktypes) == 2 && - strcmp(gtktypes->next->data,"NONE")==0)) { + 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(g_list_length(gtktypes) > 2) { + GList *li; + for(li = gtktypes->next; li; li = li->next) { + if(strcmp(li->data, "NONE")==0) { + print_error(FALSE, + _("NONE can only appear in an " + "argument list by itself"), + line_no); + } + } } if(cbuf) { char *p; @@ -172,8 +189,8 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, c_cbuf = NULL; node = new_method(scope, method, type, oid, gtktypes, flags, - id, funcargs, onerror, c_cbuf, line_no, - ccode_line, vararg); + id, funcargs, onerror, defreturn, c_cbuf, line_no, + ccode_line, vararg, method_unique_id++); if(cbuf) g_string_free(cbuf, @@ -183,9 +200,31 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, gtktypes = NULL; funcargs = NULL; + onerror = NULL; + defreturn = NULL; + class_nodes = g_list_append(class_nodes, node); } +static void +free_all_global_state(void) +{ + g_free(onerror); + onerror = NULL; + g_free(defreturn); + defreturn = NULL; + + g_free(chunk_size); + chunk_size = NULL; + + g_list_foreach(gtktypes, (GFunc)g_free, NULL); + g_list_free(gtktypes); + gtktypes = NULL; + + free_node_list(funcargs); + funcargs = NULL; +} + static void push_funcarg(char *name, char *postfix) { @@ -194,7 +233,7 @@ push_funcarg(char *name, char *postfix) type->postfix = postfix; - node = new_funcarg(type,name,checks); + node = new_funcarg(type, name, checks); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -212,18 +251,19 @@ push_init_arg(char *name, int is_class) else tn = g_strdup(((Class *)class)->otype); - type = new_type(1,tn,NULL); + type = new_type(tn, g_strdup("*"), NULL); node = new_funcarg((Type *)type,name,NULL); funcargs = g_list_prepend(funcargs, node); } static void -push_self(char *id) +push_self(char *id, gboolean constant) { Node *node; Node *type; GList *ch = NULL; - type = new_type(1,g_strdup(((Class *)class)->otype),NULL); + type = new_type(g_strdup(((Class *)class)->otype), + g_strdup(constant ? "const *" : "*"), 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,id,ch); @@ -253,8 +293,27 @@ find_var_or_die(const char *id, int line) return NULL; } +static gboolean +set_return_value(char *type, char *val) +{ + if(strcmp(type, "onerror")==0) { + if(!onerror) { + onerror = val; + return TRUE; + } else + return FALSE; + } else if(strcmp(type, "defreturn")==0) { + if(!defreturn) { + defreturn = val; + return TRUE; + } else + return FALSE; + } + return FALSE; +} + -#line 236 "parse.y" +#line 295 "parse.y" typedef union { char *id; GString *cbuf; @@ -276,20 +335,20 @@ typedef union { -#define YYFINAL 239 +#define YYFINAL 263 #define YYFLAG -32768 #define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 86) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 88) 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, 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, 48, 2, 2, 2, 2, 2, 2, 39, + 40, 44, 2, 45, 49, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 41, 47, + 42, 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, @@ -317,79 +376,89 @@ static const char yytranslate[] = { 0, #if YYDEBUG != 0 static const short yyprhs[] = { 0, 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 + 24, 27, 29, 34, 38, 44, 45, 50, 55, 58, + 60, 62, 64, 66, 68, 70, 72, 74, 76, 79, + 83, 86, 90, 93, 96, 98, 100, 101, 107, 114, + 126, 135, 141, 147, 149, 153, 154, 158, 160, 163, + 165, 167, 169, 172, 175, 178, 182, 186, 189, 192, + 195, 197, 200, 202, 205, 207, 209, 211, 213, 215, + 217, 219, 221, 223, 225, 227, 229, 231, 234, 237, + 241, 244, 246, 250, 254, 257, 259, 264, 268, 270, + 273, 275, 286, 298, 308, 318, 327, 339, 348, 354, + 357, 362, 363, 365, 368, 370, 372, 375, 378, 382, + 387, 392, 394, 398, 400, 404, 406, 409, 413, 420, + 428, 431, 433, 435, 438, 441, 445, 449, 453, 457, + 459, 462 }; 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 + 0, 23, 0, 26, 0, 24, 0, 25, 0, 27, + 0, 28, 0, 52, 51, 0, 51, 0, 54, 37, + 56, 38, 0, 54, 37, 38, 0, 3, 21, 4, + 21, 55, 0, 0, 39, 19, 19, 40, 0, 39, + 19, 20, 40, 0, 56, 57, 0, 57, 0, 78, + 0, 62, 0, 63, 0, 41, 0, 29, 0, 30, + 0, 31, 0, 32, 0, 19, 19, 0, 19, 37, + 23, 0, 42, 87, 0, 42, 37, 23, 0, 59, + 60, 0, 60, 59, 0, 60, 0, 59, 0, 0, + 58, 67, 19, 61, 41, 0, 58, 67, 19, 22, + 61, 41, 0, 33, 65, 64, 19, 19, 37, 23, + 19, 37, 23, 41, 0, 33, 65, 64, 19, 19, + 37, 23, 41, 0, 33, 65, 64, 19, 19, 0, + 19, 39, 19, 67, 40, 0, 19, 0, 39, 66, + 40, 0, 0, 19, 43, 66, 0, 19, 0, 68, + 72, 0, 68, 0, 69, 0, 19, 0, 5, 19, + 0, 19, 5, 0, 71, 19, 0, 5, 71, 19, + 0, 71, 19, 5, 0, 70, 69, 0, 21, 69, + 0, 5, 69, 0, 21, 0, 21, 5, 0, 70, + 0, 70, 5, 0, 6, 0, 18, 0, 14, 0, + 15, 0, 13, 0, 16, 0, 17, 0, 11, 0, + 12, 0, 7, 0, 8, 0, 9, 0, 44, 0, + 44, 5, 0, 44, 72, 0, 44, 5, 72, 0, + 19, 75, 0, 75, 0, 58, 19, 75, 0, 19, + 58, 75, 0, 58, 75, 0, 73, 0, 19, 39, + 76, 40, 0, 76, 45, 19, 0, 19, 0, 37, + 23, 0, 41, 0, 35, 65, 74, 67, 19, 39, + 81, 40, 79, 77, 0, 58, 35, 65, 73, 67, + 19, 39, 81, 40, 79, 77, 0, 34, 58, 67, + 19, 39, 81, 40, 79, 77, 0, 58, 34, 67, + 19, 39, 81, 40, 79, 77, 0, 34, 67, 19, + 39, 81, 40, 79, 77, 0, 36, 39, 21, 40, + 67, 19, 39, 81, 40, 79, 77, 0, 58, 67, + 19, 39, 81, 40, 79, 77, 0, 19, 39, 19, + 40, 77, 0, 19, 80, 0, 19, 80, 19, 80, + 0, 0, 87, 0, 37, 23, 0, 6, 0, 19, + 0, 19, 5, 0, 5, 19, 0, 19, 45, 82, + 0, 19, 5, 45, 82, 0, 5, 19, 45, 82, + 0, 82, 0, 83, 45, 10, 0, 83, 0, 83, + 45, 84, 0, 84, 0, 67, 19, 0, 67, 19, + 22, 0, 67, 19, 39, 19, 85, 40, 0, 67, + 19, 22, 39, 19, 85, 40, 0, 85, 86, 0, + 86, 0, 19, 0, 46, 87, 0, 47, 87, 0, + 46, 42, 87, 0, 47, 42, 87, 0, 42, 42, + 87, 0, 48, 42, 87, 0, 20, 0, 49, 20, + 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 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 + 313, 314, 315, 316, 319, 325, 331, 337, 343, 349, + 357, 358, 361, 366, 373, 378, 379, 387, 398, 399, + 402, 403, 404, 405, 408, 409, 410, 411, 414, 427, + 443, 447, 455, 456, 457, 458, 459, 465, 468, 472, + 508, 537, 612, 621, 627, 628, 631, 634, 640, 644, + 651, 654, 657, 661, 665, 669, 674, 682, 686, 691, + 695, 698, 702, 705, 710, 711, 712, 713, 714, 715, + 716, 717, 718, 721, 722, 723, 726, 727, 728, 732, + 739, 751, 757, 769, 781, 784, 790, 795, 798, 803, + 804, 808, 824, 840, 856, 872, 883, 889, 899, 922, + 933, 952, 958, 959, 965, 966, 977, 988, 999, 1009, + 1019, 1029, 1032, 1033, 1036, 1037, 1040, 1043, 1046, 1054, + 1064, 1065, 1068, 1081, 1085, 1089, 1093, 1097, 1101, 1107, + 1108, 1112 }; #endif @@ -398,194 +467,218 @@ 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","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 +"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", +"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", +"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'", +"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes", +"class","classdec","chunk","classcode","thing","scope","destructor","initializer", +"varoptions","variable","argument","argtype","flags","flaglist","type","specifier_list", +"spec_list","specifier","strunionenum","pointer","simplesigtype","fullsigtype", +"sigtype","tokenlist","codenocode","method","returnvals","retcode","funcargs", +"arglist","arglist1","arg","checklist","check","numtok", NULL }; #endif static const short yyr1[] = { 0, 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 + 52, 52, 53, 53, 54, 55, 55, 55, 56, 56, + 57, 57, 57, 57, 58, 58, 58, 58, 59, 59, + 60, 60, 61, 61, 61, 61, 61, 62, 62, 63, + 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, + 68, 68, 68, 68, 68, 68, 68, 69, 69, 69, + 69, 69, 69, 69, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 71, 71, 71, 72, 72, 72, 72, + 73, 73, 74, 74, 74, 74, 75, 76, 76, 77, + 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, + 79, 79, 80, 80, 81, 81, 81, 81, 81, 81, + 81, 81, 82, 82, 83, 83, 84, 84, 84, 84, + 85, 85, 86, 86, 86, 86, 86, 86, 86, 87, + 87, 87 }; static const short yyr2[] = { 0, 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, 4, 3, 5, 0, 4, 4, 2, 1, + 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, 2, 1, + 1, 1, 2, 2, 2, 3, 3, 2, 2, 2, + 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 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 + 4, 0, 1, 2, 1, 1, 2, 2, 3, 4, + 4, 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, 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 + 0, 0, 11, 3, 2, 0, 0, 1, 0, 25, + 26, 27, 28, 46, 0, 46, 0, 14, 24, 0, + 20, 0, 22, 23, 21, 16, 0, 0, 0, 0, + 65, 74, 75, 76, 72, 73, 69, 67, 68, 70, + 71, 66, 52, 61, 0, 0, 50, 51, 63, 0, + 0, 0, 13, 19, 0, 46, 0, 0, 15, 0, + 48, 0, 44, 0, 0, 53, 60, 0, 54, 62, + 59, 0, 0, 77, 49, 64, 58, 55, 0, 0, + 86, 0, 82, 0, 0, 0, 37, 0, 0, 0, + 45, 0, 0, 56, 0, 0, 78, 79, 57, 0, + 0, 0, 81, 0, 85, 0, 0, 0, 0, 0, + 0, 37, 0, 0, 36, 35, 0, 0, 0, 0, + 91, 99, 47, 0, 42, 0, 0, 65, 52, 0, + 0, 112, 114, 116, 80, 89, 0, 84, 83, 0, + 0, 0, 0, 29, 0, 0, 0, 132, 130, 0, + 0, 31, 33, 34, 38, 17, 18, 90, 0, 0, + 0, 53, 54, 0, 117, 102, 0, 87, 0, 0, + 0, 0, 0, 30, 39, 102, 32, 131, 43, 0, + 102, 0, 0, 109, 118, 0, 0, 0, 113, 115, + 88, 0, 0, 102, 0, 0, 0, 41, 0, 111, + 110, 0, 0, 0, 100, 103, 96, 102, 0, 0, + 0, 98, 0, 94, 0, 123, 0, 0, 0, 0, + 0, 122, 104, 0, 0, 102, 95, 102, 0, 0, + 0, 0, 124, 0, 125, 0, 119, 121, 101, 92, + 0, 0, 40, 120, 128, 126, 127, 129, 97, 93, + 0, 0, 0 }; -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 yydefgoto[] = { 261, + 8, 9, 10, 11, 69, 30, 31, 32, 125, 126, + 127, 33, 34, 74, 39, 72, 140, 57, 58, 59, + 60, 85, 91, 92, 93, 147, 132, 35, 198, 215, + 141, 142, 143, 144, 231, 232, 216 }; -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 yypact[] = { 88, + -12,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 88, 347, + -15, 15,-32768, 347, 347, 157, 18, 347, 7,-32768, +-32768,-32768,-32768, 25, 153, 25, 36,-32768,-32768, 175, +-32768, 118,-32768,-32768,-32768, 67, 102, 122, 135, 245, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 22, 313, 262, 144, 131,-32768, 327, 160, + 198, 159,-32768,-32768, 262, 25, 162, 180,-32768, 161, + 171, 178, 164, 181, 341,-32768,-32768, 183,-32768, 341, +-32768, 196, 182, 8,-32768, 341,-32768, 214, 193, 201, +-32768, 262,-32768, 186, 212, 229, 48, 62, 57, 122, +-32768, 236, 246,-32768, 233, 279, 131,-32768,-32768, 243, + 270, 280,-32768, 50,-32768, 287, 262, 277, 50, 262, + -1, 9, 279, -5, 278, 302, 281, 283, 295, 314, +-32768,-32768,-32768, 262, 299, 279, 296, 309, 0, 331, + 311,-32768, 316,-32768,-32768,-32768, 98,-32768,-32768, 324, + 345, 279, 346,-32768, 344, 335, 328,-32768,-32768, 354, + 358,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 339, 357, + 342, 104, 105, 262, 38, 362, 228,-32768, 364, 279, + 348, 349, 352,-32768,-32768, 362,-32768,-32768,-32768, 16, + 362, 262, 262,-32768, 353, 365, 10, 57,-32768,-32768, +-32768, 350, 279, 362, 279, 57, 356,-32768, 57,-32768, +-32768, 366, 109, 363, 369,-32768,-32768, 362, 355, 57, + 359,-32768, 371,-32768, 109,-32768, 360, 43, 53, 361, + 61,-32768,-32768, 10, 57, 362,-32768, 362, 367, 100, + 6, 6,-32768, 6,-32768, 6,-32768,-32768,-32768,-32768, + 57, 57,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 396, 397,-32768 }; static const short yypgoto[] = {-32768, - 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 + 351, 163, 389,-32768,-32768,-32768, 370, -18, 275, 282, + 284,-32768,-32768,-32768, -16, 304, -24,-32768, -38,-32768, + -37, -10, 315,-32768, -36,-32768, -186,-32768, -180, 176, + -119, 4,-32768, 232, 187, -152, -124 }; -#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 +#define YYLAST 412 + + +static const short yytable[] = { 162, + 56, 77, 78, 157, 173, 206, 55, 67, 12, 61, + 209, 217, 107, 158, 159, 81, 171, 154, 17, 222, + 87, 16, 224, 220, 158, 159, 79, 121, 158, 159, + 82, 160, 182, 237, 207, 155, 77, 235, 36, -106, + 95, 77, 90, 161, 174, 37, 214, 77, 250, 96, + 124, 84, 113, 115, 161, 251, 208, 252, 161, 195, + 202, 158, 159, 38, 259, 260, 121, 116, 110, 122, + 112, 158, 159, 108, 62, 148, 196, 149, 248, 226, + 128, 129, 113, 219, 242, 221, 123, 248, 111, 124, + 1, 161, 151, 130, 244, 153, 145, 131, 77, 78, + 247, 161, 227, 243, 245, 68, 228, 229, 230, 169, + 2, 3, 4, 5, 6, 7, 255, 256, 226, 257, + 70, 258, 40, 41, 42, 43, 44, 226, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 178, 54, 254, + 71, 227, 179, -108, -107, 228, 229, 230, 192, 193, + 227, 65, 66, 73, 228, 229, 230, 40, 41, 42, + 43, 44, 83, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 15, 54, 84, 19, 18, 194, 88, 94, + 97, 20, 21, 22, 23, 20, 21, 22, 23, 24, + 25, 26, 27, 19, 28, 210, 211, 29, 98, 103, + 99, 104, 102, 20, 21, 22, 23, 24, 25, 26, + 27, 110, 63, 100, 105, 29, 89, 101, 109, 114, + 106, 20, 21, 22, 23, 117, 20, 21, 22, 23, + 118, 111, 40, 41, 42, 43, 44, 199, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 119, 54, 75, + 41, 42, 43, 44, 134, 45, 46, 47, 48, 49, + 50, 51, 52, 76, 135, 54, 40, 41, 42, 43, + 44, 136, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 111, 54, 137, 138, 42, 43, 44, 146, 45, + 46, 47, 48, 49, 50, 51, 52, 139, 110, 54, + 75, 41, 42, 43, 44, 150, 45, 46, 47, 48, + 49, 50, 51, 52, 172, 152, 54, 80, 41, 124, + 121, 165, 166, 45, 46, 47, 48, 49, 50, 51, + 52, 86, 41, 54, 167, 170, 168, 45, 46, 47, + 48, 49, 50, 51, 52, 75, 41, 54, -105, 175, + 176, 45, 46, 47, 48, 49, 50, 51, 52, 13, + 177, 54, 180, 181, 183, 13, 184, 186, 13, 2, + 3, 4, 5, 6, 7, 185, 187, 188, 189, 190, + 197, 191, 201, 213, 225, 233, 203, 234, 204, 218, + 205, 212, 223, 239, 236, 262, 263, 14, 238, 64, + 164, 241, 246, 133, 0, 156, 163, 253, 200, 249, + 120, 240 }; -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 +static const short yycheck[] = { 124, + 25, 40, 40, 123, 5, 186, 25, 32, 21, 26, + 191, 198, 5, 19, 20, 54, 136, 19, 4, 206, + 59, 37, 209, 204, 19, 20, 5, 19, 19, 20, + 55, 37, 152, 220, 19, 37, 75, 218, 21, 40, + 65, 80, 61, 49, 45, 39, 37, 86, 235, 66, + 42, 44, 89, 90, 49, 236, 41, 238, 49, 22, + 180, 19, 20, 39, 251, 252, 19, 92, 19, 22, + 89, 19, 20, 84, 39, 112, 39, 114, 231, 19, + 19, 20, 119, 203, 42, 205, 39, 240, 39, 42, + 3, 49, 117, 37, 42, 120, 107, 41, 137, 137, + 40, 49, 42, 228, 229, 39, 46, 47, 48, 134, + 23, 24, 25, 26, 27, 28, 241, 242, 19, 244, + 19, 246, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 40, 21, 40, + 19, 42, 45, 40, 40, 46, 47, 48, 45, 45, + 42, 34, 35, 19, 46, 47, 48, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 10, 21, 44, 19, 14, 174, 19, 21, + 19, 29, 30, 31, 32, 29, 30, 31, 32, 33, + 34, 35, 36, 19, 38, 192, 193, 41, 19, 19, + 40, 19, 39, 29, 30, 31, 32, 33, 34, 35, + 36, 19, 38, 43, 19, 41, 19, 40, 5, 19, + 39, 29, 30, 31, 32, 40, 29, 30, 31, 32, + 19, 39, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 19, 21, 5, 6, 7, 8, + 9, 39, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 39, 21, 5, 6, 7, 8, 9, 19, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 19, 21, + 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 39, 21, 5, 6, 42, + 19, 41, 40, 11, 12, 13, 14, 15, 16, 17, + 18, 5, 6, 21, 40, 37, 23, 11, 12, 13, + 14, 15, 16, 17, 18, 5, 6, 21, 40, 19, + 40, 11, 12, 13, 14, 15, 16, 17, 18, 9, + 45, 21, 39, 19, 19, 15, 23, 40, 18, 23, + 24, 25, 26, 27, 28, 41, 23, 20, 40, 23, + 19, 40, 19, 19, 19, 23, 39, 19, 40, 40, + 39, 39, 37, 23, 40, 0, 0, 9, 40, 30, + 126, 42, 42, 100, -1, 122, 125, 41, 177, 234, + 96, 225 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1131,23 +1224,23 @@ yyreduce: switch (yyn) { case 1: -#line 255 "parse.y" +#line 313 "parse.y" { ; ; break;} case 2: -#line 256 "parse.y" +#line 314 "parse.y" { ; ; break;} case 3: -#line 257 "parse.y" +#line 315 "parse.y" { ; ; break;} case 4: -#line 258 "parse.y" +#line 316 "parse.y" { ; ; break;} case 5: -#line 261 "parse.y" +#line 319 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1156,7 +1249,7 @@ case 5: ; break;} case 6: -#line 267 "parse.y" +#line 325 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1165,7 +1258,7 @@ case 6: ; break;} case 7: -#line 273 "parse.y" +#line 331 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1174,7 +1267,7 @@ case 7: ; break;} case 8: -#line 279 "parse.y" +#line 337 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1183,7 +1276,7 @@ case 8: ; break;} case 9: -#line 285 "parse.y" +#line 343 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1192,7 +1285,7 @@ case 9: ; break;} case 10: -#line 291 "parse.y" +#line 349 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1201,15 +1294,15 @@ case 10: ; break;} case 11: -#line 299 "parse.y" +#line 357 "parse.y" { ; ; break;} case 12: -#line 300 "parse.y" +#line 358 "parse.y" { ; ; break;} case 13: -#line 303 "parse.y" +#line 361 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1217,7 +1310,7 @@ case 13: ; break;} case 14: -#line 308 "parse.y" +#line 366 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1225,54 +1318,81 @@ case 14: ; break;} case 15: -#line 315 "parse.y" +#line 373 "parse.y" { - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL); ; break;} -case 16: -#line 320 "parse.y" -{ ; ; - break;} case 17: -#line 321 "parse.y" -{ ; ; +#line 379 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"chunks") == 0) { + chunk_size = g_strdup(yyvsp[0].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 18: -#line 324 "parse.y" -{ ; ; +#line 387 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"chunks") == 0) { + if(atoi(yyvsp[0].id) != 0) + chunk_size = g_strdup(yyvsp[0].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 19: -#line 325 "parse.y" +#line 398 "parse.y" { ; ; break;} case 20: -#line 326 "parse.y" +#line 399 "parse.y" { ; ; break;} case 21: -#line 327 "parse.y" +#line 402 "parse.y" { ; ; break;} case 22: -#line 330 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 403 "parse.y" +{ ; ; break;} case 23: -#line 331 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 404 "parse.y" +{ ; ; break;} case 24: -#line 332 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 405 "parse.y" +{ ; ; break;} case 25: -#line 335 "parse.y" +#line 408 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 26: +#line 409 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 27: +#line 410 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 28: +#line 411 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 29: +#line 414 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); destructor = yyvsp[0].id; - destructor_line = ccode_line; + destructor_line = line_no; destructor_simple = TRUE; } else { g_free(yyvsp[-1].id); @@ -1282,8 +1402,8 @@ case 25: } ; break;} -case 26: -#line 348 "parse.y" +case 30: +#line 427 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1299,58 +1419,58 @@ case 26: } ; break;} -case 27: -#line 364 "parse.y" +case 31: +#line 443 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 368 "parse.y" +case 32: +#line 447 "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" +case 33: +#line 455 "parse.y" { ; ; break;} -case 30: -#line 377 "parse.y" +case 34: +#line 456 "parse.y" { ; ; break;} -case 31: -#line 378 "parse.y" +case 35: +#line 457 "parse.y" { destructor = NULL; ; break;} -case 32: -#line 379 "parse.y" +case 36: +#line 458 "parse.y" { initializer = NULL; ; break;} -case 33: -#line 380 "parse.y" +case 37: +#line 459 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 386 "parse.y" +case 38: +#line 465 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 389 "parse.y" +case 39: +#line 468 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 36: -#line 393 "parse.y" +case 40: +#line 472 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1380,6 +1500,7 @@ case 36: g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL); + g_list_free(yyvsp[-9].list); g_string_free(yyvsp[-1].cbuf,TRUE); g_string_free(yyvsp[-4].cbuf,TRUE); yyerror(_("parse error")); @@ -1387,52 +1508,54 @@ case 36: } ; break;} -case 37: -#line 428 "parse.y" +case 41: +#line 508 "parse.y" { - if(strcmp(yyvsp[-3].id,"get")==0) { + if(strcmp(yyvsp[-3].id, "get") == 0) { Node *node; Type *type = pop_type(); g_free(yyvsp[-3].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 = 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,type,yyvsp[-6].list,yyvsp[-4].id, - NULL,0,(yyvsp[-1].cbuf)->str, + 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); + 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); g_free(yyvsp[-4].id); - g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL); - g_string_free(yyvsp[-1].cbuf,TRUE); + g_list_foreach(yyvsp[-6].list, (GFunc)g_free, NULL); + g_list_free(yyvsp[-6].list); + g_string_free(yyvsp[-1].cbuf, TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 38: -#line 456 "parse.y" +case 42: +#line 537 "parse.y" { Node *node; - char *get, *set; + 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) { + 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); + g_list_free(yyvsp[-3].list); yyerror(_("parse error")); YYERROR; } @@ -1442,24 +1565,30 @@ case 38: var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); if(var->scope == PRIVATE_SCOPE) root = "self->_priv"; - else + else if(var->scope == CLASS_SCOPE) { + root = "SELF_GET_CLASS(self)"; + if(no_self_alias) + print_error(FALSE, + _("Self aliases needed when autolinking to a classwide member"), + yyvsp[-4].line); + } else root = "self"; - if(strcmp(yyvsp[0].id,"link")==0) { + 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) { + } 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) { + } 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)); ", + "gtk_object_ref(GTK_OBJECT(%s->%s));", root, yyvsp[-1].id, root, yyvsp[-1].id, root, yyvsp[-1].id, @@ -1469,8 +1598,11 @@ case 38: g_assert_not_reached(); } - /* get is the same for everything */ - get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); + if(strcmp(yyvsp[0].id, "stringlink")==0) { + get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, yyvsp[-1].id); + } else + /* For everything else, get is just straight assignment */ + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); g_free(yyvsp[0].id); @@ -1484,8 +1616,8 @@ case 38: class_nodes = g_list_append(class_nodes,node); ; break;} -case 39: -#line 521 "parse.y" +case 43: +#line 612 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1496,196 +1628,219 @@ case 39: yyval.id = yyvsp[-4].id; ; break;} -case 40: -#line 530 "parse.y" +case 44: +#line 621 "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 42: -#line 537 "parse.y" -{ yyval.list = NULL; ; - break;} -case 43: -#line 540 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; - break;} -case 44: -#line 543 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; - break;} case 45: -#line 549 "parse.y" -{ ; ; +#line 627 "parse.y" +{ yyval.list = yyvsp[-1].list; ; 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); - ; +#line 628 "parse.y" +{ yyval.list = NULL; ; break;} case 47: -#line 558 "parse.y" +#line 631 "parse.y" { - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 48: -#line 562 "parse.y" +#line 634 "parse.y" { - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 49: -#line 569 "parse.y" +#line 640 "parse.y" { - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 50: -#line 572 "parse.y" +#line 644 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 51: -#line 575 "parse.y" +#line 651 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + yyval.id = yyvsp[0].id; + ; break;} case 52: -#line 578 "parse.y" +#line 654 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 53: -#line 581 "parse.y" +#line 657 "parse.y" { - yyval.id = g_strdup("signed char"); - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 54: -#line 584 "parse.y" +#line 661 "parse.y" { - yyval.id = g_strdup("char"); - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 55: -#line 587 "parse.y" +#line 665 "parse.y" { - yyval.id = g_strdup("double"); - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 56: -#line 590 "parse.y" +#line 669 "parse.y" { - yyval.id = g_strdup("float"); - ; + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 57: -#line 593 "parse.y" +#line 674 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 58: -#line 596 "parse.y" +#line 682 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); - ; + ; break;} case 59: -#line 600 "parse.y" +#line 686 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + ; break;} case 60: -#line 603 "parse.y" +#line 691 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 61: -#line 608 "parse.y" +#line 695 "parse.y" { - yyval.id = "long int"; - ; + yyval.id = yyvsp[0].id; + ; break;} case 62: -#line 611 "parse.y" +#line 698 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 63: -#line 614 "parse.y" +#line 702 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} case 64: -#line 617 "parse.y" +#line 705 "parse.y" { - yyval.id = "short"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} case 65: -#line 620 "parse.y" -{ - yyval.id = "int"; - ; +#line 710 "parse.y" +{ yyval.id = "void"; ; break;} case 66: -#line 625 "parse.y" -{ - yyval.id = "enum "; - ; +#line 711 "parse.y" +{ yyval.id = "char"; ; break;} case 67: -#line 628 "parse.y" -{ - yyval.id = "union "; - ; +#line 712 "parse.y" +{ yyval.id = "short"; ; break;} case 68: -#line 631 "parse.y" -{ - yyval.id = "struct "; - ; +#line 713 "parse.y" +{ yyval.id = "int"; ; break;} case 69: -#line 636 "parse.y" -{ stars++; ; +#line 714 "parse.y" +{ yyval.id = "long"; ; break;} case 70: -#line 637 "parse.y" -{ stars++; ; +#line 715 "parse.y" +{ yyval.id = "float"; ; break;} case 71: -#line 641 "parse.y" +#line 716 "parse.y" +{ yyval.id = "double"; ; + break;} +case 72: +#line 717 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 73: +#line 718 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 74: +#line 721 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 75: +#line 722 "parse.y" +{ yyval.id = "union"; ; + break;} +case 76: +#line 723 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 77: +#line 726 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 78: +#line 727 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 79: +#line 728 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 80: +#line 732 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 81: +#line 739 "parse.y" +{ + if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) + else if(strcmp(yyvsp[-1].id, "last")==0) yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); @@ -1695,14 +1850,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 653 "parse.y" +case 82: +#line 751 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 659 "parse.y" +case 83: +#line 757 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1716,8 +1871,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 671 "parse.y" +case 84: +#line 769 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1731,175 +1886,246 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 683 "parse.y" +case 85: +#line 781 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 686 "parse.y" +case 86: +#line 784 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 692 "parse.y" +case 87: +#line 790 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 78: -#line 697 "parse.y" +case 88: +#line 795 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 79: -#line 700 "parse.y" +case 89: +#line 798 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 80: -#line 705 "parse.y" +case 90: +#line 803 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 706 "parse.y" +case 91: +#line 804 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 710 "parse.y" +case 92: +#line 808 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); YYERROR; } push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 83: -#line 720 "parse.y" +case 93: +#line 824 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); YYERROR; } push_function(the_scope, yyvsp[-7].sigtype, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 730 "parse.y" +case 94: +#line 840 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + yyvsp[0].cbuf, yyvsp[-8].line, ccode_line, vararg, NULL); ; break;} -case 85: -#line 740 "parse.y" +case 95: +#line 856 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 86: -#line 750 "parse.y" +case 96: +#line 872 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 87: -#line 760 "parse.y" +case 97: +#line 883 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-10].line, ccode_line, vararg, NULL); ; break;} -case 88: -#line 766 "parse.y" +case 98: +#line 889 "parse.y" { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 89: -#line 771 "parse.y" +case 99: +#line 899 "parse.y" { - if(strcmp(yyvsp[-4].id,"init")==0) { + 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, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, ccode_line, FALSE, NULL); - } else if(strcmp(yyvsp[-4].id,"class_init")==0) { + } 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, + yyvsp[-4].id, 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); + g_string_free(yyvsp[0].cbuf,TRUE); + yyerror(_("parse error " + "(untyped blocks must be init or " + "class_init)")); + YYERROR; + } + ; + break;} +case 100: +#line 922 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); yyerror(_("parse error")); YYERROR; } + g_free(yyvsp[-1].id); + ; + break;} +case 101: +#line 933 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + onerror = defreturn = NULL; + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-3].id); + g_free(yyvsp[-1].id); ; break;} -case 90: -#line 792 "parse.y" +case 102: +#line 952 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; + break;} +case 103: +#line 958 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 91: -#line 793 "parse.y" +case 104: +#line 959 "parse.y" { - yyval.id = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf,FALSE); + yyval.id = (yyvsp[1].cbuf)->str; + g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 92: -#line 797 "parse.y" -{ yyval.id = NULL; ; - break;} -case 93: -#line 800 "parse.y" +case 105: +#line 965 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 94: -#line 801 "parse.y" +case 106: +#line 966 "parse.y" { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id); + push_self(yyvsp[0].id, FALSE); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -1907,12 +2133,40 @@ case 94: } ; break;} -case 95: -#line 812 "parse.y" +case 107: +#line 977 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[-1].id,"self")==0) + push_self(yyvsp[-1].id, TRUE); + else { + g_free(yyvsp[-1].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 108: +#line 988 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[0].id,"self")==0) + push_self(yyvsp[0].id, TRUE); + else { + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 109: +#line 999 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id); + push_self(yyvsp[-2].id, FALSE); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -1920,40 +2174,66 @@ case 95: } ; break;} -case 96: -#line 822 "parse.y" +case 110: +#line 1009 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-3].id,"self")==0) + push_self(yyvsp[-3].id, TRUE); + else { + g_free(yyvsp[-3].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 111: +#line 1019 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-2].id,"self")==0) + push_self(yyvsp[-2].id, TRUE); + else { + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 112: +#line 1029 "parse.y" { has_self = FALSE; ; break;} -case 97: -#line 825 "parse.y" +case 113: +#line 1032 "parse.y" { vararg = TRUE; ; break;} -case 98: -#line 826 "parse.y" +case 114: +#line 1033 "parse.y" { vararg = FALSE; ; break;} -case 99: -#line 829 "parse.y" +case 115: +#line 1036 "parse.y" { ; ; break;} -case 100: -#line 830 "parse.y" +case 116: +#line 1037 "parse.y" { ; ; break;} -case 101: -#line 833 "parse.y" +case 117: +#line 1040 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 102: -#line 836 "parse.y" +case 118: +#line 1043 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 103: -#line 839 "parse.y" +case 119: +#line 1046 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1963,8 +2243,8 @@ case 103: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 104: -#line 847 "parse.y" +case 120: +#line 1054 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1974,16 +2254,16 @@ case 104: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 105: -#line 857 "parse.y" +case 121: +#line 1064 "parse.y" { ; ; break;} -case 106: -#line 858 "parse.y" +case 122: +#line 1065 "parse.y" { ; ; break;} -case 107: -#line 861 "parse.y" +case 123: +#line 1068 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1998,61 +2278,61 @@ case 107: g_free(yyvsp[0].id); ; break;} -case 108: -#line 874 "parse.y" +case 124: +#line 1081 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 109: -#line 878 "parse.y" +case 125: +#line 1085 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 110: -#line 882 "parse.y" +case 126: +#line 1089 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 111: -#line 886 "parse.y" +case 127: +#line 1093 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 890 "parse.y" +case 128: +#line 1097 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 894 "parse.y" +case 129: +#line 1101 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 900 "parse.y" +case 130: +#line 1107 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 115: -#line 901 "parse.y" +case 131: +#line 1108 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 116: -#line 905 "parse.y" +case 132: +#line 1112 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2277,5 +2557,5 @@ yyerrhandle: } return 1; } -#line 908 "parse.y" +#line 1115 "parse.y"