X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/5b42e9400440d86723a27747b2191ab8cd59c2ee..7c9125f3e75c250e51d5bb9658f730519f103c10:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 3eeb82b..d8e8db7 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" @@ -58,12 +59,14 @@ GList *nodes = NULL; static GList *class_nodes = NULL; Node *class = NULL; +static char *chunk_size = NULL; +static char *bonobo_x_class = NULL; static GList *typestack = NULL; -static int stars = 0; static GList *funcargs = NULL; static GList *checks = NULL; static int has_self = FALSE; static int vararg = FALSE; +static Method *last_added_method = NULL; /* destructor and initializer for variables */ static char *destructor = NULL; @@ -72,6 +75,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 @@ -135,18 +141,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 +164,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)) { - print_error(TRUE, _("The number of GTK arguments and " - "function arguments for a signal " - "don't seem to match"), line_no); + strcmp(gtktypes->next->data, "NONE")==0)) { + error_print(GOB_WARN, line_no, + _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match")); + } + if(g_list_length(gtktypes) > 2) { + GList *li; + for(li = gtktypes->next; li; li = li->next) { + if(strcmp(li->data, "NONE")==0) { + error_print(GOB_ERROR, line_no, + _("NONE can only appear in an " + "argument list by itself")); + } + } } if(cbuf) { char *p; @@ -172,8 +191,11 @@ 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++, + FALSE); + + last_added_method = (Method *)node; if(cbuf) g_string_free(cbuf, @@ -183,9 +205,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 +238,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 +256,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); @@ -234,7 +279,6 @@ 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; @@ -246,15 +290,114 @@ find_var_or_die(const char *id, int line) return var; } - s = g_strdup_printf(_("Variable %s not defined here"), id); - print_error(FALSE, s, line); + error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id); g_assert_not_reached(); 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; +} + +static void +export_accessors (const char *var_name, + const char *get_cbuf, + int get_lineno, + const char *set_cbuf, + int set_lineno, + Type *type, + const char *gtktype, + int lineno) +{ + if (type == NULL) { + char *cast = g_strdup (get_cast (gtktype, FALSE)); + char *p = strchr (cast, ' '); + if (p != NULL) { + *p = '\0'; + p++; + } + /* leak, but we don't really care any more */ + type = (Type *)new_type (cast, + g_strdup (p), + NULL); + } + + if (get_cbuf != NULL) { + char *get_id = g_strdup_printf ("get_%s", var_name); + GString *get_cbuf_copy = g_string_new (get_cbuf); + char *tmp; + Node *node1 = new_type (g_strdup (type->name), + g_strdup (type->pointer), + g_strdup (type->postfix)); + Node *node3 = new_type (g_strdup (class->class.otype), + g_strdup ("*"), + NULL); + + tmp = g_strdup_printf ("\t%s%s ARG;\n", + type->name, + type->pointer ? type->pointer : ""); + get_cbuf_copy = g_string_prepend (get_cbuf_copy, tmp); + g_free (tmp); + + tmp = g_strdup_printf ("\n\t\treturn ARG;\n"); + get_cbuf_copy = g_string_append (get_cbuf_copy, tmp); + g_free (tmp); + + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + get_id, get_cbuf_copy, get_lineno, + lineno, FALSE, NULL); + } + + if (set_cbuf != NULL) { + char *set_id = g_strdup_printf ("set_%s", var_name); + GString *set_cbuf_copy = g_string_new (set_cbuf); + Node *node1 = new_type (g_strdup (type->name), + g_strdup (type->pointer), + g_strdup (type->postfix)); + Node *node2 = new_type (g_strdup ("void"), + NULL, + NULL); + Node *node3 = new_type (g_strdup (class->class.otype), + g_strdup ("*"), + NULL); + + typestack = g_list_prepend (typestack, node2); + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + push_funcarg ("ARG", FALSE); + + typestack = g_list_prepend (typestack, node2); + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + set_id, set_cbuf_copy, set_lineno, + lineno, FALSE, NULL); + } +} + -#line 236 "parse.y" +#line 379 "parse.y" typedef union { char *id; GString *cbuf; @@ -276,20 +419,20 @@ typedef union { -#define YYFINAL 239 +#define YYFINAL 274 #define YYFLAG -32768 #define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 86) +#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 89) 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 +460,90 @@ 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, 51, 57, 60, + 62, 64, 67, 69, 71, 73, 75, 77, 79, 81, + 84, 88, 91, 95, 98, 101, 103, 105, 106, 112, + 119, 132, 142, 149, 153, 154, 160, 162, 166, 167, + 171, 173, 176, 178, 180, 182, 185, 188, 191, 195, + 199, 202, 205, 208, 210, 213, 215, 218, 220, 222, + 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, + 244, 247, 250, 254, 257, 259, 263, 267, 270, 272, + 277, 281, 283, 286, 288, 299, 311, 321, 331, 340, + 352, 361, 367, 370, 375, 376, 378, 381, 383, 385, + 388, 391, 395, 400, 405, 407, 411, 413, 417, 419, + 422, 426, 433, 441, 444, 446, 448, 451, 454, 458, + 462, 466, 470, 472, 475 }; 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, 55, 0, + 39, 19, 20, 40, 55, 0, 56, 57, 0, 57, + 0, 79, 0, 19, 79, 0, 62, 0, 63, 0, + 41, 0, 29, 0, 30, 0, 31, 0, 32, 0, + 19, 19, 0, 19, 37, 23, 0, 42, 88, 0, + 42, 37, 23, 0, 59, 60, 0, 60, 59, 0, + 60, 0, 59, 0, 0, 58, 68, 19, 61, 41, + 0, 58, 68, 19, 22, 61, 41, 0, 33, 66, + 65, 19, 64, 19, 37, 23, 19, 37, 23, 41, + 0, 33, 66, 65, 19, 64, 19, 37, 23, 41, + 0, 33, 66, 65, 19, 64, 19, 0, 39, 19, + 40, 0, 0, 19, 39, 19, 68, 40, 0, 19, + 0, 39, 67, 40, 0, 0, 19, 43, 67, 0, + 19, 0, 69, 73, 0, 69, 0, 70, 0, 19, + 0, 5, 19, 0, 19, 5, 0, 72, 19, 0, + 5, 72, 19, 0, 72, 19, 5, 0, 71, 70, + 0, 21, 70, 0, 5, 70, 0, 21, 0, 21, + 5, 0, 71, 0, 71, 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, 73, 0, 44, + 5, 73, 0, 19, 76, 0, 76, 0, 58, 19, + 76, 0, 19, 58, 76, 0, 58, 76, 0, 74, + 0, 19, 39, 77, 40, 0, 77, 45, 19, 0, + 19, 0, 37, 23, 0, 41, 0, 35, 66, 75, + 68, 19, 39, 82, 40, 80, 78, 0, 58, 35, + 66, 74, 68, 19, 39, 82, 40, 80, 78, 0, + 34, 58, 68, 19, 39, 82, 40, 80, 78, 0, + 58, 34, 68, 19, 39, 82, 40, 80, 78, 0, + 34, 68, 19, 39, 82, 40, 80, 78, 0, 36, + 39, 21, 40, 68, 19, 39, 82, 40, 80, 78, + 0, 58, 68, 19, 39, 82, 40, 80, 78, 0, + 19, 39, 19, 40, 78, 0, 19, 81, 0, 19, + 81, 19, 81, 0, 0, 88, 0, 37, 23, 0, + 6, 0, 19, 0, 19, 5, 0, 5, 19, 0, + 19, 45, 83, 0, 19, 5, 45, 83, 0, 5, + 19, 45, 83, 0, 83, 0, 84, 45, 10, 0, + 84, 0, 84, 45, 85, 0, 85, 0, 68, 19, + 0, 68, 19, 22, 0, 68, 19, 39, 19, 86, + 40, 0, 68, 19, 22, 39, 19, 86, 40, 0, + 86, 87, 0, 87, 0, 19, 0, 46, 88, 0, + 47, 88, 0, 46, 42, 88, 0, 47, 42, 88, + 0, 42, 42, 88, 0, 48, 42, 88, 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 + 397, 398, 399, 400, 403, 409, 415, 421, 427, 433, + 441, 442, 445, 450, 457, 463, 464, 476, 490, 491, + 494, 495, 503, 504, 505, 508, 509, 510, 511, 514, + 527, 543, 547, 555, 556, 557, 558, 559, 565, 568, + 573, 637, 689, 775, 783, 785, 794, 800, 801, 804, + 807, 813, 817, 824, 827, 830, 834, 838, 842, 847, + 855, 859, 864, 868, 871, 875, 878, 883, 884, 885, + 886, 887, 888, 889, 890, 891, 894, 895, 896, 899, + 900, 901, 905, 912, 924, 930, 942, 954, 957, 963, + 968, 971, 976, 977, 981, 997, 1013, 1029, 1045, 1056, + 1062, 1072, 1095, 1106, 1125, 1131, 1132, 1138, 1139, 1150, + 1161, 1172, 1182, 1192, 1202, 1205, 1206, 1209, 1210, 1213, + 1216, 1219, 1227, 1237, 1238, 1241, 1254, 1258, 1262, 1266, + 1270, 1274, 1280, 1281, 1285 }; #endif @@ -398,194 +552,222 @@ 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","classflags","classcode","thing","scope","destructor","initializer", +"varoptions","variable","argument","export","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, 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, 69, 69, 69, 69, 69, 69, 69, + 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 72, 72, 72, 73, + 73, 73, 73, 74, 74, 75, 75, 75, 75, 76, + 77, 77, 78, 78, 79, 79, 79, 79, 79, 79, + 79, 79, 80, 80, 80, 81, 81, 82, 82, 82, + 82, 82, 82, 82, 82, 83, 83, 84, 84, 85, + 85, 85, 85, 86, 86, 87, 87, 87, 87, 87, + 87, 87, 88, 88, 88 }; 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, 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 + 2, 1, 4, 3, 5, 0, 5, 5, 2, 1, + 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, + 3, 2, 3, 2, 2, 1, 1, 0, 5, 6, + 12, 9, 6, 3, 0, 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, 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, 26, + 27, 28, 29, 49, 0, 49, 0, 14, 25, 0, + 20, 0, 23, 24, 21, 16, 0, 0, 0, 22, + 0, 0, 0, 68, 77, 78, 79, 75, 76, 72, + 70, 71, 73, 74, 69, 55, 64, 0, 0, 53, + 54, 66, 0, 0, 0, 13, 19, 0, 49, 0, + 0, 15, 0, 0, 51, 0, 47, 0, 0, 56, + 63, 0, 57, 65, 62, 0, 0, 80, 52, 67, + 61, 58, 0, 0, 89, 0, 85, 0, 0, 0, + 38, 0, 0, 0, 0, 48, 0, 45, 59, 0, + 0, 81, 82, 60, 0, 0, 0, 84, 0, 88, + 0, 0, 0, 0, 0, 0, 38, 0, 0, 37, + 36, 0, 0, 0, 0, 94, 102, 50, 0, 0, + 0, 0, 0, 68, 55, 0, 0, 115, 117, 119, + 83, 92, 0, 87, 86, 0, 0, 0, 0, 30, + 0, 0, 0, 135, 133, 0, 0, 32, 34, 35, + 39, 16, 16, 93, 0, 0, 43, 0, 56, 57, + 0, 120, 105, 0, 90, 0, 0, 0, 0, 0, + 31, 40, 105, 33, 134, 17, 18, 46, 44, 0, + 105, 0, 0, 112, 121, 0, 0, 0, 116, 118, + 91, 0, 0, 105, 0, 0, 0, 0, 114, 113, + 0, 0, 0, 103, 106, 99, 105, 0, 0, 0, + 101, 0, 42, 97, 0, 126, 0, 0, 0, 0, + 0, 125, 107, 0, 0, 105, 98, 105, 0, 0, + 0, 0, 127, 0, 128, 0, 122, 124, 104, 95, + 0, 0, 0, 123, 131, 129, 130, 132, 100, 96, + 41, 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[] = { 272, + 8, 9, 10, 11, 72, 30, 31, 32, 130, 131, + 132, 33, 34, 141, 78, 42, 76, 146, 60, 61, + 62, 63, 89, 95, 96, 97, 153, 137, 35, 208, + 224, 147, 148, 149, 150, 241, 242, 225 }; -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[] = { 175, + 34,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 175, 236, + 47, 104,-32768, 236, 236, 176, 96, 236, 212,-32768, +-32768,-32768,-32768, 107, 158, 107, 109,-32768,-32768, 194, +-32768, 123,-32768,-32768,-32768, 110, 111, 124, 123,-32768, + 135, 136, 278,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 154, 346, 295, 149, 138, +-32768, 360, 161, 162, 163,-32768,-32768, 295, 107, 164, + 166,-32768, 146, 177, 172, 157, 165, 197, 374,-32768, +-32768, 199,-32768, 374,-32768, 200, 181, 2,-32768, 374, +-32768, 216, 226, 203,-32768, 295,-32768, 193, 215, 217, + 57, 74, 37, 198, 135,-32768, 219, 201,-32768, 210, + 312, 138,-32768,-32768, 211, 220, 233,-32768, -2,-32768, + 234, 295, 242, -2, 295, -8, -6, 312, 38, 246, + 235, 257, 265, 275, 299,-32768,-32768,-32768, 295, 313, + 320, 312, 329, 309, 5, 334, 314,-32768, 310,-32768, +-32768,-32768, -20,-32768,-32768, 317, 349, 312, 350,-32768, + 347, 341, 343,-32768,-32768, 361, 373,-32768,-32768,-32768, +-32768, 110, 110,-32768, 354, 356, 362, 357, -18, 81, + 295, 61, 379, 261,-32768, 381, 312, 363, 364, 366, +-32768,-32768, 379,-32768,-32768,-32768,-32768,-32768,-32768, 378, + 379, 295, 295,-32768, 367, 384, 40, 37,-32768,-32768, +-32768, 368, 312, 379, 312, 37, 29, 37,-32768,-32768, + 388, 114, 386, 391,-32768,-32768, 379, 371, 37, 372, +-32768, 376,-32768,-32768, 114,-32768, 375, 46, 62, 377, + 72,-32768,-32768, 40, 37, 379,-32768, 379, 392, 105, + 48, 48,-32768, 48,-32768, 48,-32768,-32768,-32768,-32768, + 37, 37, 380,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 414, 416,-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 + 98, 14, 409,-32768, -67,-32768, 390, -13, 291, 293, + 297,-32768,-32768,-32768,-32768, -22, 321, -24,-32768, -41, +-32768, -40, -79, 325,-32768, -63,-32768, -176, 408, -175, + 184, -123, -140,-32768, 245, 195, -227, -129 }; -#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 430 + + +static const short yytable[] = { 168, + 59, 81, 82, 64, 163, 39, 112, 70, 113, 180, + 160, 58, 126, 258, 74, 85, 115, 216, 178, 185, + 91, -111, 258, 15, 186, 218, 202, 18, 161, 118, + 120, 226, 151, 86, 189, 129, 116, 81, 229, 231, + 204, 234, 81, 99, -109, 88, 100, 232, 81, 181, + 94, 245, 247, 154, 12, 155, 164, 165, 164, 165, + 118, 219, 220, 212, 164, 165, 164, 165, 260, 233, + 261, 121, 262, 135, 166, 126, 223, 136, 127, 117, + 164, 165, 205, 16, 269, 270, 167, 252, 167, 228, + 236, 230, 133, 134, 167, 128, 167, 157, 129, 206, + 159, 81, 82, 254, 196, 197, 13, 17, 253, 255, + 167, 257, 13, 237, 175, 13, 36, 238, 239, 240, + -110, 265, 266, 236, 267, 203, 268, 43, 44, 45, + 46, 47, 236, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 73, 57, 264, 41, 237, 65, 71, 38, + 238, 239, 240, 75, 77, 237, 68, 69, 83, 238, + 239, 240, 43, 44, 45, 46, 47, 87, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 1, 57, 92, + 93, 88, 101, 98, 102, 103, 20, 21, 22, 23, + 20, 21, 22, 23, 19, 104, 106, 2, 3, 4, + 5, 6, 7, 107, 20, 21, 22, 23, 24, 25, + 26, 27, 19, 28, 105, 108, 29, 109, 110, 111, + 114, 119, 20, 21, 22, 23, 24, 25, 26, 27, + 37, 66, 122, 123, 29, 124, 128, 139, 152, 140, + 20, 21, 22, 23, 115, 25, 26, 27, 142, 116, + 38, 115, 156, 126, 20, 21, 22, 23, 2, 3, + 4, 5, 6, 7, 116, 43, 44, 45, 46, 47, + 209, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 158, 57, 79, 44, 45, 46, 47, 129, 48, 49, + 50, 51, 52, 53, 54, 55, 80, 171, 57, 43, + 44, 45, 46, 47, 172, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 173, 57, 143, 144, 45, 46, + 47, 174, 48, 49, 50, 51, 52, 53, 54, 55, + 145, 176, 57, 79, 44, 45, 46, 47, 177, 48, + 49, 50, 51, 52, 53, 54, 55, 179, -108, 57, + 84, 44, 182, 183, 184, 187, 48, 49, 50, 51, + 52, 53, 54, 55, 90, 44, 57, 188, 190, 191, + 48, 49, 50, 51, 52, 53, 54, 55, 79, 44, + 57, 192, 193, 194, 48, 49, 50, 51, 52, 53, + 54, 55, 195, 198, 57, 199, 201, 207, 200, 211, + 217, 213, 222, 214, 215, 221, 235, 227, 243, 244, + 246, 248, 249, 273, 263, 274, 251, 14, 256, 67, + 271, 170, 169, 162, 125, 138, 40, 259, 210, 250 }; -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[] = { 129, + 25, 43, 43, 26, 128, 19, 5, 32, 88, 5, + 19, 25, 19, 241, 39, 57, 19, 193, 142, 40, + 62, 40, 250, 10, 45, 201, 45, 14, 37, 93, + 94, 208, 112, 58, 158, 42, 39, 79, 214, 216, + 181, 218, 84, 68, 40, 44, 69, 19, 90, 45, + 64, 227, 229, 117, 21, 119, 19, 20, 19, 20, + 124, 202, 203, 187, 19, 20, 19, 20, 245, 41, + 246, 96, 248, 37, 37, 19, 37, 41, 22, 93, + 19, 20, 22, 37, 261, 262, 49, 42, 49, 213, + 19, 215, 19, 20, 49, 39, 49, 122, 42, 39, + 125, 143, 143, 42, 172, 173, 9, 4, 238, 239, + 49, 40, 15, 42, 139, 18, 21, 46, 47, 48, + 40, 251, 252, 19, 254, 45, 256, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 19, 21, 40, 39, 42, 39, 39, 39, + 46, 47, 48, 19, 19, 42, 34, 35, 5, 46, + 47, 48, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 3, 21, 19, + 19, 44, 19, 21, 19, 40, 29, 30, 31, 32, + 29, 30, 31, 32, 19, 19, 40, 23, 24, 25, + 26, 27, 28, 39, 29, 30, 31, 32, 33, 34, + 35, 36, 19, 38, 43, 19, 41, 19, 19, 39, + 5, 19, 29, 30, 31, 32, 33, 34, 35, 36, + 19, 38, 40, 19, 41, 19, 39, 19, 19, 39, + 29, 30, 31, 32, 19, 34, 35, 36, 39, 39, + 39, 19, 19, 19, 29, 30, 31, 32, 23, 24, + 25, 26, 27, 28, 39, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 39, 21, 5, 6, 7, 8, 9, 42, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 41, 21, 5, + 6, 7, 8, 9, 40, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 40, 21, 5, 6, 7, 8, + 9, 23, 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, 40, 21, + 5, 6, 19, 40, 45, 39, 11, 12, 13, 14, + 15, 16, 17, 18, 5, 6, 21, 19, 19, 23, + 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, + 21, 41, 40, 23, 11, 12, 13, 14, 15, 16, + 17, 18, 20, 40, 21, 40, 40, 19, 37, 19, + 23, 39, 19, 40, 39, 39, 19, 40, 23, 19, + 40, 40, 37, 0, 23, 0, 42, 9, 42, 30, + 41, 131, 130, 127, 100, 105, 19, 244, 184, 235 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1131,23 +1313,23 @@ yyreduce: switch (yyn) { case 1: -#line 255 "parse.y" +#line 397 "parse.y" { ; ; break;} case 2: -#line 256 "parse.y" +#line 398 "parse.y" { ; ; break;} case 3: -#line 257 "parse.y" +#line 399 "parse.y" { ; ; break;} case 4: -#line 258 "parse.y" +#line 400 "parse.y" { ; ; break;} case 5: -#line 261 "parse.y" +#line 403 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1156,7 +1338,7 @@ case 5: ; break;} case 6: -#line 267 "parse.y" +#line 409 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1165,7 +1347,7 @@ case 6: ; break;} case 7: -#line 273 "parse.y" +#line 415 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1174,7 +1356,7 @@ case 7: ; break;} case 8: -#line 279 "parse.y" +#line 421 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1183,7 +1365,7 @@ case 8: ; break;} case 9: -#line 285 "parse.y" +#line 427 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1192,7 +1374,7 @@ case 9: ; break;} case 10: -#line 291 "parse.y" +#line 433 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1201,15 +1383,15 @@ case 10: ; break;} case 11: -#line 299 "parse.y" +#line 441 "parse.y" { ; ; break;} case 12: -#line 300 "parse.y" +#line 442 "parse.y" { ; ; break;} case 13: -#line 303 "parse.y" +#line 445 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1217,7 +1399,7 @@ case 13: ; break;} case 14: -#line 308 "parse.y" +#line 450 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1225,49 +1407,95 @@ case 14: ; break;} case 15: -#line 315 "parse.y" +#line 457 "parse.y" { - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); + class = new_class (yyvsp[-3].id, yyvsp[-1].id, + bonobo_x_class, chunk_size, NULL); ; break;} -case 16: -#line 320 "parse.y" -{ ; ; - break;} case 17: -#line 321 "parse.y" -{ ; ; +#line 464 "parse.y" +{ + if(strcmp(yyvsp[-3].id,"chunks") == 0) { + g_free (chunk_size); + chunk_size = g_strdup(yyvsp[-2].id); + } else if(strcmp(yyvsp[-3].id,"BonoboX") == 0) { + g_free (bonobo_x_class); + bonobo_x_class = g_strdup(yyvsp[-2].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 18: -#line 324 "parse.y" -{ ; ; +#line 476 "parse.y" +{ + if(strcmp(yyvsp[-3].id,"chunks") == 0) { + g_free (chunk_size); + if(atoi(yyvsp[-2].id) != 0) + chunk_size = g_strdup(yyvsp[-2].id); + else + chunk_size = NULL; + } else { + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 19: -#line 325 "parse.y" +#line 490 "parse.y" { ; ; break;} case 20: -#line 326 "parse.y" +#line 491 "parse.y" { ; ; break;} case 21: -#line 327 "parse.y" +#line 494 "parse.y" { ; ; break;} case 22: -#line 330 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 495 "parse.y" +{ + if (strcmp (yyvsp[-1].id, "BonoboX") != 0) { + g_free(yyvsp[-1].id); + yyerror(_("parse error")); + YYERROR; + } + last_added_method->bonobo_x_func = TRUE; + ; break;} case 23: -#line 331 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 503 "parse.y" +{ ; ; break;} case 24: -#line 332 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 504 "parse.y" +{ ; ; break;} case 25: -#line 335 "parse.y" +#line 505 "parse.y" +{ ; ; + break;} +case 26: +#line 508 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 27: +#line 509 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 28: +#line 510 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 29: +#line 511 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 30: +#line 514 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1282,8 +1510,8 @@ case 25: } ; break;} -case 26: -#line 348 "parse.y" +case 31: +#line 527 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1299,127 +1527,180 @@ case 26: } ; break;} -case 27: -#line 364 "parse.y" +case 32: +#line 543 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 368 "parse.y" +case 33: +#line 547 "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 34: +#line 555 "parse.y" { ; ; break;} -case 30: -#line 377 "parse.y" +case 35: +#line 556 "parse.y" { ; ; break;} -case 31: -#line 378 "parse.y" +case 36: +#line 557 "parse.y" { destructor = NULL; ; break;} -case 32: -#line 379 "parse.y" +case 37: +#line 558 "parse.y" { initializer = NULL; ; break;} -case 33: -#line 380 "parse.y" +case 38: +#line 559 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 386 "parse.y" +case 39: +#line 565 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 389 "parse.y" +case 40: +#line 568 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 36: -#line 393 "parse.y" +case 41: +#line 573 "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,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - yyvsp[-10].line); - g_string_free(yyvsp[-4].cbuf,FALSE); - g_string_free(yyvsp[-1].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id, + (yyvsp[-4].cbuf)->str, yyvsp[-5].line, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + yyvsp[-11].line); + class_nodes = g_list_append(class_nodes,node); + + if (yyvsp[-7].id) { + export_accessors (yyvsp[-8].id, + (yyvsp[-4].cbuf)->str, yyvsp[-5].line, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + type, + yyvsp[-9].id, + yyvsp[-11].line); + g_free (yyvsp[-7].id); + } + + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + } 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,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - yyvsp[-10].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - g_string_free(yyvsp[-4].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + (yyvsp[-4].cbuf)->str,yyvsp[-5].line, + yyvsp[-11].line); + + if (yyvsp[-7].id) { + export_accessors (yyvsp[-8].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + (yyvsp[-4].cbuf)->str, yyvsp[-5].line, + type, + yyvsp[-9].id, + yyvsp[-11].line); + g_free (yyvsp[-7].id); + } + + g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free (yyvsp[-4].cbuf, FALSE); class_nodes = g_list_append(class_nodes,node); } else { - g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL); - g_string_free(yyvsp[-1].cbuf,TRUE); - g_string_free(yyvsp[-4].cbuf,TRUE); - yyerror(_("parse error")); + g_free (yyvsp[-9].id); + g_free (yyvsp[-8].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + g_list_foreach (yyvsp[-10].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-10].list); + g_string_free (yyvsp[-1].cbuf, TRUE); + g_string_free (yyvsp[-4].cbuf, TRUE); + yyerror (_("parse error")); YYERROR; } ; break;} -case 37: -#line 428 "parse.y" +case 42: +#line 637 "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) { + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + NULL, 0, + yyvsp[-8].line); + if (yyvsp[-4].id) { + export_accessors (yyvsp[-5].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + NULL, 0, + type, + yyvsp[-6].id, + yyvsp[-8].line); + g_free (yyvsp[-4].id); + } + + 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, - yyvsp[-2].line, yyvsp[-7].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - class_nodes = g_list_append(class_nodes,node); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id, + NULL, 0, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + yyvsp[-8].line); + if (yyvsp[-4].id) { + export_accessors (yyvsp[-5].id, + NULL, 0, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + type, + yyvsp[-6].id, + yyvsp[-8].line); + g_free (yyvsp[-4].id); + } + + 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_free (yyvsp[-3].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-5].id); + g_list_foreach (yyvsp[-7].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-7].list); + g_string_free (yyvsp[-1].cbuf, TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 38: -#line 456 "parse.y" +case 43: +#line 689 "parse.y" { Node *node; char *get, *set = NULL; @@ -1427,65 +1708,101 @@ case 38: 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); + 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[-3].id); + g_free(yyvsp[-2].id); + g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL); + g_list_free(yyvsp[-4].list); yyerror(_("parse error")); YYERROR; } type = pop_type(); - var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); + var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].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) + error_print(GOB_ERROR, yyvsp[-5].line, + _("Self aliases needed when autolinking to a classwide member")); + } 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) { + root, yyvsp[-2].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) { + root, yyvsp[-2].id, + root, yyvsp[-2].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); + "if (ARG != NULL) " + "gtk_object_ref (GTK_OBJECT (ARG)); " + "if (%s->%s != NULL) " + "gtk_object_unref (GTK_OBJECT (%s->%s)); " + "%s->%s = ARG;", + root, yyvsp[-2].id, + root, yyvsp[-2].id, + root, yyvsp[-2].id); } else { 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[-2].id); + } else { + /* For everything else, get is just straight assignment */ + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-2].id); + } - g_free(yyvsp[0].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); + node = new_argument (yyvsp[-3].id, type, yyvsp[-4].list, + yyvsp[-2].id, + get, yyvsp[-5].line, + set, yyvsp[-5].line, + yyvsp[-5].line); + if (yyvsp[-1].id) { + export_accessors (yyvsp[-2].id, + get, yyvsp[-5].line, + set, yyvsp[-5].line, + type, + yyvsp[-3].id, + yyvsp[-5].line); + g_free (yyvsp[-1].id); + } + class_nodes = g_list_append(class_nodes,node); ; break;} -case 39: -#line 521 "parse.y" +case 44: +#line 775 "parse.y" +{ + if (strcmp (yyvsp[-1].id, "export")!=0) { + g_free (yyvsp[-1].id); + yyerror (_("parse error")); + YYERROR; + } + yyval.id = yyvsp[-1].id; + ; + break;} +case 45: +#line 783 "parse.y" +{ yyval.id = NULL; ; + break;} +case 46: +#line 785 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1496,196 +1813,219 @@ case 39: yyval.id = yyvsp[-4].id; ; break;} -case 40: -#line 530 "parse.y" +case 47: +#line 794 "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" -{ ; ; - break;} -case 46: -#line 550 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; - break;} -case 47: -#line 558 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; - break;} case 48: -#line 562 "parse.y" -{ - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; +#line 800 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 49: -#line 569 "parse.y" -{ - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; +#line 801 "parse.y" +{ yyval.list = NULL; ; break;} case 50: -#line 572 "parse.y" +#line 804 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 51: -#line 575 "parse.y" +#line 807 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 52: -#line 578 "parse.y" +#line 813 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 53: -#line 581 "parse.y" +#line 817 "parse.y" { - yyval.id = g_strdup("signed char"); - ; + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 54: -#line 584 "parse.y" +#line 824 "parse.y" { - yyval.id = g_strdup("char"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 55: -#line 587 "parse.y" +#line 827 "parse.y" { - yyval.id = g_strdup("double"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 56: -#line 590 "parse.y" +#line 830 "parse.y" { - yyval.id = g_strdup("float"); - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 57: -#line 593 "parse.y" +#line 834 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 58: -#line 596 "parse.y" +#line 838 "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 842 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 60: -#line 603 "parse.y" +#line 847 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 61: -#line 608 "parse.y" +#line 855 "parse.y" { - yyval.id = "long int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 62: -#line 611 "parse.y" +#line 859 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + ; break;} case 63: -#line 614 "parse.y" +#line 864 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 64: -#line 617 "parse.y" +#line 868 "parse.y" { - yyval.id = "short"; - ; + yyval.id = yyvsp[0].id; + ; break;} case 65: -#line 620 "parse.y" +#line 871 "parse.y" { - yyval.id = "int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 66: -#line 625 "parse.y" +#line 875 "parse.y" { - yyval.id = "enum "; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} case 67: -#line 628 "parse.y" +#line 878 "parse.y" { - yyval.id = "union "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} case 68: -#line 631 "parse.y" -{ - yyval.id = "struct "; - ; +#line 883 "parse.y" +{ yyval.id = "void"; ; break;} case 69: -#line 636 "parse.y" -{ stars++; ; +#line 884 "parse.y" +{ yyval.id = "char"; ; break;} case 70: -#line 637 "parse.y" -{ stars++; ; +#line 885 "parse.y" +{ yyval.id = "short"; ; break;} case 71: -#line 641 "parse.y" +#line 886 "parse.y" +{ yyval.id = "int"; ; + break;} +case 72: +#line 887 "parse.y" +{ yyval.id = "long"; ; + break;} +case 73: +#line 888 "parse.y" +{ yyval.id = "float"; ; + break;} +case 74: +#line 889 "parse.y" +{ yyval.id = "double"; ; + break;} +case 75: +#line 890 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 76: +#line 891 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 77: +#line 894 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 78: +#line 895 "parse.y" +{ yyval.id = "union"; ; + break;} +case 79: +#line 896 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 80: +#line 899 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 81: +#line 900 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 82: +#line 901 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 83: +#line 905 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 84: +#line 912 "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 +2035,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 653 "parse.y" +case 85: +#line 924 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 659 "parse.y" +case 86: +#line 930 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1716,8 +2056,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 671 "parse.y" +case 87: +#line 942 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1731,175 +2071,246 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 683 "parse.y" +case 88: +#line 954 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 686 "parse.y" +case 89: +#line 957 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 692 "parse.y" +case 90: +#line 963 "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 91: +#line 968 "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 92: +#line 971 "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 93: +#line 976 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 706 "parse.y" +case 94: +#line 977 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 710 "parse.y" +case 95: +#line 981 "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 96: +#line 997 "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 97: +#line 1013 "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 98: +#line 1029 "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 99: +#line 1045 "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 100: +#line 1056 "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 101: +#line 1062 "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 102: +#line 1072 "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 103: +#line 1095 "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 104: +#line 1106 "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 105: +#line 1125 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; + break;} +case 106: +#line 1131 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 91: -#line 793 "parse.y" +case 107: +#line 1132 "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 108: +#line 1138 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 94: -#line 801 "parse.y" +case 109: +#line 1139 "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 +2318,40 @@ case 94: } ; break;} -case 95: -#line 812 "parse.y" +case 110: +#line 1150 "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 111: +#line 1161 "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 112: +#line 1172 "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 +2359,66 @@ case 95: } ; break;} -case 96: -#line 822 "parse.y" +case 113: +#line 1182 "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 114: +#line 1192 "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 115: +#line 1202 "parse.y" { has_self = FALSE; ; break;} -case 97: -#line 825 "parse.y" +case 116: +#line 1205 "parse.y" { vararg = TRUE; ; break;} -case 98: -#line 826 "parse.y" +case 117: +#line 1206 "parse.y" { vararg = FALSE; ; break;} -case 99: -#line 829 "parse.y" +case 118: +#line 1209 "parse.y" { ; ; break;} -case 100: -#line 830 "parse.y" +case 119: +#line 1210 "parse.y" { ; ; break;} -case 101: -#line 833 "parse.y" +case 120: +#line 1213 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 102: -#line 836 "parse.y" +case 121: +#line 1216 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 103: -#line 839 "parse.y" +case 122: +#line 1219 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1963,8 +2428,8 @@ case 103: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 104: -#line 847 "parse.y" +case 123: +#line 1227 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1974,16 +2439,16 @@ case 104: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 105: -#line 857 "parse.y" +case 124: +#line 1237 "parse.y" { ; ; break;} -case 106: -#line 858 "parse.y" +case 125: +#line 1238 "parse.y" { ; ; break;} -case 107: -#line 861 "parse.y" +case 126: +#line 1241 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1998,61 +2463,61 @@ case 107: g_free(yyvsp[0].id); ; break;} -case 108: -#line 874 "parse.y" +case 127: +#line 1254 "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 128: +#line 1258 "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 129: +#line 1262 "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 130: +#line 1266 "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 131: +#line 1270 "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 132: +#line 1274 "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 133: +#line 1280 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 115: -#line 901 "parse.y" +case 134: +#line 1281 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 116: -#line 905 "parse.y" +case 135: +#line 1285 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2277,5 +2742,5 @@ yyerrhandle: } return 1; } -#line 908 "parse.y" +#line 1288 "parse.y"