X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/7231d76fbf4ae0b501af648e1216b88714aa7353..489e97ede850a8de01ca3bd653dce9c25dcd54a1:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 8a806d8..948309f 100644 --- a/src/parse.c +++ b/src/parse.c @@ -46,13 +46,14 @@ #define MAXIMUM 296 #define MINIMUM 297 #define DEFAULT_VALUE 298 -#define FLAGS 299 -#define TYPE 300 -#define FLAGS_TYPE 301 -#define ENUM_TYPE 302 -#define PARAM_TYPE 303 -#define BOXED_TYPE 304 -#define OBJECT_TYPE 305 +#define ERROR 299 +#define FLAGS 300 +#define TYPE 301 +#define FLAGS_TYPE 302 +#define ENUM_TYPE 303 +#define PARAM_TYPE 304 +#define BOXED_TYPE 305 +#define OBJECT_TYPE 306 #line 22 "parse.y" @@ -67,15 +68,21 @@ #include "main.h" #include "util.h" +/* FIXME: add gettext support */ #define _(x) (x) GList *nodes = NULL; static GList *class_nodes = NULL; Node *class = NULL; +GList *enums = NULL; +static GList *enum_vals = NULL; +static GList *flag_vals = NULL; +static GList *error_vals = NULL; static char *chunk_size = NULL; -static char *bonobo_x_class = NULL; +static char *bonobo_object_class = NULL; +static GList *interfaces = NULL; static GList *typestack = NULL; static GList *funcargs = NULL; static GList *checks = NULL; @@ -379,8 +386,8 @@ set_return_value(char *type, char *val) static void export_accessors (const char *var_name, gboolean do_get, - gboolean do_set, int get_lineno, + gboolean do_set, int set_lineno, Type *type, const char *gtktype, @@ -468,6 +475,28 @@ export_accessors (const char *var_name, node_free ((Node *)the_type); } +static char * +get_prop_enum_flag_cast (Property *prop) +{ + char *tmp, *ret; + if (prop->extra_gtktype == NULL || + /* HACK! just in case someone made this + * work with 2.0.0 by using the TYPE + * macro directly */ + ((strstr (prop->extra_gtktype, "_TYPE_") != NULL || + strstr (prop->extra_gtktype, "TYPE_") == prop->extra_gtktype) && + strchr (prop->extra_gtktype, ':') == NULL)) { + if (prop->ptype != NULL) + return get_type (prop->ptype, TRUE); + else + return g_strdup (""); + } + tmp = remove_sep (prop->extra_gtktype); + ret = g_strdup_printf ("(%s) ", tmp); + g_free (tmp); + return ret; +} + static void property_link_and_export (Node *node) { @@ -498,30 +527,32 @@ property_link_and_export (Node *node) } if (strcmp (prop->gtktype, "STRING") == 0) { - set = g_strdup_printf("g_free (%s->%s); " - "%s->%s = g_value_dup_string (VAL);", + set = g_strdup_printf("{ char *old = %s->%s; " + "%s->%s = g_value_dup_string (VAL); g_free (old); }", root, prop->name, root, prop->name); get = g_strdup_printf("g_value_set_string (VAL, %s->%s);", root, prop->name); } else if (strcmp (prop->gtktype, "OBJECT") == 0) { - set = g_strdup_printf("{ GtkObject *___old = (GtkObject *)%s->%s; " - "GtkObject *___new = (GtkObject *)gtk_value_get_object (VAL); " - "if (___new != NULL) { " - "gtk_object_ref (GTK_OBJECT (___new)); " - "%s->%s = GTK_OBJECT (___new); " - "} else { " - "%s->%s = NULL; " - "} " + char *cast; + if (prop->extra_gtktype != NULL) { + cast = remove_sep (prop->extra_gtktype); + } else { + cast = "void"; + } + set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; " + "%s->%s = (%s *)g_value_dup_object (VAL); " "if (___old != NULL) { " - "gtk_object_unref (GTK_OBJECT (___old)); " + "g_object_unref (G_OBJECT (___old)); " "} " "}", root, prop->name, root, prop->name, - root, prop->name); - get = g_strdup_printf("g_value_set_object (VAL, %s->%s);", - root, prop->name); + cast); + get = g_strdup_printf ("g_value_set_object (VAL, " + "(gpointer)%s->%s);", + root, prop->name); + g_free (cast); } else if (strcmp (prop->gtktype, "BOXED") == 0) { if (prop->extra_gtktype == NULL) { error_print (GOB_ERROR, prop->line_no, @@ -529,7 +560,7 @@ property_link_and_export (Node *node) "boxed_type not set")); } set = g_strdup_printf("{ gpointer ___old = (gpointer)%s->%s; " - "gpointer ___new = (gpointer)gtk_value_get_boxed (VAL); " + "gpointer ___new = (gpointer)g_value_get_boxed (VAL); " "if (___new != ___old) { " "if (___old != NULL) g_boxed_free (%s, ___old); " "if (___new != NULL) %s->%s = g_boxed_copy (%s, ___new); " @@ -546,20 +577,36 @@ property_link_and_export (Node *node) } else { char *set_func; char *get_func; + const char *getcast = ""; + const char *setcast = ""; + char *to_free = NULL; set_func = g_strdup_printf ("g_value_set_%s", prop->gtktype); g_strdown (set_func); get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype); g_strdown (get_func); - set = g_strdup_printf("%s->%s = %s (VAL);", + if (strcmp (prop->gtktype, "FLAGS") == 0) { + setcast = "(guint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } else if (strcmp (prop->gtktype, "ENUM") == 0) { + setcast = "(gint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } + + set = g_strdup_printf("%s->%s = %s%s (VAL);", root, prop->name, + getcast, get_func); - get = g_strdup_printf("%s (VAL, %s->%s);", + get = g_strdup_printf("%s (VAL, %s%s->%s);", set_func, + setcast, root, prop->name); g_free (get_func); g_free (set_func); + g_free (to_free); } node_set (node, @@ -573,7 +620,7 @@ property_link_and_export (Node *node) if (prop->export) { export_accessors (prop->name, prop->get != NULL, prop->get_line, - prop->set != NULL, prop->get_line, + prop->set != NULL, prop->set_line, prop->ptype, prop->gtktype, prop->line_no); @@ -602,7 +649,7 @@ ensure_property (void) } -#line 570 "parse.y" +#line 616 "parse.y" typedef union { char *id; GString *cbuf; @@ -624,26 +671,26 @@ typedef union { -#define YYFINAL 340 +#define YYFINAL 398 #define YYFLAG -32768 -#define YYNTBASE 65 +#define YYNTBASE 66 -#define YYTRANSLATE(x) ((unsigned)(x) <= 305 ? yytranslate[x] : 110) +#define YYTRANSLATE(x) ((unsigned)(x) <= 306 ? yytranslate[x] : 118) 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, 63, 2, 2, 2, 2, 2, 2, 54, - 55, 60, 2, 58, 64, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 56, 62, - 57, 61, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 64, 2, 2, 2, 2, 2, 2, 55, + 56, 61, 2, 59, 65, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 57, 63, + 58, 62, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 52, 59, 53, 2, 2, 2, 2, 2, + 2, 2, 53, 60, 54, 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, @@ -661,112 +708,128 @@ static const char yytranslate[] = { 0, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51 + 47, 48, 49, 50, 51, 52 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, - 24, 27, 29, 34, 38, 44, 45, 51, 57, 60, - 62, 64, 67, 69, 71, 73, 75, 77, 79, 81, - 83, 86, 90, 93, 97, 100, 103, 105, 107, 108, - 114, 121, 134, 144, 151, 155, 156, 168, 177, 183, - 187, 188, 192, 194, 196, 201, 203, 205, 209, 213, - 217, 221, 225, 229, 233, 237, 241, 245, 249, 253, - 255, 261, 263, 267, 268, 272, 274, 277, 279, 281, - 283, 286, 289, 292, 296, 300, 303, 306, 309, 311, - 314, 316, 319, 321, 323, 325, 327, 329, 331, 333, - 335, 337, 339, 341, 343, 345, 348, 351, 355, 358, - 360, 364, 368, 371, 373, 378, 382, 384, 387, 389, - 400, 412, 422, 432, 441, 453, 462, 468, 471, 476, - 477, 479, 482, 484, 486, 489, 492, 496, 501, 506, - 508, 512, 514, 518, 520, 523, 527, 534, 542, 545, - 547, 549, 552, 555, 559, 563, 567, 571, 573, 576, - 578 + 24, 27, 30, 33, 36, 38, 40, 42, 44, 49, + 53, 59, 60, 66, 72, 78, 81, 83, 85, 88, + 92, 94, 96, 98, 100, 102, 104, 106, 108, 111, + 115, 118, 122, 125, 128, 130, 132, 133, 139, 146, + 159, 169, 176, 180, 181, 193, 202, 208, 212, 213, + 217, 219, 221, 226, 228, 230, 234, 238, 242, 246, + 250, 254, 258, 262, 266, 270, 274, 278, 282, 286, + 290, 294, 298, 300, 306, 308, 312, 313, 317, 319, + 322, 324, 326, 328, 331, 334, 337, 341, 345, 348, + 351, 354, 356, 359, 361, 364, 366, 368, 370, 372, + 374, 376, 378, 380, 382, 384, 386, 388, 390, 393, + 396, 400, 403, 405, 409, 413, 416, 418, 423, 427, + 429, 432, 434, 445, 457, 467, 477, 486, 498, 507, + 513, 516, 521, 522, 524, 527, 529, 531, 534, 537, + 541, 546, 551, 553, 557, 559, 563, 565, 568, 572, + 579, 587, 590, 592, 594, 597, 600, 604, 608, 612, + 616, 624, 633, 637, 639, 643, 645, 653, 662, 666, + 668, 676, 685, 689, 691, 693, 696, 698 }; -static const short yyrhs[] = { 67, - 68, 67, 0, 68, 67, 0, 67, 68, 0, 68, +static const short yyrhs[] = { 68, + 69, 68, 0, 69, 68, 0, 68, 69, 0, 69, 0, 24, 0, 27, 0, 25, 0, 26, 0, 28, - 0, 29, 0, 67, 66, 0, 66, 0, 69, 52, - 71, 53, 0, 69, 52, 53, 0, 3, 21, 4, - 21, 70, 0, 0, 54, 19, 19, 55, 70, 0, - 54, 19, 20, 55, 70, 0, 71, 72, 0, 72, - 0, 100, 0, 19, 100, 0, 77, 0, 78, 0, - 80, 0, 56, 0, 31, 0, 32, 0, 33, 0, - 34, 0, 19, 19, 0, 19, 52, 24, 0, 57, - 109, 0, 57, 52, 24, 0, 74, 75, 0, 75, - 74, 0, 75, 0, 74, 0, 0, 73, 89, 19, - 76, 56, 0, 73, 89, 19, 22, 76, 56, 0, - 36, 87, 86, 19, 79, 19, 52, 24, 19, 52, - 24, 56, 0, 36, 87, 86, 19, 79, 19, 52, - 24, 56, 0, 36, 87, 86, 19, 79, 19, 0, - 54, 19, 55, 0, 0, 35, 19, 19, 81, 19, - 52, 24, 19, 52, 24, 56, 0, 35, 19, 19, - 81, 19, 52, 24, 56, 0, 35, 19, 19, 81, - 56, 0, 54, 82, 55, 0, 0, 82, 58, 85, - 0, 85, 0, 30, 0, 19, 54, 30, 55, 0, - 109, 0, 83, 0, 40, 57, 83, 0, 41, 57, - 83, 0, 42, 57, 109, 0, 43, 57, 109, 0, - 44, 57, 84, 0, 45, 57, 88, 0, 46, 57, - 89, 0, 47, 57, 19, 0, 48, 57, 19, 0, - 49, 57, 19, 0, 50, 57, 19, 0, 51, 57, - 19, 0, 19, 0, 19, 54, 19, 89, 55, 0, - 19, 0, 54, 88, 55, 0, 0, 19, 59, 88, - 0, 19, 0, 90, 94, 0, 90, 0, 91, 0, - 19, 0, 5, 19, 0, 19, 5, 0, 93, 19, - 0, 5, 93, 19, 0, 93, 19, 5, 0, 92, - 91, 0, 21, 91, 0, 5, 91, 0, 21, 0, - 21, 5, 0, 92, 0, 92, 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, 60, 0, 60, 5, 0, 60, 94, 0, - 60, 5, 94, 0, 19, 97, 0, 97, 0, 73, - 19, 97, 0, 19, 73, 97, 0, 73, 97, 0, - 95, 0, 19, 54, 98, 55, 0, 98, 58, 19, - 0, 19, 0, 52, 24, 0, 56, 0, 38, 87, - 96, 89, 19, 54, 103, 55, 101, 99, 0, 73, - 38, 87, 95, 89, 19, 54, 103, 55, 101, 99, - 0, 37, 73, 89, 19, 54, 103, 55, 101, 99, - 0, 73, 37, 89, 19, 54, 103, 55, 101, 99, - 0, 37, 89, 19, 54, 103, 55, 101, 99, 0, - 39, 54, 21, 55, 89, 19, 54, 103, 55, 101, - 99, 0, 73, 89, 19, 54, 103, 55, 101, 99, - 0, 19, 54, 19, 55, 99, 0, 19, 102, 0, - 19, 102, 19, 102, 0, 0, 109, 0, 52, 24, - 0, 6, 0, 19, 0, 19, 5, 0, 5, 19, - 0, 19, 58, 104, 0, 19, 5, 58, 104, 0, - 5, 19, 58, 104, 0, 104, 0, 105, 58, 10, - 0, 105, 0, 105, 58, 106, 0, 106, 0, 89, - 19, 0, 89, 19, 22, 0, 89, 19, 54, 19, - 107, 55, 0, 89, 19, 22, 54, 19, 107, 55, - 0, 107, 108, 0, 108, 0, 19, 0, 61, 109, - 0, 62, 109, 0, 61, 57, 109, 0, 62, 57, - 109, 0, 57, 57, 109, 0, 63, 57, 109, 0, - 20, 0, 64, 20, 0, 23, 0, 19, 0 + 0, 29, 0, 68, 67, 0, 68, 110, 0, 68, + 113, 0, 68, 115, 0, 67, 0, 110, 0, 113, + 0, 115, 0, 70, 53, 72, 54, 0, 70, 53, + 54, 0, 3, 21, 4, 21, 71, 0, 0, 55, + 19, 19, 56, 71, 0, 55, 19, 21, 56, 71, + 0, 55, 19, 20, 56, 71, 0, 72, 73, 0, + 73, 0, 101, 0, 19, 101, 0, 19, 21, 101, + 0, 78, 0, 79, 0, 81, 0, 57, 0, 31, + 0, 32, 0, 33, 0, 34, 0, 19, 19, 0, + 19, 53, 24, 0, 58, 117, 0, 58, 53, 24, + 0, 75, 76, 0, 76, 75, 0, 76, 0, 75, + 0, 0, 74, 90, 19, 77, 57, 0, 74, 90, + 19, 22, 77, 57, 0, 36, 88, 87, 19, 80, + 19, 53, 24, 19, 53, 24, 57, 0, 36, 88, + 87, 19, 80, 19, 53, 24, 57, 0, 36, 88, + 87, 19, 80, 19, 0, 55, 19, 56, 0, 0, + 35, 19, 19, 82, 19, 53, 24, 19, 53, 24, + 57, 0, 35, 19, 19, 82, 19, 53, 24, 57, + 0, 35, 19, 19, 82, 57, 0, 55, 83, 56, + 0, 0, 83, 59, 86, 0, 86, 0, 30, 0, + 19, 55, 30, 56, 0, 117, 0, 84, 0, 40, + 58, 84, 0, 41, 58, 84, 0, 42, 58, 117, + 0, 43, 58, 117, 0, 44, 58, 85, 0, 46, + 58, 89, 0, 47, 58, 90, 0, 48, 58, 21, + 0, 48, 58, 19, 0, 49, 58, 21, 0, 49, + 58, 19, 0, 50, 58, 21, 0, 50, 58, 19, + 0, 51, 58, 21, 0, 51, 58, 19, 0, 52, + 58, 21, 0, 52, 58, 19, 0, 19, 0, 19, + 55, 19, 90, 56, 0, 19, 0, 55, 89, 56, + 0, 0, 19, 60, 89, 0, 19, 0, 91, 95, + 0, 91, 0, 92, 0, 19, 0, 5, 19, 0, + 19, 5, 0, 94, 19, 0, 5, 94, 19, 0, + 94, 19, 5, 0, 93, 92, 0, 21, 92, 0, + 5, 92, 0, 21, 0, 21, 5, 0, 93, 0, + 93, 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, 61, 0, 61, + 5, 0, 61, 95, 0, 61, 5, 95, 0, 19, + 98, 0, 98, 0, 74, 19, 98, 0, 19, 74, + 98, 0, 74, 98, 0, 96, 0, 19, 55, 99, + 56, 0, 99, 59, 19, 0, 19, 0, 53, 24, + 0, 57, 0, 38, 88, 97, 90, 19, 55, 104, + 56, 102, 100, 0, 74, 38, 88, 96, 90, 19, + 55, 104, 56, 102, 100, 0, 37, 74, 90, 19, + 55, 104, 56, 102, 100, 0, 74, 37, 90, 19, + 55, 104, 56, 102, 100, 0, 37, 90, 19, 55, + 104, 56, 102, 100, 0, 39, 55, 21, 56, 90, + 19, 55, 104, 56, 102, 100, 0, 74, 90, 19, + 55, 104, 56, 102, 100, 0, 19, 55, 19, 56, + 100, 0, 19, 103, 0, 19, 103, 19, 103, 0, + 0, 117, 0, 53, 24, 0, 6, 0, 19, 0, + 19, 5, 0, 5, 19, 0, 19, 59, 105, 0, + 19, 5, 59, 105, 0, 5, 19, 59, 105, 0, + 105, 0, 106, 59, 10, 0, 106, 0, 106, 59, + 107, 0, 107, 0, 90, 19, 0, 90, 19, 22, + 0, 90, 19, 55, 19, 108, 56, 0, 90, 19, + 22, 55, 19, 108, 56, 0, 108, 109, 0, 109, + 0, 19, 0, 62, 117, 0, 63, 117, 0, 62, + 58, 117, 0, 63, 58, 117, 0, 58, 58, 117, + 0, 64, 58, 117, 0, 9, 19, 53, 111, 54, + 21, 57, 0, 9, 19, 53, 111, 59, 54, 21, + 57, 0, 111, 59, 112, 0, 112, 0, 19, 58, + 117, 0, 19, 0, 46, 19, 53, 114, 54, 21, + 57, 0, 46, 19, 53, 114, 59, 54, 21, 57, + 0, 114, 59, 19, 0, 19, 0, 45, 19, 53, + 116, 54, 21, 57, 0, 45, 19, 53, 116, 59, + 54, 21, 57, 0, 116, 59, 19, 0, 19, 0, + 20, 0, 65, 20, 0, 23, 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 591, 592, 593, 594, 597, 606, 615, 624, 633, 642, - 653, 654, 657, 662, 669, 679, 680, 692, 706, 707, - 710, 711, 719, 720, 721, 722, 725, 726, 727, 728, - 731, 751, 775, 779, 787, 788, 789, 790, 791, 797, - 800, 805, 873, 927, 1015, 1023, 1028, 1076, 1112, 1128, - 1129, 1132, 1133, 1136, 1137, 1149, 1150, 1153, 1159, 1165, - 1171, 1177, 1183, 1189, 1196, 1202, 1208, 1214, 1220, 1226, - 1246, 1255, 1261, 1262, 1265, 1268, 1274, 1281, 1290, 1293, - 1296, 1300, 1304, 1308, 1313, 1321, 1325, 1330, 1334, 1337, - 1341, 1344, 1349, 1350, 1351, 1352, 1353, 1354, 1355, 1356, - 1357, 1360, 1361, 1362, 1365, 1366, 1367, 1371, 1378, 1390, - 1396, 1408, 1420, 1423, 1429, 1434, 1437, 1442, 1443, 1447, - 1463, 1479, 1495, 1511, 1522, 1528, 1538, 1561, 1572, 1591, - 1597, 1598, 1604, 1605, 1616, 1627, 1638, 1648, 1658, 1668, - 1671, 1672, 1675, 1676, 1679, 1682, 1685, 1693, 1703, 1704, - 1707, 1724, 1731, 1738, 1745, 1752, 1759, 1768, 1769, 1773, - 1774 + 637, 638, 639, 640, 643, 652, 661, 670, 679, 688, + 699, 700, 701, 702, 703, 704, 705, 706, 709, 714, + 721, 735, 736, 748, 757, 771, 772, 775, 776, 785, + 797, 798, 799, 800, 803, 804, 805, 806, 809, 829, + 853, 857, 865, 866, 867, 868, 869, 875, 878, 883, + 951, 1005, 1093, 1101, 1106, 1154, 1190, 1206, 1207, 1210, + 1211, 1214, 1215, 1227, 1228, 1231, 1237, 1243, 1249, 1255, + 1261, 1267, 1274, 1280, 1286, 1292, 1298, 1304, 1310, 1316, + 1322, 1328, 1334, 1354, 1363, 1369, 1370, 1373, 1376, 1382, + 1389, 1398, 1401, 1404, 1408, 1412, 1416, 1421, 1429, 1433, + 1438, 1442, 1445, 1449, 1452, 1457, 1458, 1459, 1460, 1461, + 1462, 1463, 1464, 1465, 1468, 1469, 1470, 1473, 1474, 1475, + 1479, 1486, 1498, 1504, 1516, 1528, 1531, 1537, 1542, 1545, + 1550, 1551, 1555, 1571, 1587, 1603, 1619, 1630, 1636, 1646, + 1669, 1680, 1699, 1705, 1706, 1712, 1713, 1724, 1735, 1746, + 1756, 1766, 1776, 1779, 1780, 1783, 1784, 1787, 1790, 1793, + 1801, 1811, 1812, 1815, 1832, 1839, 1846, 1853, 1860, 1867, + 1876, 1885, 1896, 1897, 1900, 1920, 1930, 1939, 1950, 1953, + 1958, 1967, 1978, 1981, 1987, 1988, 1992, 1993 }; #endif @@ -778,7 +841,7 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", "SINGLE_CHAR","CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","STRING","PUBLIC", "PRIVATE","PROTECTED","CLASSWIDE","PROPERTY","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE", -"NICK","BLURB","MAXIMUM","MINIMUM","DEFAULT_VALUE","FLAGS","TYPE","FLAGS_TYPE", +"NICK","BLURB","MAXIMUM","MINIMUM","DEFAULT_VALUE","ERROR","FLAGS","TYPE","FLAGS_TYPE", "ENUM_TYPE","PARAM_TYPE","BOXED_TYPE","OBJECT_TYPE","'{'","'}'","'('","')'", "';'","'='","','","'|'","'*'","'>'","'<'","'!'","'-'","prog","ccode","ccodes", "class","classdec","classflags","classcode","thing","scope","destructor","initializer", @@ -786,248 +849,289 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "string","anyval","param_spec_value","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 +"arglist","arglist1","arg","checklist","check","enumcode","enumvals","enumval", +"flagcode","flagvals","errorcode","errorvals","numtok", NULL }; #endif static const short yyr1[] = { 0, - 65, 65, 65, 65, 66, 66, 66, 66, 66, 66, - 67, 67, 68, 68, 69, 70, 70, 70, 71, 71, - 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, - 74, 74, 75, 75, 76, 76, 76, 76, 76, 77, - 77, 78, 78, 78, 79, 79, 80, 80, 80, 81, - 81, 82, 82, 83, 83, 84, 84, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 86, 86, 87, 87, 88, 88, 89, 89, 90, 90, - 90, 90, 90, 90, 90, 91, 91, 91, 91, 91, - 91, 91, 92, 92, 92, 92, 92, 92, 92, 92, - 92, 93, 93, 93, 94, 94, 94, 94, 95, 95, - 96, 96, 96, 96, 97, 98, 98, 99, 99, 100, - 100, 100, 100, 100, 100, 100, 100, 101, 101, 101, - 102, 102, 103, 103, 103, 103, 103, 103, 103, 103, - 104, 104, 105, 105, 106, 106, 106, 106, 107, 107, - 108, 108, 108, 108, 108, 108, 108, 109, 109, 109, - 109 + 66, 66, 66, 66, 67, 67, 67, 67, 67, 67, + 68, 68, 68, 68, 68, 68, 68, 68, 69, 69, + 70, 71, 71, 71, 71, 72, 72, 73, 73, 73, + 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, + 76, 76, 77, 77, 77, 77, 77, 78, 78, 79, + 79, 79, 80, 80, 81, 81, 81, 82, 82, 83, + 83, 84, 84, 85, 85, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 87, 87, 88, 88, 89, 89, 90, + 90, 91, 91, 91, 91, 91, 91, 91, 92, 92, + 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, + 93, 93, 93, 93, 94, 94, 94, 95, 95, 95, + 95, 96, 96, 97, 97, 97, 97, 98, 99, 99, + 100, 100, 101, 101, 101, 101, 101, 101, 101, 101, + 102, 102, 102, 103, 103, 104, 104, 104, 104, 104, + 104, 104, 104, 105, 105, 106, 106, 107, 107, 107, + 107, 108, 108, 109, 109, 109, 109, 109, 109, 109, + 110, 110, 111, 111, 112, 112, 113, 113, 114, 114, + 115, 115, 116, 116, 117, 117, 117, 117 }; static const short yyr2[] = { 0, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1, - 2, 1, 4, 3, 5, 0, 5, 5, 2, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 3, 2, 3, 2, 2, 1, 1, 0, 5, - 6, 12, 9, 6, 3, 0, 11, 8, 5, 3, - 0, 3, 1, 1, 4, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, - 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, - 1 + 2, 2, 2, 2, 1, 1, 1, 1, 4, 3, + 5, 0, 5, 5, 5, 2, 1, 1, 2, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 2, 3, 2, 2, 1, 1, 0, 5, 6, 12, + 9, 6, 3, 0, 11, 8, 5, 3, 0, 3, + 1, 1, 4, 1, 1, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 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, + 7, 8, 3, 1, 3, 1, 7, 8, 3, 1, + 7, 8, 3, 1, 1, 2, 1, 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, 27, - 28, 29, 30, 0, 74, 0, 74, 0, 14, 26, - 0, 20, 0, 23, 24, 25, 21, 16, 0, 0, - 0, 22, 0, 0, 0, 0, 93, 102, 103, 104, - 100, 101, 97, 95, 96, 98, 99, 94, 80, 89, - 0, 0, 78, 79, 91, 0, 0, 0, 13, 19, - 0, 74, 0, 0, 15, 0, 0, 51, 76, 0, - 72, 0, 0, 81, 88, 0, 82, 90, 87, 0, - 0, 105, 77, 92, 86, 83, 0, 0, 114, 0, - 110, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 73, 0, 46, 84, 0, 0, 106, 107, 85, - 0, 0, 0, 109, 0, 113, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 38, 37, 0, 0, 0, - 0, 119, 127, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 53, 0, 49, - 75, 0, 0, 0, 0, 0, 93, 80, 0, 0, - 140, 142, 144, 108, 117, 0, 112, 111, 0, 0, - 0, 0, 31, 0, 0, 0, 161, 158, 160, 0, - 0, 33, 35, 36, 40, 16, 16, 118, 0, 0, + 0, 0, 5, 7, 8, 6, 9, 10, 0, 0, + 15, 0, 4, 0, 16, 17, 18, 0, 0, 0, + 0, 11, 3, 12, 13, 14, 2, 0, 0, 0, + 0, 0, 1, 0, 35, 36, 37, 38, 0, 87, + 0, 87, 0, 20, 34, 0, 27, 0, 31, 32, + 33, 28, 22, 176, 0, 174, 184, 0, 180, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 106, + 115, 116, 117, 113, 114, 110, 108, 109, 111, 112, + 107, 93, 102, 0, 0, 91, 92, 104, 0, 0, + 0, 19, 26, 0, 87, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 59, 89, + 0, 85, 0, 0, 94, 101, 0, 95, 103, 100, + 0, 0, 118, 90, 105, 99, 96, 0, 0, 127, + 0, 123, 0, 0, 0, 47, 0, 188, 185, 187, + 0, 175, 0, 0, 173, 0, 183, 0, 0, 179, + 0, 0, 0, 0, 0, 0, 86, 0, 54, 97, + 0, 0, 119, 120, 98, 0, 0, 0, 122, 0, + 126, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 46, 45, 0, 0, 0, 0, 186, 171, 0, 181, + 0, 177, 0, 0, 132, 140, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 0, 0, 44, 0, 81, 82, 0, - 145, 130, 0, 115, 0, 0, 0, 0, 0, 32, - 41, 130, 34, 159, 17, 18, 0, 54, 58, 59, - 60, 61, 161, 57, 62, 56, 63, 64, 65, 66, - 67, 68, 69, 52, 0, 71, 45, 0, 130, 0, - 0, 137, 146, 0, 0, 0, 141, 143, 116, 0, - 0, 130, 0, 0, 0, 0, 48, 0, 0, 139, - 138, 0, 0, 0, 128, 131, 124, 130, 0, 0, - 0, 126, 0, 0, 0, 43, 122, 0, 151, 0, - 0, 0, 0, 0, 150, 132, 0, 0, 130, 123, - 130, 55, 0, 0, 0, 0, 0, 152, 0, 153, - 0, 147, 149, 129, 120, 0, 0, 47, 0, 148, - 156, 154, 155, 157, 125, 121, 42, 0, 0, 0 + 61, 0, 57, 88, 0, 0, 0, 0, 0, 106, + 93, 0, 0, 153, 155, 157, 121, 130, 0, 125, + 124, 0, 0, 0, 0, 39, 0, 0, 0, 0, + 41, 43, 44, 48, 22, 22, 22, 172, 182, 178, + 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 58, 0, 0, 0, 0, 52, 0, + 94, 95, 0, 158, 143, 0, 128, 0, 0, 0, + 0, 0, 40, 49, 143, 42, 23, 25, 24, 0, + 62, 66, 67, 68, 69, 188, 65, 70, 64, 71, + 72, 74, 73, 76, 75, 78, 77, 80, 79, 82, + 81, 60, 0, 84, 53, 0, 143, 0, 0, 150, + 159, 0, 0, 0, 154, 156, 129, 0, 0, 143, + 0, 0, 0, 0, 56, 0, 0, 152, 151, 0, + 0, 0, 141, 144, 137, 143, 0, 0, 0, 139, + 0, 0, 0, 51, 135, 0, 164, 0, 0, 0, + 0, 0, 163, 145, 0, 0, 143, 136, 143, 63, + 0, 0, 0, 0, 0, 165, 0, 166, 0, 160, + 162, 142, 133, 0, 0, 55, 0, 161, 169, 167, + 168, 170, 138, 134, 50, 0, 0, 0 }; -static const short yydefgoto[] = { 338, - 8, 9, 10, 11, 75, 31, 32, 33, 136, 137, - 138, 34, 35, 164, 36, 110, 157, 239, 245, 158, - 82, 45, 80, 169, 63, 64, 65, 66, 93, 99, - 100, 101, 176, 143, 37, 266, 285, 170, 171, 172, - 173, 304, 305, 286 +static const short yydefgoto[] = { 396, + 11, 12, 13, 14, 98, 46, 47, 48, 181, 182, + 183, 49, 50, 217, 51, 155, 210, 292, 298, 211, + 113, 68, 111, 222, 86, 87, 88, 89, 124, 130, + 131, 132, 229, 196, 52, 324, 343, 223, 224, 225, + 226, 362, 363, 15, 55, 56, 16, 60, 17, 58, + 344 }; -static const short yypact[] = { 144, - -7,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 144, 407, - -21, 40,-32768, 407, 407, 121, 71, 407, 166,-32768, --32768,-32768,-32768, 78, 45, 266, 45, 54,-32768,-32768, - 156,-32768, 216,-32768,-32768,-32768,-32768, 92, 94, 97, - 216,-32768, 157, 159, 160, 313,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 158, 381, - 330, 164, 136,-32768, 395, 183, 257, 185,-32768,-32768, - 330, 45, 200, 207,-32768, 184, 221, 187, 188, 189, - 192, 223, 409,-32768,-32768, 229,-32768, 409,-32768, 230, - 197, 1,-32768, 409,-32768, 247, 182, 236,-32768, 330, --32768, 201, 238, 239, 68, 10, 61, 232, 219, 22, - 159,-32768, 273, 240,-32768, 241, 347, 136,-32768,-32768, - 242, 274, 297,-32768, -4,-32768, 304, 330, 279, -4, - 330, 60, -9, 347, 0, 283, 331, 301, 312, 319, - 360,-32768,-32768,-32768, 332, 333, 334, 346, 348, 361, - 362, 371, 372, 380, 382, 383, 106,-32768, 336,-32768, --32768, 330, 385, 398, 347, 364, 386, 7, 419, 387, --32768, 388,-32768,-32768,-32768, 107,-32768,-32768, 389, 425, - 347, 426,-32768, 423, 392, 394,-32768,-32768,-32768, 427, - 430,-32768,-32768,-32768,-32768, 92, 92,-32768, 13, 13, - 37, 37, 5, 159, 330, 433, 434, 435, 436, 437, --32768, 219, 438, 402, 403, 408, 404, 152, 153, 330, - 66, 442, 296,-32768, 444, 347, 410, 411, 413,-32768, --32768, 442,-32768,-32768,-32768,-32768, 414,-32768,-32768,-32768, --32768,-32768, 414,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 39,-32768,-32768, 441, 442, 330, - 330,-32768, 415, 451, 19, 61,-32768,-32768,-32768, 416, - 347, 442, 347, 61, 443, 420,-32768, 53, 61,-32768, --32768, 455, 88, 452, 456,-32768,-32768, 442, 422, 61, - 424,-32768, 428, 454, 429,-32768,-32768, 88,-32768, 431, - 57, 62, 432, 72,-32768,-32768, 19, 61, 442,-32768, - 442,-32768, 439, 458, 81, 37, 37,-32768, 37,-32768, - 37,-32768,-32768,-32768,-32768, 61, 61,-32768, 440,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 480, 484,-32768 +static const short yypact[] = { 137, + 16, 24,-32768,-32768,-32768,-32768,-32768,-32768, 45, 99, +-32768, 137, 170, 72,-32768,-32768,-32768, 106, 73, 81, + 98,-32768, 170,-32768,-32768,-32768, 170, 154, 111, 151, + 183, 186, 170, 215,-32768,-32768,-32768,-32768, 187, 158, + 310, 158, 182,-32768,-32768, 188,-32768, 276,-32768,-32768, +-32768,-32768, 195, 210, 69,-32768,-32768, 113,-32768, 115, + 214, 301, 190, 276,-32768, 248, 252, 254, 357,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 269, 425, 374, 267, 235,-32768, 439, 284, 444, + 290,-32768,-32768, 374, 158, 293, 311,-32768, 74, 315, + 76, 316, 84, 339, 90,-32768, 321, 348, 329, 334, + 345, 356, 399, 453,-32768,-32768, 409,-32768, 453,-32768, + 413, 378, 2,-32768, 453,-32768, 429, 224, 416,-32768, + 374,-32768, 392, 428, 430, 126, 220,-32768,-32768,-32768, + 441,-32768, 405, 451,-32768, 422,-32768, 452, 423,-32768, + 460, -32, 427, 258, 21, 252,-32768, 464, 431,-32768, + 432, 391, 235,-32768,-32768, 433, 465, 466,-32768, -6, +-32768, 470, 374, 435, -6, 374, 26, 0, 391, 7, + 434, 472, 436, 438, 440, 442,-32768,-32768, 443,-32768, + 445,-32768, 446, 471,-32768,-32768,-32768, 447, 448, 449, + 450, 454, 455, 456, 457, 458, 459, 461, 462, 91, +-32768, 468,-32768,-32768, 374, 478, 480, 391, 408, 467, + 6, 482, 469,-32768, 463,-32768,-32768,-32768, 112,-32768, +-32768, 473, 485, 391, 490,-32768, 486, 474, 476, 487, +-32768,-32768,-32768,-32768, 195, 195, 195,-32768,-32768,-32768, +-32768, 1, 1, 74, 74, 9, 252, 374, 139, 157, + 191, 209, 212,-32768, 258, 494, 477, 479, 481, 483, + 121, 144, 374, 94, 505, 340,-32768, 507, 391, 475, + 484, 488,-32768,-32768, 505,-32768,-32768,-32768,-32768, 489, +-32768,-32768,-32768,-32768,-32768, 489,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 47,-32768,-32768, 503, 505, 374, 374,-32768, + 491, 510, 27, -32,-32768,-32768,-32768, 492, 391, 505, + 391, -32, 506, 496,-32768, 54, -32,-32768,-32768, 518, + 57, 514, 522,-32768,-32768, 505, 495, -32, 497,-32768, + 498, 521, 499,-32768,-32768, 57,-32768, 500, 64, 66, + 501, 50,-32768,-32768, 27, -32, 505,-32768, 505,-32768, + 493, 523, 79, 74, 74,-32768, 74,-32768, 74,-32768, +-32768,-32768,-32768, -32, -32,-32768, 504,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 542, 555,-32768 }; static const short yypgoto[] = {-32768, - 87, 118, 476,-32768, -66,-32768, 459, -8, 349, 351, - 358,-32768,-32768,-32768,-32768,-32768,-32768, -85,-32768, 280, --32768, -18, -106, -25,-32768, -43,-32768, -42, -65, 390, --32768, 120,-32768, -253, 474, -225, 190, -132, -150,-32768, - 275, 202, -211, -135 + 202, 104, 544,-32768, 17,-32768, 511, -29, 380, 379, + 385,-32768,-32768,-32768,-32768,-32768,-32768, -52,-32768, 299, +-32768, -27, -152, -40,-32768, -66,-32768, -60, -107, 437, +-32768, -93,-32768, -314, -20, -279, 200, -177, -218,-32768, + 291, 213, -266, 205,-32768, 502, 232,-32768, 239,-32768, + -99 }; -#define YYLAST 500 - - -static const short yytable[] = { 192, - 62, 186, 85, 86, 161, 118, 274, 73, 67, 132, - 41, 219, 287, 12, 121, 77, 89, 61, 187, 188, - 292, 95, 189, 243, 188, 297, 119, 189, 139, 140, - 16, 237, 217, 279, 238, 90, 310, 187, 188, 85, - 159, 189, 238, 17, 85, 103, 290, 135, 228, 122, - 85, 190, 174, 104, 325, 187, 188, 276, 98, 189, - 92, -134, 308, 191, 220, 241, 242, 246, 191, 262, - 284, 295, 335, 336, 127, 187, 188, 160, 183, 189, - 187, 188, 191, 326, 189, 327, 132, 263, 123, 133, - 299, 38, 323, 270, 277, 13, 43, 247, 44, 299, - 191, 13, 180, 323, 13, 182, 299, 68, 296, 280, - 281, 184, 141, 317, 240, 76, 142, 244, 319, 264, - 191, 134, 85, 86, 135, 191, 322, 15, 300, 235, - 236, 18, 301, 302, 303, 330, 214, 300, 289, 19, - 291, 301, 302, 303, 300, 74, 1, 40, 301, 302, - 303, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 211, 224, 87, 212, 225, 318, 320, 2, 3, 4, - 5, 6, 7, 29, 19, 78, 30, 79, 81, 248, - 331, 332, 91, 333, 39, 334, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 92, 20, 21, 22, 23, - 121, 96, 26, 27, 28, 102, -136, -135, 69, 260, - 261, 30, 20, 21, 22, 23, 124, 126, 105, 40, - 46, 47, 48, 49, 50, 106, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 122, 60, 144, 107, 108, - 109, 114, 177, 112, 178, 113, 111, 115, 116, 124, - 117, 120, 71, 72, 125, 128, 129, 130, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 46, 47, 48, 49, 50, 97, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 134, 60, 20, 21, 22, - 23, 162, 175, 163, 165, 122, 20, 21, 22, 23, - 46, 47, 48, 49, 50, 267, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 121, 60, 83, 47, 48, - 49, 50, 179, 51, 52, 53, 54, 55, 56, 57, - 58, 84, 181, 60, 46, 47, 48, 49, 50, 135, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 132, - 60, 166, 167, 48, 49, 50, 195, 51, 52, 53, - 54, 55, 56, 57, 58, 168, 196, 60, 83, 47, - 48, 49, 50, 197, 51, 52, 53, 54, 55, 56, - 57, 58, 218, 198, 60, 88, 47, 213, 199, 200, - 201, 51, 52, 53, 54, 55, 56, 57, 58, 94, - 47, 60, 202, 215, 203, 51, 52, 53, 54, 55, - 56, 57, 58, 83, 47, 60, 216, 204, 205, 51, - 52, 53, 54, 55, 56, 57, 58, 206, 207, 60, - 2, 3, 4, 5, 6, 7, 208, 221, 209, 210, - -133, 222, 226, 227, 229, 223, 230, 231, 232, 234, - 233, 249, 250, 251, 252, 253, 256, 257, 259, 258, - 265, 255, 269, 271, 278, 272, 273, 275, 282, 283, - 288, 294, 293, 298, 307, 306, 309, 313, 311, 339, - 314, 329, 312, 340, 14, 194, 193, 316, 321, 70, - 185, 254, 42, 131, 328, 337, 324, 268, 0, 315 +#define YYLAST 603 + + +static const short yytable[] = { 142, + 85, 239, 116, 214, 64, 332, 163, 96, 117, 345, + 272, 84, 166, 65, 90, 164, 120, 350, 177, 290, + 194, 126, 355, 108, 195, 138, 139, 296, 139, 140, + 291, 140, 64, 368, 169, 171, 18, 337, 291, 212, + 270, 106, 19, 121, 236, 138, 139, 116, 167, 140, + 348, 383, 116, 134, 320, 227, 281, 180, 116, 240, + 129, -147, 123, 20, 273, 334, 366, 135, 357, 393, + 394, 141, 353, 141, 230, 357, 231, 213, 237, 342, + 241, 169, 138, 139, 138, 139, 140, 384, 140, 385, + 172, 141, 138, 139, 54, 381, 140, 357, 168, 338, + 339, 328, 147, 335, 300, 380, 381, 358, 150, 29, + 354, 359, 360, 361, 358, 321, 27, 21, 359, 360, + 361, 375, 100, 377, 28, 30, 33, 101, 141, 144, + 141, 53, 233, 31, 388, 235, 358, 148, 141, 1, + 359, 360, 361, 151, 177, 2, 264, 178, 322, 265, + 32, 347, 116, 349, 294, 295, 299, 302, 117, 303, + 3, 4, 5, 6, 7, 8, 102, 277, 104, 54, + 278, 103, 34, 105, 267, 304, -149, 305, 2, 318, + 179, 9, 10, 180, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 3, 4, 5, 6, 7, 8, -148, + 293, 57, 319, 297, 59, 66, 34, 44, 107, 306, + 45, 307, 67, 22, 9, 10, 24, 301, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 308, 22, 309, + 310, 24, 311, 61, 22, 62, 91, 24, 184, 185, + 186, 92, 166, 25, 45, 35, 36, 37, 38, 97, + 26, 41, 42, 43, 35, 36, 37, 38, 25, 376, + 378, 287, 288, 289, 25, 26, 109, 99, 63, 63, + 110, 26, 112, 118, 389, 390, 197, 391, 167, 392, + 69, 70, 71, 72, 73, 122, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 123, 83, 198, 199, 200, + 201, 202, 127, 203, 204, 205, 206, 207, 208, 209, + 133, 136, 94, 95, 69, 70, 71, 72, 73, 61, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 137, + 83, 35, 36, 37, 38, 143, 146, 41, 42, 43, + 35, 36, 37, 38, 69, 70, 71, 72, 73, 325, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 149, + 83, 114, 70, 71, 72, 73, 153, 74, 75, 76, + 77, 78, 79, 80, 81, 115, 152, 83, 69, 70, + 71, 72, 73, 154, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 156, 83, 219, 220, 71, 72, 73, + 157, 74, 75, 76, 77, 78, 79, 80, 81, 221, + 158, 83, 114, 70, 71, 72, 73, 159, 74, 75, + 76, 77, 78, 79, 80, 81, 271, 160, 83, 119, + 70, 161, 162, 165, 170, 74, 75, 76, 77, 78, + 79, 80, 81, 125, 70, 83, 174, 173, 175, 74, + 75, 76, 77, 78, 79, 80, 81, 114, 70, 83, + 187, 188, 128, 74, 75, 76, 77, 78, 79, 80, + 81, 189, 191, 83, 35, 36, 37, 38, 190, 192, + 193, 179, 215, 228, 166, 216, 218, 167, 232, 234, + 177, 180, 244, 245, 251, 246, 268, 247, 269, 248, + 274, 249, 250, 280, 252, 253, 254, 255, 282, 283, + 286, 256, 257, 258, 259, 260, 261, 313, 262, 263, + 266, 276, -146, 323, 275, 327, 336, 279, 341, 329, + 284, 285, 314, 316, 315, 351, 356, 364, 317, 330, + 365, 397, 331, 333, 371, 340, 387, 346, 352, 386, + 367, 372, 369, 370, 398, 23, 93, 374, 379, 242, + 395, 243, 238, 312, 382, 0, 326, 0, 373, 0, + 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 145 }; -static const short yycheck[] = { 135, - 26, 134, 46, 46, 111, 5, 232, 33, 27, 19, - 19, 5, 266, 21, 19, 41, 60, 26, 19, 20, - 274, 65, 23, 19, 20, 279, 92, 23, 19, 20, - 52, 19, 165, 259, 30, 61, 290, 19, 20, 83, - 19, 23, 30, 4, 88, 71, 272, 57, 181, 54, - 94, 52, 118, 72, 308, 19, 20, 19, 67, 23, - 60, 55, 288, 64, 58, 201, 202, 203, 64, 220, - 52, 19, 326, 327, 100, 19, 20, 56, 19, 23, - 19, 20, 64, 309, 23, 311, 19, 22, 97, 22, - 19, 21, 304, 226, 56, 9, 19, 204, 54, 19, - 64, 15, 128, 315, 18, 131, 19, 54, 56, 260, - 261, 52, 52, 57, 200, 19, 56, 203, 57, 54, - 64, 54, 166, 166, 57, 64, 55, 10, 57, 196, - 197, 14, 61, 62, 63, 55, 162, 57, 271, 19, - 273, 61, 62, 63, 57, 54, 3, 54, 61, 62, - 63, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 55, 55, 5, 58, 58, 301, 302, 24, 25, 26, - 27, 28, 29, 53, 19, 19, 56, 19, 19, 205, - 316, 317, 19, 319, 19, 321, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 60, 31, 32, 33, 34, - 19, 19, 37, 38, 39, 21, 55, 55, 53, 58, - 58, 56, 31, 32, 33, 34, 97, 98, 19, 54, - 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 54, 21, 19, 55, 19, - 54, 19, 123, 55, 125, 54, 59, 19, 19, 130, - 54, 5, 37, 38, 19, 55, 19, 19, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, +static const short yycheck[] = { 99, + 41, 179, 69, 156, 34, 285, 5, 48, 69, 324, + 5, 41, 19, 34, 42, 123, 83, 332, 19, 19, + 53, 88, 337, 64, 57, 19, 20, 19, 20, 23, + 30, 23, 62, 348, 128, 129, 21, 317, 30, 19, + 218, 62, 19, 84, 19, 19, 20, 114, 55, 23, + 330, 366, 119, 94, 273, 163, 234, 58, 125, 53, + 90, 56, 61, 19, 59, 19, 346, 95, 19, 384, + 385, 65, 19, 65, 168, 19, 170, 57, 53, 53, + 180, 175, 19, 20, 19, 20, 23, 367, 23, 369, + 131, 65, 19, 20, 19, 362, 23, 19, 128, 318, + 319, 279, 19, 57, 257, 56, 373, 58, 19, 4, + 57, 62, 63, 64, 58, 22, 13, 19, 62, 63, + 64, 58, 54, 58, 53, 53, 23, 59, 65, 54, + 65, 21, 173, 53, 56, 176, 58, 54, 65, 3, + 62, 63, 64, 54, 19, 9, 56, 22, 55, 59, + 53, 329, 219, 331, 254, 255, 256, 19, 219, 21, + 24, 25, 26, 27, 28, 29, 54, 56, 54, 19, + 59, 59, 19, 59, 215, 19, 56, 21, 9, 59, + 55, 45, 46, 58, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 24, 25, 26, 27, 28, 29, 56, + 253, 19, 59, 256, 19, 19, 19, 54, 19, 19, + 57, 21, 55, 12, 45, 46, 12, 258, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 19, 27, 21, + 19, 27, 21, 19, 33, 21, 55, 33, 19, 20, + 21, 54, 19, 12, 57, 31, 32, 33, 34, 55, + 12, 37, 38, 39, 31, 32, 33, 34, 27, 359, + 360, 245, 246, 247, 33, 27, 19, 58, 55, 55, + 19, 33, 19, 5, 374, 375, 19, 377, 55, 379, 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 54, 21, 31, 32, 33, - 34, 19, 19, 54, 54, 54, 31, 32, 33, 34, - 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, 54, 21, 5, 6, 7, 8, 9, 57, + 15, 16, 17, 18, 19, 61, 21, 40, 41, 42, + 43, 44, 19, 46, 47, 48, 49, 50, 51, 52, + 21, 19, 37, 38, 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, - 21, 5, 6, 7, 8, 9, 56, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 55, 21, 5, 6, + 21, 31, 32, 33, 34, 21, 21, 37, 38, 39, + 31, 32, 33, 34, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, + 21, 5, 6, 7, 8, 9, 19, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 56, 21, 5, 6, 7, 8, 9, 55, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 24, 21, 5, 6, 52, 57, 57, - 57, 11, 12, 13, 14, 15, 16, 17, 18, 5, - 6, 21, 57, 19, 57, 11, 12, 13, 14, 15, - 16, 17, 18, 5, 6, 21, 19, 57, 57, 11, - 12, 13, 14, 15, 16, 17, 18, 57, 57, 21, - 24, 25, 26, 27, 28, 29, 57, 19, 57, 57, - 55, 55, 54, 19, 19, 58, 24, 56, 55, 20, - 24, 19, 19, 19, 19, 19, 55, 55, 55, 52, - 19, 24, 19, 54, 24, 55, 54, 54, 54, 19, - 55, 52, 30, 19, 19, 24, 55, 24, 55, 0, - 52, 24, 55, 0, 9, 137, 136, 57, 57, 31, - 133, 212, 19, 104, 56, 56, 307, 223, -1, 298 + 17, 18, 19, 60, 21, 5, 6, 7, 8, 9, + 56, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 55, 21, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 19, 55, 5, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 5, 6, 21, 19, 56, 19, 11, + 12, 13, 14, 15, 16, 17, 18, 5, 6, 21, + 20, 57, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 21, 21, 21, 31, 32, 33, 34, 57, 57, + 21, 55, 19, 19, 19, 55, 55, 55, 19, 55, + 19, 58, 57, 56, 24, 56, 19, 56, 19, 57, + 19, 57, 57, 19, 58, 58, 58, 58, 19, 24, + 24, 58, 58, 58, 58, 58, 58, 24, 58, 58, + 53, 59, 56, 19, 56, 19, 24, 55, 19, 55, + 57, 56, 56, 53, 56, 30, 19, 24, 56, 56, + 19, 0, 55, 55, 24, 55, 24, 56, 53, 57, + 56, 53, 56, 56, 0, 12, 46, 58, 58, 181, + 57, 182, 178, 265, 365, -1, 276, -1, 356, -1, + -1, 135, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 101 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1573,23 +1677,23 @@ yyreduce: switch (yyn) { case 1: -#line 591 "parse.y" +#line 637 "parse.y" { ; ; break;} case 2: -#line 592 "parse.y" +#line 638 "parse.y" { ; ; break;} case 3: -#line 593 "parse.y" +#line 639 "parse.y" { ; ; break;} case 4: -#line 594 "parse.y" +#line 640 "parse.y" { ; ; break;} case 5: -#line 597 "parse.y" +#line 643 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", C_CCODE, @@ -1601,7 +1705,7 @@ case 5: ; break;} case 6: -#line 606 "parse.y" +#line 652 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", H_CCODE, @@ -1613,7 +1717,7 @@ case 6: ; break;} case 7: -#line 615 "parse.y" +#line 661 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", HT_CCODE, @@ -1625,7 +1729,7 @@ case 7: ; break;} case 8: -#line 624 "parse.y" +#line 670 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", PH_CCODE, @@ -1637,7 +1741,7 @@ case 8: ; break;} case 9: -#line 633 "parse.y" +#line 679 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", A_CCODE, @@ -1649,7 +1753,7 @@ case 9: ; break;} case 10: -#line 642 "parse.y" +#line 688 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", AT_CCODE, @@ -1661,57 +1765,97 @@ case 10: ; break;} case 11: -#line 653 "parse.y" +#line 699 "parse.y" { ; ; break;} case 12: -#line 654 "parse.y" +#line 700 "parse.y" { ; ; break;} case 13: -#line 657 "parse.y" +#line 701 "parse.y" +{ ; ; + break;} +case 14: +#line 702 "parse.y" +{ ; ; + break;} +case 15: +#line 703 "parse.y" +{ ; ; + break;} +case 16: +#line 704 "parse.y" +{ ; ; + break;} +case 17: +#line 705 "parse.y" +{ ; ; + break;} +case 18: +#line 706 "parse.y" +{ ; ; + break;} +case 19: +#line 709 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 14: -#line 662 "parse.y" +case 20: +#line 714 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 15: -#line 669 "parse.y" +case 21: +#line 721 "parse.y" { class = node_new (CLASS_NODE, "otype:steal", yyvsp[-3].id, "ptype:steal", yyvsp[-1].id, - "bonobo_x_class:steal", bonobo_x_class, + "bonobo_object_class:steal", bonobo_object_class, + "interfaces:steal", interfaces, "chunk_size:steal", chunk_size, NULL); + bonobo_object_class = NULL; + chunk_size = NULL; + interfaces = NULL; ; break;} -case 17: -#line 680 "parse.y" +case 23: +#line 736 "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 if(strcmp(yyvsp[-3].id,"BonoboObject") == 0) { + g_free (bonobo_object_class); + bonobo_object_class = g_strdup(yyvsp[-2].id); } else { yyerror(_("parse error")); YYERROR; } ; break;} -case 18: -#line 692 "parse.y" +case 24: +#line 748 "parse.y" +{ + if (strcmp (yyvsp[-3].id, "interface") == 0) { + interfaces = g_list_append (interfaces, + g_strdup (yyvsp[-2].id)); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 25: +#line 757 "parse.y" { if(strcmp(yyvsp[-3].id,"chunks") == 0) { g_free (chunk_size); @@ -1725,63 +1869,79 @@ case 18: } ; break;} -case 19: -#line 706 "parse.y" +case 26: +#line 771 "parse.y" { ; ; break;} -case 20: -#line 707 "parse.y" +case 27: +#line 772 "parse.y" { ; ; break;} -case 21: -#line 710 "parse.y" +case 28: +#line 775 "parse.y" { ; ; break;} -case 22: -#line 711 "parse.y" +case 29: +#line 776 "parse.y" { - if (strcmp (yyvsp[-1].id, "BonoboX") != 0) { - g_free(yyvsp[-1].id); - yyerror(_("parse error")); + if (strcmp (yyvsp[-1].id, "BonoboObject") != 0) { + g_free (yyvsp[-1].id); + yyerror (_("parse error")); YYERROR; } - last_added_method->bonobo_x_func = TRUE; + g_free (yyvsp[-1].id); + last_added_method->bonobo_object_func = TRUE; ; break;} -case 23: -#line 719 "parse.y" +case 30: +#line 785 "parse.y" +{ + if (strcmp (yyvsp[-2].id, "interface") != 0) { + g_free (yyvsp[-2].id); + g_free (yyvsp[-1].id); + yyerror (_("parse error")); + YYERROR; + } + g_free (yyvsp[-2].id); + node_set ((Node *)last_added_method, + "interface:steal", yyvsp[-1].id, + NULL); + ; + break;} +case 31: +#line 797 "parse.y" { ; ; break;} -case 24: -#line 720 "parse.y" +case 32: +#line 798 "parse.y" { ; ; break;} -case 25: -#line 721 "parse.y" +case 33: +#line 799 "parse.y" { ; ; break;} -case 26: -#line 722 "parse.y" +case 34: +#line 800 "parse.y" { ; ; break;} -case 27: -#line 725 "parse.y" +case 35: +#line 803 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} -case 28: -#line 726 "parse.y" +case 36: +#line 804 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} -case 29: -#line 727 "parse.y" +case 37: +#line 805 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} -case 30: -#line 728 "parse.y" +case 38: +#line 806 "parse.y" { the_scope = CLASS_SCOPE; ; break;} -case 31: -#line 731 "parse.y" +case 39: +#line 809 "parse.y" { if (strcmp (yyvsp[-1].id, "destroywith") == 0) { g_free (yyvsp[-1].id); @@ -1803,8 +1963,8 @@ case 31: } ; break;} -case 32: -#line 751 "parse.y" +case 40: +#line 829 "parse.y" { if (strcmp (yyvsp[-2].id, "destroy") == 0) { g_free(yyvsp[-2].id); @@ -1828,58 +1988,58 @@ case 32: } ; break;} -case 33: -#line 775 "parse.y" +case 41: +#line 853 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 34: -#line 779 "parse.y" +case 42: +#line 857 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 35: -#line 787 "parse.y" +case 43: +#line 865 "parse.y" { ; ; break;} -case 36: -#line 788 "parse.y" +case 44: +#line 866 "parse.y" { ; ; break;} -case 37: -#line 789 "parse.y" +case 45: +#line 867 "parse.y" { destructor = NULL; ; break;} -case 38: -#line 790 "parse.y" +case 46: +#line 868 "parse.y" { initializer = NULL; ; break;} -case 39: -#line 791 "parse.y" +case 47: +#line 869 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 40: -#line 797 "parse.y" +case 48: +#line 875 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 41: -#line 800 "parse.y" +case 49: +#line 878 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 42: -#line 805 "parse.y" +case 50: +#line 883 "parse.y" { Node *node = NULL; if(strcmp(yyvsp[-6].id,"get")==0 && @@ -1949,8 +2109,8 @@ case 42: ; break;} -case 43: -#line 873 "parse.y" +case 51: +#line 951 "parse.y" { Node *node = NULL; if(strcmp(yyvsp[-3].id, "get") == 0) { @@ -2006,8 +2166,8 @@ case 43: } ; break;} -case 44: -#line 927 "parse.y" +case 52: +#line 1005 "parse.y" { Node *node; char *get, *set = NULL; @@ -2095,8 +2255,8 @@ case 44: class_nodes = g_list_append (class_nodes, node); ; break;} -case 45: -#line 1015 "parse.y" +case 53: +#line 1093 "parse.y" { if (strcmp (yyvsp[-1].id, "export")!=0) { g_free (yyvsp[-1].id); @@ -2106,14 +2266,14 @@ case 45: yyval.id = yyvsp[-1].id; ; break;} -case 46: -#line 1023 "parse.y" +case 54: +#line 1101 "parse.y" { yyval.id = NULL; ; break;} -case 47: -#line 1028 "parse.y" +case 55: +#line 1106 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2163,8 +2323,8 @@ case 47: } ; break;} -case 48: -#line 1076 "parse.y" +case 56: +#line 1154 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2202,8 +2362,8 @@ case 48: } ; break;} -case 49: -#line 1112 "parse.y" +case 57: +#line 1190 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2219,28 +2379,28 @@ case 49: } ; break;} -case 50: -#line 1128 "parse.y" +case 58: +#line 1206 "parse.y" { ; ; break;} -case 51: -#line 1129 "parse.y" +case 59: +#line 1207 "parse.y" { ; ; break;} -case 52: -#line 1132 "parse.y" +case 60: +#line 1210 "parse.y" { ; ; break;} -case 53: -#line 1133 "parse.y" +case 61: +#line 1211 "parse.y" { ; ; break;} -case 54: -#line 1136 "parse.y" +case 62: +#line 1214 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 55: -#line 1137 "parse.y" +case 63: +#line 1215 "parse.y" { if (strcmp (yyvsp[-3].id, "_") != 0) { g_free (yyvsp[-3].id); @@ -2252,16 +2412,16 @@ case 55: g_free (yyvsp[-1].id); ; break;} -case 56: -#line 1149 "parse.y" +case 64: +#line 1227 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 57: -#line 1150 "parse.y" +case 65: +#line 1228 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 58: -#line 1153 "parse.y" +case 66: +#line 1231 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2269,8 +2429,8 @@ case 58: NULL); ; break;} -case 59: -#line 1159 "parse.y" +case 67: +#line 1237 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2278,8 +2438,8 @@ case 59: NULL); ; break;} -case 60: -#line 1165 "parse.y" +case 68: +#line 1243 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2287,8 +2447,8 @@ case 60: NULL); ; break;} -case 61: -#line 1171 "parse.y" +case 69: +#line 1249 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2296,8 +2456,8 @@ case 61: NULL); ; break;} -case 62: -#line 1177 "parse.y" +case 70: +#line 1255 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2305,8 +2465,8 @@ case 62: NULL); ; break;} -case 63: -#line 1183 "parse.y" +case 71: +#line 1261 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2314,8 +2474,8 @@ case 63: NULL); ; break;} -case 64: -#line 1189 "parse.y" +case 72: +#line 1267 "parse.y" { Type *type = pop_type (); ensure_property (); @@ -2324,8 +2484,8 @@ case 64: NULL); ; break;} -case 65: -#line 1196 "parse.y" +case 73: +#line 1274 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2333,8 +2493,8 @@ case 65: NULL); ; break;} -case 66: -#line 1202 "parse.y" +case 74: +#line 1280 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2342,8 +2502,8 @@ case 66: NULL); ; break;} -case 67: -#line 1208 "parse.y" +case 75: +#line 1286 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2351,8 +2511,8 @@ case 67: NULL); ; break;} -case 68: -#line 1214 "parse.y" +case 76: +#line 1292 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2360,8 +2520,8 @@ case 68: NULL); ; break;} -case 69: -#line 1220 "parse.y" +case 77: +#line 1298 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -2369,8 +2529,53 @@ case 69: NULL); ; break;} -case 70: -#line 1226 "parse.y" +case 78: +#line 1304 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 79: +#line 1310 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 80: +#line 1316 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 81: +#line 1322 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 82: +#line 1328 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 83: +#line 1334 "parse.y" { ensure_property (); if (strcmp (yyvsp[0].id, "link") == 0) { @@ -2390,8 +2595,8 @@ case 70: } ; break;} -case 71: -#line 1246 "parse.y" +case 84: +#line 1354 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -2402,35 +2607,35 @@ case 71: yyval.id = debool (yyvsp[-4].id); ; break;} -case 72: -#line 1255 "parse.y" +case 85: +#line 1363 "parse.y" { yyval.id = debool (yyvsp[0].id); typestack = g_list_prepend(typestack,NULL); ; break;} -case 73: -#line 1261 "parse.y" +case 86: +#line 1369 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} -case 74: -#line 1262 "parse.y" +case 87: +#line 1370 "parse.y" { yyval.list = NULL; ; break;} -case 75: -#line 1265 "parse.y" +case 88: +#line 1373 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 76: -#line 1268 "parse.y" +case 89: +#line 1376 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 77: -#line 1274 "parse.y" +case 90: +#line 1382 "parse.y" { Node *node = node_new (TYPE_NODE, "name:steal", yyvsp[-1].id, @@ -2439,8 +2644,8 @@ case 77: typestack = g_list_prepend(typestack,node); ; break;} -case 78: -#line 1281 "parse.y" +case 91: +#line 1389 "parse.y" { Node *node = node_new (TYPE_NODE, "name:steal", yyvsp[0].id, @@ -2448,174 +2653,174 @@ case 78: typestack = g_list_prepend(typestack,node); ; break;} -case 79: -#line 1290 "parse.y" +case 92: +#line 1398 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 80: -#line 1293 "parse.y" +case 93: +#line 1401 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 81: -#line 1296 "parse.y" +case 94: +#line 1404 "parse.y" { yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 82: -#line 1300 "parse.y" +case 95: +#line 1408 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); ; break;} -case 83: -#line 1304 "parse.y" +case 96: +#line 1412 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 84: -#line 1308 "parse.y" +case 97: +#line 1416 "parse.y" { yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 85: -#line 1313 "parse.y" +case 98: +#line 1421 "parse.y" { yyval.id = g_strconcat(yyvsp[-2].id, " ", yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); ; break;} -case 86: -#line 1321 "parse.y" +case 99: +#line 1429 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 87: -#line 1325 "parse.y" +case 100: +#line 1433 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[-1].id); g_free(yyvsp[0].id); ; break;} -case 88: -#line 1330 "parse.y" +case 101: +#line 1438 "parse.y" { yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 89: -#line 1334 "parse.y" +case 102: +#line 1442 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 90: -#line 1337 "parse.y" +case 103: +#line 1445 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); ; break;} -case 91: -#line 1341 "parse.y" +case 104: +#line 1449 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} -case 92: -#line 1344 "parse.y" +case 105: +#line 1452 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); ; break;} -case 93: -#line 1349 "parse.y" +case 106: +#line 1457 "parse.y" { yyval.id = "void"; ; break;} -case 94: -#line 1350 "parse.y" +case 107: +#line 1458 "parse.y" { yyval.id = "char"; ; break;} -case 95: -#line 1351 "parse.y" +case 108: +#line 1459 "parse.y" { yyval.id = "short"; ; break;} -case 96: -#line 1352 "parse.y" +case 109: +#line 1460 "parse.y" { yyval.id = "int"; ; break;} -case 97: -#line 1353 "parse.y" +case 110: +#line 1461 "parse.y" { yyval.id = "long"; ; break;} -case 98: -#line 1354 "parse.y" +case 111: +#line 1462 "parse.y" { yyval.id = "float"; ; break;} -case 99: -#line 1355 "parse.y" +case 112: +#line 1463 "parse.y" { yyval.id = "double"; ; break;} -case 100: -#line 1356 "parse.y" +case 113: +#line 1464 "parse.y" { yyval.id = "signed"; ; break;} -case 101: -#line 1357 "parse.y" +case 114: +#line 1465 "parse.y" { yyval.id = "unsigned"; ; break;} -case 102: -#line 1360 "parse.y" +case 115: +#line 1468 "parse.y" { yyval.id = "struct"; ; break;} -case 103: -#line 1361 "parse.y" +case 116: +#line 1469 "parse.y" { yyval.id = "union"; ; break;} -case 104: -#line 1362 "parse.y" +case 117: +#line 1470 "parse.y" { yyval.id = "enum"; ; break;} -case 105: -#line 1365 "parse.y" +case 118: +#line 1473 "parse.y" { yyval.id = g_strdup("*"); ; break;} -case 106: -#line 1366 "parse.y" +case 119: +#line 1474 "parse.y" { yyval.id = g_strdup("* const"); ; break;} -case 107: -#line 1367 "parse.y" +case 120: +#line 1475 "parse.y" { yyval.id = g_strconcat("*", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 108: -#line 1371 "parse.y" +case 121: +#line 1479 "parse.y" { yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); g_free(yyvsp[0].id); ; break;} -case 109: -#line 1378 "parse.y" +case 122: +#line 1486 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -2629,14 +2834,14 @@ case 109: g_free(yyvsp[-1].id); ; break;} -case 110: -#line 1390 "parse.y" +case 123: +#line 1498 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 111: -#line 1396 "parse.y" +case 124: +#line 1504 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -2650,8 +2855,8 @@ case 111: g_free(yyvsp[-1].id); ; break;} -case 112: -#line 1408 "parse.y" +case 125: +#line 1516 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -2665,47 +2870,47 @@ case 112: g_free(yyvsp[-2].id); ; break;} -case 113: -#line 1420 "parse.y" +case 126: +#line 1528 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 114: -#line 1423 "parse.y" +case 127: +#line 1531 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 115: -#line 1429 "parse.y" +case 128: +#line 1537 "parse.y" { gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id)); ; break;} -case 116: -#line 1434 "parse.y" +case 129: +#line 1542 "parse.y" { gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 117: -#line 1437 "parse.y" +case 130: +#line 1545 "parse.y" { gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 118: -#line 1442 "parse.y" +case 131: +#line 1550 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 119: -#line 1443 "parse.y" +case 132: +#line 1551 "parse.y" { yyval.cbuf = NULL; ; break;} -case 120: -#line 1447 "parse.y" +case 133: +#line 1555 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -2723,8 +2928,8 @@ case 120: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 121: -#line 1463 "parse.y" +case 134: +#line 1571 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -2742,8 +2947,8 @@ case 121: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 122: -#line 1479 "parse.y" +case 135: +#line 1587 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -2761,8 +2966,8 @@ case 122: ccode_line, vararg, NULL); ; break;} -case 123: -#line 1495 "parse.y" +case 136: +#line 1603 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -2780,8 +2985,8 @@ case 123: ccode_line, vararg, NULL); ; break;} -case 124: -#line 1511 "parse.y" +case 137: +#line 1619 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -2794,8 +2999,8 @@ case 124: ccode_line, vararg, NULL); ; break;} -case 125: -#line 1522 "parse.y" +case 138: +#line 1630 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -2803,8 +3008,8 @@ case 125: vararg, NULL); ; break;} -case 126: -#line 1528 "parse.y" +case 139: +#line 1636 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -2816,8 +3021,8 @@ case 126: vararg, NULL); ; break;} -case 127: -#line 1538 "parse.y" +case 140: +#line 1646 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -2840,8 +3045,8 @@ case 127: } ; break;} -case 128: -#line 1561 "parse.y" +case 141: +#line 1669 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -2854,8 +3059,8 @@ case 128: g_free(yyvsp[-1].id); ; break;} -case 129: -#line 1572 "parse.y" +case 142: +#line 1680 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -2876,30 +3081,30 @@ case 129: g_free(yyvsp[-1].id); ; break;} -case 130: -#line 1591 "parse.y" +case 143: +#line 1699 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 131: -#line 1597 "parse.y" +case 144: +#line 1705 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 132: -#line 1598 "parse.y" +case 145: +#line 1706 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 133: -#line 1604 "parse.y" +case 146: +#line 1712 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 134: -#line 1605 "parse.y" +case 147: +#line 1713 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -2912,8 +3117,8 @@ case 134: } ; break;} -case 135: -#line 1616 "parse.y" +case 148: +#line 1724 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -2926,8 +3131,8 @@ case 135: } ; break;} -case 136: -#line 1627 "parse.y" +case 149: +#line 1735 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -2940,8 +3145,8 @@ case 136: } ; break;} -case 137: -#line 1638 "parse.y" +case 150: +#line 1746 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -2953,8 +3158,8 @@ case 137: } ; break;} -case 138: -#line 1648 "parse.y" +case 151: +#line 1756 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-3].id,"self")==0) @@ -2966,8 +3171,8 @@ case 138: } ; break;} -case 139: -#line 1658 "parse.y" +case 152: +#line 1766 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) @@ -2979,40 +3184,40 @@ case 139: } ; break;} -case 140: -#line 1668 "parse.y" +case 153: +#line 1776 "parse.y" { has_self = FALSE; ; break;} -case 141: -#line 1671 "parse.y" +case 154: +#line 1779 "parse.y" { vararg = TRUE; ; break;} -case 142: -#line 1672 "parse.y" +case 155: +#line 1780 "parse.y" { vararg = FALSE; ; break;} -case 143: -#line 1675 "parse.y" +case 156: +#line 1783 "parse.y" { ; ; break;} -case 144: -#line 1676 "parse.y" +case 157: +#line 1784 "parse.y" { ; ; break;} -case 145: -#line 1679 "parse.y" +case 158: +#line 1787 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 146: -#line 1682 "parse.y" +case 159: +#line 1790 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 147: -#line 1685 "parse.y" +case 160: +#line 1793 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -3022,8 +3227,8 @@ case 147: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 148: -#line 1693 "parse.y" +case 161: +#line 1801 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -3033,16 +3238,16 @@ case 148: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 149: -#line 1703 "parse.y" +case 162: +#line 1811 "parse.y" { ; ; break;} -case 150: -#line 1704 "parse.y" +case 163: +#line 1812 "parse.y" { ; ; break;} -case 151: -#line 1707 "parse.y" +case 164: +#line 1815 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = node_new (CHECK_NODE, @@ -3061,8 +3266,8 @@ case 151: g_free(yyvsp[0].id); ; break;} -case 152: -#line 1724 "parse.y" +case 165: +#line 1832 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GT_CHECK, @@ -3071,8 +3276,8 @@ case 152: checks = g_list_append(checks,node); ; break;} -case 153: -#line 1731 "parse.y" +case 166: +#line 1839 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LT_CHECK, @@ -3081,8 +3286,8 @@ case 153: checks = g_list_append(checks,node); ; break;} -case 154: -#line 1738 "parse.y" +case 167: +#line 1846 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GE_CHECK, @@ -3091,8 +3296,8 @@ case 154: checks = g_list_append(checks,node); ; break;} -case 155: -#line 1745 "parse.y" +case 168: +#line 1853 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LE_CHECK, @@ -3101,8 +3306,8 @@ case 155: checks = g_list_append(checks,node); ; break;} -case 156: -#line 1752 "parse.y" +case 169: +#line 1860 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", EQ_CHECK, @@ -3111,8 +3316,8 @@ case 156: checks = g_list_append(checks,node); ; break;} -case 157: -#line 1759 "parse.y" +case 170: +#line 1867 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", NE_CHECK, @@ -3121,23 +3326,161 @@ case 157: checks = g_list_append(checks,node); ; break;} -case 158: -#line 1768 "parse.y" +case 171: +#line 1876 "parse.y" +{ + Node *node = node_new (ENUMDEF_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", enum_vals, + NULL); + enum_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 172: +#line 1885 "parse.y" +{ + Node *node = node_new (ENUMDEF_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", enum_vals, + NULL); + enum_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 173: +#line 1896 "parse.y" +{;; + break;} +case 174: +#line 1897 "parse.y" +{;; + break;} +case 175: +#line 1900 "parse.y" +{ + Node *node; + char *num = yyvsp[0].id; + + /* A float value, that's a bad enum */ + if (num[0] >= '0' && + num[0] <= '9' && + strchr (num, '.') != NULL) { + g_free (yyvsp[-2].id); + g_free (num); + yyerror(_("parse error (enumerator value not integer constant)")); + YYERROR; + } + + node = node_new (ENUMVALUE_NODE, + "name:steal", yyvsp[-2].id, + "value:steal", num, + NULL); + enum_vals = g_list_append (enum_vals, node); + ; + break;} +case 176: +#line 1920 "parse.y" +{ + Node *node; + + node = node_new (ENUMVALUE_NODE, + "name:steal", yyvsp[0].id, + NULL); + enum_vals = g_list_append (enum_vals, node); + ; + break;} +case 177: +#line 1930 "parse.y" +{ + Node *node = node_new (FLAGS_NODE, + "ftype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", flag_vals, + NULL); + flag_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 178: +#line 1939 "parse.y" +{ + Node *node = node_new (FLAGS_NODE, + "ftype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", flag_vals, + NULL); + flag_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 179: +#line 1950 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 180: +#line 1953 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 181: +#line 1958 "parse.y" +{ + Node *node = node_new (ERROR_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", error_vals, + NULL); + error_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 182: +#line 1967 "parse.y" +{ + Node *node = node_new (ERROR_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", error_vals, + NULL); + error_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 183: +#line 1978 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 184: +#line 1981 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 185: +#line 1987 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 159: -#line 1769 "parse.y" +case 186: +#line 1988 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 160: -#line 1773 "parse.y" +case 187: +#line 1992 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 161: -#line 1774 "parse.y" +case 188: +#line 1993 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -3362,5 +3705,5 @@ yyerrhandle: } return 1; } -#line 1777 "parse.y" +#line 1996 "parse.y"