X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/573256d3bc21896c54c511d5c0e6927f09b4209e..926b8d8fb3ecffe60f3eaefcd5ec40a5273251ce:/src/main.c diff --git a/src/main.c b/src/main.c index dfd87d0..81b22f1 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,8 @@ /* GOB C Preprocessor * Copyright (C) 1999,2000 the Free Software Foundation. * Copyright (C) 2000 Eazel, Inc. - * Copyright (C) 2001-2004 George (Jiri) Lebl + * Copyright (C) 2001-2011 George (Jiri) Lebl + * Copyright © 2019-2020 Nick Bowler * * Author: George (Jiri) Lebl * @@ -21,10 +22,11 @@ * USA. */ -#include "config.h" +#include #include #include #include +#include #include #include #include @@ -54,6 +56,9 @@ extern GHashTable *gtk_doc_hash; char *filebase; char *fullfilebase; +static char *outfilebase; +static char *outfilehbase; +static char *outfilephbase; static char *funcbase; static char *pfuncbase; static char *macrobase; @@ -66,6 +71,8 @@ static char *ptypebase; char *output_dir = NULL; +char file_sep = '-'; + static int signals = 0; /* number of signals */ static int set_properties = 0; /* number of named (set) properties */ static int get_properties = 0; /* number of named (get) properties */ @@ -75,6 +82,7 @@ static int protecteds = 0; /* number of protected methods */ static int unreftors = 0; /* number of variable unreffing destructors */ static int destructors = 0; /* number of variable non-unreffing destructors */ static int initializers = 0; /* number of variable initializers */ +static int glade_widgets = 0; /* number of glade widgets */ static gboolean overrode_get_type = FALSE; /* provided your won _get_type */ static gboolean made_aliases = FALSE; /* if we made any shorthand aliases @@ -85,17 +93,22 @@ static gboolean made_aliases = FALSE; /* if we made any shorthand aliases static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; - +static Method * user_dispose_method = NULL; + static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; FILE *outph = NULL; -FILE *devnull = NULL; +gboolean no_touch = FALSE; gboolean no_touch_headers = FALSE; gboolean for_cpp = FALSE; gboolean no_gnu = FALSE; @@ -108,6 +121,11 @@ gboolean no_write = FALSE; gboolean no_lines = FALSE; gboolean no_self_alias = FALSE; gboolean always_private_struct = FALSE; +gboolean gtk3_ok = FALSE; + +gint prealloc = 0; + + gboolean use_m4 = FALSE; /* preprocess sources with m4 */ gboolean use_m4_clean = FALSE; /* preprocess sources with m4, no m4 flags */ @@ -122,7 +140,7 @@ int method_unique_id = 1; static void make_bases (void) { - filebase = replace_sep (((Class *)class)->otype, '-'); + filebase = replace_sep (((Class *)class)->otype, file_sep); gob_strdown (filebase); if (output_dir != NULL && @@ -191,6 +209,7 @@ print_method (FILE *fp, const char *afterargs, const char *postfix, const Method *m, + gboolean print_funcattrs, gboolean one_arg_per_line, gboolean no_funcbase, gboolean kill_underscore, @@ -246,7 +265,28 @@ print_method (FILE *fp, } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + /* Slightly icky: sometimes we are called st m->funcattrs + hasn't been set, but if so it should be NULL since its been + zero-initialized. */ + if(print_funcattrs && m->funcattrs != NULL + && strlen(m->funcattrs) > 0) { + /* To keep the output neat, we trim off the trailing '\n' + from the end of funcattrs for a moment. */ + size_t funcattrs_len = strlen(m->funcattrs); + gboolean funcattrs_chomped = FALSE; + if((m->funcattrs)[funcattrs_len - 1] == '\n') { + m->funcattrs[funcattrs_len - 1] = '\0'; + funcattrs_chomped = TRUE; + } + out_printf(fp, "%s)\n%s%s", afterargs, m->funcattrs, postfix); + /* Put it back like it was (though it shouldn't matter). */ + if (funcattrs_chomped) { + (m->funcattrs)[funcattrs_len - 1] = '\n'; + } + } + else { + out_printf(fp, "%s)%s", afterargs, postfix); + } } static gboolean @@ -261,6 +301,9 @@ any_method_to_alias(Class *c) if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -283,6 +326,9 @@ make_method_aliases (Class *c) if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -322,6 +368,9 @@ add_bad_hack_to_avoid_unused_warnings(const Class *c) if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -363,11 +412,12 @@ put_vs_method(const Method *m) /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method(outh, "\t", "(* ", "", ") ", "", ";\n", + m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE); + } static void @@ -376,8 +426,10 @@ put_pub_method(const Method *m) if(m->scope != PUBLIC_SCOPE) return; + out_addline_infile(outh, m->line_no); print_method(outh, "", "\t", "", "\t", "", ";\n", m, - TRUE, FALSE, TRUE, FALSE, FALSE); + TRUE, TRUE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(outh); } static void @@ -415,7 +467,7 @@ put_signal_macro (const Method *m, gboolean gnu) "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -426,7 +478,7 @@ put_signal_macro (const Method *m, gboolean gnu) "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -438,7 +490,7 @@ put_signal_macro (const Method *m, gboolean gnu) "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -500,15 +552,17 @@ put_local_signal_macros (const Class *c) static void put_prot_method(const Method *m) { - if(m->scope != PROTECTED_SCOPE) - return; + FILE *f; - if(outph) - print_method(outph, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); - else - print_method(out, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + if(m->scope != PROTECTED_SCOPE) + return; + + f = outph ? outph : out; + + out_addline_infile(f, m->line_no); + print_method(f, "", "\t", "", "\t", "", ";\n", + m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(f); } static void @@ -520,7 +574,7 @@ put_priv_method_prot(const Method *m) if(m->cbuf) print_method(out, "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -529,16 +583,27 @@ put_priv_method_prot(const Method *m) m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); + if (m->line_no > 0) + out_addline_infile(out, m->line_no); print_method(out, "static ", s, "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, FALSE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE); + if (m->line_no > 0) + out_addline_outfile(out); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { + if (m->line_no > 0) + out_addline_infile(out, m->line_no); print_method(out, "static ", "", "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE); + if (m->line_no > 0) + out_addline_outfile(out); } } @@ -621,66 +686,68 @@ make_inits(Class *cl) } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); + } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -733,6 +800,8 @@ print_signal_marsal_args (const Method *m) if (strcmp (li->data, "UNICHAR") == 0) /* hack because glib is braindamaged */ get_func = g_strdup ("g_value_get_uint"); + else if (strncmp(li->data, "BOXED_", 6) == 0) + get_func = g_strdup ("g_value_get_boxed"); else get_func = g_strdup_printf ("g_value_get_%s", (char *)li->data); @@ -865,10 +934,10 @@ add_signal_prots(Method *m) /* hack because glib is braindamaged */ set_func = g_strdup ("g_value_set_uint"); else - set_func = g_strdup_printf ("g_value_set_%s%s", - (char *)m->gtktypes->data, + set_func = g_strdup_printf ("g_value_%s_%s", take_ownership ? - "_take_ownership" : ""); + "take" : "set", + (char *)m->gtktypes->data); gob_strdown (set_func); out_printf (out, "\n\t%s (return_value, v_return);\n", @@ -885,6 +954,59 @@ add_signal_prots(Method *m) out_printf (out, "}\n\n"); } +static char * +interface_type(const char *if_name) +{ + char *rawtype = remove_sep(if_name); + char *end = "", *typename; + + if (!gtk3_ok) { + /* + * EEEK! evil, we should have some sort of option + * to force this for arbitrary interfaces, since + * some are Class and some are Iface. Glib is shite + * in consistency. + */ + + if (strcmp (rawtype, "GtkEditable") == 0 + || strcmp (rawtype, "GTypePlugin") == 0) + { + end = "Class"; + } else { + /* We'll assume Iface is the standard ending */ + end = "Iface"; + } + } else { + /* GTK3 doesn't need Iface end */ + end = "Interface"; + } + + typename = g_strconcat(rawtype, end, (char *)NULL); + g_free(rawtype); + + return typename; +} + +static void +define_parent_interface_refs(Class *c) +{ + GList *li; + + if (!c->interfaces) + return; + + out_printf(out, "\n/* parent class interface implementations */\n"); + for (li = c->interfaces; li != NULL; li = li->next) { + char *name = replace_sep(li->data, '_'); + char *type = interface_type(li->data); + + out_printf (out, "static %s *%s_parent_iface;\n", type, name); + + g_free(name); + g_free(type); + } +} + static void add_enums(Class *c) { @@ -934,7 +1056,9 @@ add_enums(Class *c) "static guint object_signals[LAST_SIGNAL] = {0};\n\n"); out_printf(out, "/* pointer to the class of our parent */\n"); - out_printf(out, "static %sClass *parent_class = NULL;\n\n", ptypebase); + out_printf(out, "static %sClass *parent_class = NULL;\n", ptypebase); + define_parent_interface_refs(c); + out_printf(out, "\n"); } static void @@ -968,7 +1092,7 @@ add_interface_methods (Class *c, const char *interface) } static void -add_interface_inits (Class *c) +add_interface_inits(Class *c) { GList *li; @@ -978,30 +1102,19 @@ add_interface_inits (Class *c) out_printf(out, "\n"); for (li = c->interfaces; li != NULL; li = li->next) { - const char *interface = li->data; - const char *end; - char *name = replace_sep (interface, '_'); - char *type = remove_sep (interface); - - /* EEEK! evil, we should have some sort of option - * to force this for arbitrary interfaces, since - * some are Class and some are Iface. Glib is shite - * in consistency. */ - if (strcmp (type, "GtkEditable") == 0 || - strcmp (type, "GTypePlugin") == 0) - end = "Class"; - else - /* We'll assume Iface is the standard ending */ - end = "Iface"; + char *name = replace_sep(li->data, '_'); + char *type = interface_type(li->data); - out_printf (out, "\nstatic void\n" - "___%s_init (%s%s *iface)\n" - "{\n", - name, type, end); + out_printf(out, "static void\n" + "___%s_init (%s *iface)\n" + "{\n", name, type); - add_interface_methods (c, interface); + add_interface_methods(c, li->data); - out_printf (out, "}\n\n"); + out_printf(out, "\t%s_parent_iface\n", name); + out_printf(out, for_cpp ? "\t\t= (%s *)" : "\t\t= ", type); + out_printf(out, "g_type_interface_peek_parent(iface);\n" + "}\n\n"); g_free (name); g_free (type); @@ -1009,154 +1122,299 @@ add_interface_inits (Class *c) } static void -add_interface_infos (void) +add_interface_infos(Class *c, gboolean static_storage) { GList *li; - for (li = ((Class *)class)->interfaces; - li != NULL; - li = li->next) { - char *name = replace_sep (li->data, '_'); - out_printf (out, - "\t\tstatic const GInterfaceInfo %s_info = {\n" - "\t\t\t(GInterfaceInitFunc) ___%s_init,\n" - "\t\t\tNULL,\n" - "\t\t\tNULL\n" - "\t\t};\n\n", - name, name); - g_free (name); + + for (li = c->interfaces; li; li = li->next) { + char *name = replace_sep(li->data, '_'); + out_printf(out, "\t%sconst GInterfaceInfo %s_info = {\n" + "\t\t(GInterfaceInitFunc) ___%s_init,\n" + "\t\tNULL,\n" + "\t\tNULL\n" + "\t};\n", + static_storage ? "static " : "", + name, name); + g_free(name); } + + out_printf(out, "\n"); } static void -add_interfaces (void) +define_add_interfaces(Class *c) { GList *li; - for (li = ((Class *)class)->interfaces; - li != NULL; - li = li->next) { - char *name = replace_sep (li->data, '_'); - char *type = make_pre_macro (li->data, "TYPE"); - out_printf (out, - "\t\tg_type_add_interface_static (type,\n" - "\t\t\t%s,\n" - "\t\t\t&%s_info);\n", - type, - name); + if (!c->interfaces) + return; - g_free (type); - g_free (name); + out_printf(out, "static void ___add_interfaces(GType type)\n{\n"); + add_interface_infos(c, TRUE); + + for (li = c->interfaces; li; li = li->next) { + char *type = make_pre_macro(li->data, "TYPE"); + char *name = replace_sep(li->data, '_'); + + out_printf(out, "\tg_type_add_interface_static\n" + "\t\t( type\n" + "\t\t, %s\n" + "\t\t, &%s_info\n" + "\t\t);\n", + type, name); + + g_free(name); + g_free(type); } + + out_printf(out, "}\n\n"); } static void -add_get_type(void) +define_dynamic_add_interfaces(Class *c) { - /*char *chunk_size = ((Class*)class)->chunk_size;*/ + GList *li; - out_printf(out, - "GType\n" - "%s_get_type (void)\n" - "{\n" - "\tstatic GType type = 0;\n\n" - "\tif ___GOB_UNLIKELY(type == 0) {\n" - "\t\tstatic const GTypeInfo info = {\n" - "\t\t\tsizeof (%sClass),\n" - "\t\t\t(GBaseInitFunc) NULL,\n" - "\t\t\t(GBaseFinalizeFunc) NULL,\n" - "\t\t\t(GClassInitFunc) %s_class_init,\n" - "\t\t\t(GClassFinalizeFunc) NULL,\n" - "\t\t\tNULL /* class_data */,\n" - "\t\t\tsizeof (%s),\n" - "\t\t\t0 /* n_preallocs */,\n" - "\t\t\t(GInstanceInitFunc) %s_init,\n" - "\t\t\tNULL\n" - "\t\t};\n\n", - funcbase, typebase, funcbase, typebase, funcbase); - - add_interface_infos (); + if (!c->interfaces) + return; - out_printf (out, - "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)0);\n", - pmacrotype, typebase); + out_printf(out, "static void ___add_interfaces" + "(GTypeModule *type_module, GType type)\n" + "{\n"); + add_interface_infos(c, FALSE); + + /* + * Hack to work around bug in g_type_module_add_interface, + * which will fail to add an interface to types that derive + * from something that also implements the same interface. + * + * The actual GType system does not have any such problem, + * and the GTypeModule implementation details relied upon + * here have not changed once since the feature was first + * implemented almost 20 years ago. + */ + out_printf(out, "\tstruct _ModuleInterfaceInfo {\n" + "\t\tgboolean loaded;\n" + "\t\tGType instance_type;\n" + "\t\tGType interface_type;\n" + "\t\tGInterfaceInfo info;\n" + "\t} *modinfo;\n"); + + for (li = c->interfaces; li; li = li->next) { + char *type = make_pre_macro(li->data, "TYPE"); + char *name = replace_sep(li->data, '_'); + + out_printf(out, "\n" + "\tmodinfo = g_malloc(sizeof *modinfo);\n" + "\tmodinfo->loaded = TRUE;\n" + "\tmodinfo->instance_type = type;\n" + "\tmodinfo->interface_type = %s;\n" + "\tmodinfo->info = %s_info;\n" + "\tg_type_add_interface_dynamic\n" + "\t\t( modinfo->instance_type\n" + "\t\t, modinfo->interface_type\n" + "\t\t, G_TYPE_PLUGIN(type_module)\n" + "\t\t);\n" + "\ttype_module->interface_infos = g_slist_prepend\n" + "\t\t( type_module->interface_infos\n" + "\t\t, modinfo\n" + "\t\t);\n", + type, name); + + g_free(name); + g_free(type); + } + + out_printf(out, "}\n\n"); +} + +static void define_add_privates(Class *c) +{ + const char *addprivate = c->dynamic + ? "G_ADD_PRIVATE_DYNAMIC" + : "G_ADD_PRIVATE"; - add_interfaces (); + if (!privates) + return; + + out_printf(out, "#ifdef %s\n" + "#define ___add_privates() %s(%s)\n" + "#else\n" + "#define ___add_privates()\n" + "#endif\n\n", + addprivate, addprivate, typebase); +} + +static void add_type_info(void) +{ + out_printf(out, "\tstatic const GTypeInfo info = {\n" + "\t\tsizeof (%sClass),\n" + "\t\t(GBaseInitFunc) NULL,\n" + "\t\t(GBaseFinalizeFunc) NULL,\n" + "\t\t(GClassInitFunc) %s_class_init,\n" + "\t\t(GClassFinalizeFunc) NULL,\n" + "\t\tNULL /* class_data */,\n" + "\t\tsizeof (%s),\n" + "\t\t%d /* n_preallocs */,\n" + "\t\t(GInstanceInitFunc) %s_init,\n" + "\t\tNULL\n" + "\t};\n\n", + typebase, funcbase, typebase, prealloc, funcbase); +} + +static void +add_get_type(void) +{ + Class *c = (Class *)class; + + define_add_interfaces(c); + define_add_privates(c); + + out_printf(out, "#ifdef G_DEFINE_TYPE_EXTENDED\n\n" + "G_DEFINE_TYPE_EXTENDED(%s, %s, %s,\n" + "\t(GTypeFlags)%s,\n", + typebase, funcbase, pmacrotype, + c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); + + if (privates) + out_printf(out, "\t___add_privates();\n"); + + if (c->interfaces) + out_printf(out, "\t___add_interfaces(g_define_type_id);\n"); + + /* Fallback for GLib < 2.4 */ + out_printf(out, ");\n\n" + "#else\n\n" + "GType %s_get_type(void)\n" + "{\n" + "\tstatic GType type = 0;\n", + funcbase); + + add_type_info(); + + out_printf(out, "\tif ___GOB_UNLIKELY(type == 0) {\n" + "\t\ttype = g_type_register_static\n" + "\t\t\t( %s\n" + "\t\t\t, \"%s\"\n" + "\t\t\t, &info\n" + "\t\t\t, (GTypeFlags)%s\n" + "\t\t\t);\n", + pmacrotype, typebase, + c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); + + if (c->interfaces) + out_printf(out, "\t\t___add_interfaces(type);\n"); + + out_printf(out, "\t}\n\n" + "\treturn type;\n" + "}\n\n" + "#endif\n\n"); +} + +static void +add_dynamic_get_type(void) +{ + Class *c = (Class *)class; + + define_dynamic_add_interfaces(c); + define_add_privates(c); /* - if(chunk_size) { - out_printf(out, - "#if %s > 0\n" - "\t\tgtk_type_set_chunk_alloc(type, %s);\n" - "#endif\n", - chunk_size, chunk_size); + * G_DEFINE_DYNAMIC_TYPE_EXTENDED is usable if available, except for + * some reason it defines an xxx_register_type function with internal + * linkage. This is kind of weird so we have to work around that. + */ + out_printf(out, "#ifdef G_DEFINE_DYNAMIC_TYPE_EXTENDED\n\n" + "static void %s_class_finalize(%sClass *c) { }\n\n" + "#define %s_register_type ___register_type\n", + funcbase, typebase, funcbase); + + out_printf(out, "G_DEFINE_DYNAMIC_TYPE_EXTENDED(%s, %s, %s,\n" + "\t(GTypeFlags)%s,\n", + typebase, funcbase, pmacrotype, + c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); + + if (privates) + out_printf(out, "\t___add_privates();\n"); + + if (c->interfaces) { + out_printf(out, "\t___add_interfaces" + "(type_module, %s_type_id);\n", funcbase); } - */ - out_printf(out, - "\t}\n\n" - "\treturn type;\n" - "}\n\n"); + + out_printf(out, ");\n" + "#undef %s_register_type\n\n" + "void %s_register_type(GTypeModule *type_module)\n" + "{\n" + "\t___register_type(type_module);\n" + "}\n\n", + funcbase, funcbase); + + /* Fallback for GLib < 2.14 */ + out_printf(out, "#else\n\n" + "static GType %s_type_id;\n\n" + "GType %s_get_type(void)\n" + "{\n" + "\treturn %s_type_id;\n" + "}\n\n", + funcbase, funcbase, funcbase); + + out_printf(out, "void %s_register_type(GTypeModule *type_module)\n" + "{\n", + funcbase); + + add_type_info(); + + out_printf(out, "\t%s_type_id = g_type_module_register_type\n" + "\t\t( type_module\n" + "\t\t, %s\n" + "\t\t, \"%s\"\n" + "\t\t, &info\n" + "\t\t, (GTypeFlags)%s\n" + "\t\t);\n", + funcbase, pmacrotype, typebase, + c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); + + if (c->interfaces) { + out_printf(out, "\t___add_interfaces" + "(type_module, %s_type_id);\n", + funcbase); + } + + out_printf(out, "}\n\n" + "#endif\n\n"); } static void -add_bonobo_object_get_type (void) +add_bonobo_object_get_type(void) { - /* char *chunk_size = ((Class*)class)->chunk_size; */ - /* _vicious_ spanks seth with a rusty nail - out_printf(out, - "\n#warning \"Bonobo isn't fully ported to glib 2.0 and " - "gob2 doesn't officially support it yet. It'd be safer " - "and a lot more fun to blow goats.\"\n"); - */ + Class *c = (Class *)class; - out_printf (out, - "GType\n" - "%s_get_type (void)\n" /* 1 */ - "{\n" - "\tstatic GType type = 0;\n\n" - "\tif ___GOB_UNLIKELY(type == 0) {\n" - "\t\tstatic const GTypeInfo info = {\n" - "\t\t\tsizeof (%sClass),\n" /* 2 */ - "\t\t\t(GBaseInitFunc) NULL,\n" - "\t\t\t(GBaseFinalizeFunc) NULL,\n" - "\t\t\t(GClassInitFunc) %s_class_init,\n" /* 3 */ - "\t\t\tNULL, /* class_finalize */\n" - "\t\t\tNULL, /* class_data */\n" - "\t\t\tsizeof (%s),\n" /* 4 */ - "\t\t\t0, /* n_preallocs */\n" - "\t\t\t(GInstanceInitFunc) %s_init,\n" /* 5 */ - "\t\t\tNULL\n" - "\t\t};\n\n", - funcbase /* 1 */, - typebase /* 2 */, - funcbase /* 3 */, - typebase /* 4 */, - funcbase /* 5 */); - - add_interface_infos (); + define_add_interfaces(c); - out_printf (out, - "\t\ttype = bonobo_type_unique (\n" - "\t\t\tBONOBO_OBJECT_TYPE,\n" - "\t\t\tPOA_%s__init, NULL,\n" /* 1 */ - "\t\t\tG_STRUCT_OFFSET (%sClass, _epv),\n" /* 2 */ - "\t\t\t&info, \"%s\");\n", /* 3 */ - ((Class*)class)->bonobo_object_class /* 1 */, - typebase /* 2 */, - typebase /* 3 */); - - add_interfaces (); - - /*if(chunk_size) { - out_printf(out, - "#if %s > 0\n" - "\t\tgtk_type_set_chunk_alloc(type, %s);\n" - "#endif\n", - chunk_size, chunk_size); - }*/ - out_printf(out, - "\t}\n\n" - "\treturn type;\n" - "}\n\n"); + out_printf (out, "GType %s_get_type(void)\n" + "{\n" + "\tstatic GType type = 0;\n", + funcbase); + + add_type_info(); + + out_printf (out, "\tif ___GOB_UNLIKELY(type == 0) {\n" + "\t\ttype = bonobo_type_unique\n" + "\t\t\t( BONOBO_OBJECT_TYPE\n" + "\t\t\t, POA_%s__init, NULL\n" + "\t\t\t, G_STRUCT_OFFSET (%sClass, _epv)\n" + "\t\t\t, &info\n" + "\t\t\t, \"%s\"\n" + "\t\t\t);\n", + c->bonobo_object_class, typebase, typebase); + + if (((Class *)class)->interfaces) + out_printf(out, "\t\t___add_interfaces(type);\n"); + + out_printf(out, "\t}\n\n" + "\treturn type;\n" + "}\n\n"); } static void @@ -1286,14 +1544,14 @@ add_signals(Class *c) gob_strup (sig); flags = make_run_signal_flags (m, last); out_printf (out, "\tobject_signals[%s_SIGNAL] =\n" - "\t\tg_signal_new (\"%s\",\n" + "\t\tg_signal_new (%s,\n" "\t\t\tG_TYPE_FROM_CLASS (g_object_class),\n" "\t\t\t(GSignalFlags)(%s),\n" "\t\t\tG_STRUCT_OFFSET (%sClass, %s),\n" "\t\t\tNULL, NULL,\n" "\t\t\t%s,\n" "\t\t\tG_TYPE_%s, %d", - sig, m->id, + sig, m->signal_name /*m->id* if not given signal_name*/, flags, typebase, m->id, mar, (char *)m->gtktypes->data, @@ -1304,9 +1562,16 @@ add_signals(Class *c) if( ! is_none) { GList *l; - for(l = m->gtktypes->next; l != NULL; l = l->next) - out_printf(out, ",\n\t\t\tG_TYPE_%s", - (char *)l->data); + char *t; + for(l = m->gtktypes->next; l != NULL; l = l->next) { + char *str = l->data; + if (strncmp (str, "BOXED_", 6) == 0) + t = g_strdup (&(str[6])); + else + t = g_strconcat ("G_TYPE_", str, NULL); + out_printf (out, ",\n\t\t\t%s", t); + g_free (t); + } } out_printf(out, ");\n"); @@ -1426,8 +1691,8 @@ make_argument (Argument *a) char *argflags[] = { "CONSTRUCT", "CONSTRUCT_ONLY", - "CHILD_ARG", - "MASK", + "LAX_VALIDATION", + "PRIVATE", NULL }; @@ -1457,13 +1722,7 @@ make_argument (Argument *a) if(strcmp(argflags[i], flag)==0) break; } - /* if we haven't found it in our list */ - if( ! argflags[i]) { - error_printf(GOB_WARN, a->line_no, - "Unknown flag '%s' used, " - "perhaps it was misspelled", flag); - } - g_string_sprintfa(flags, " | G_PARAM_%s", flag); + g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); } g_string_append (flags, ")"); @@ -1552,13 +1811,13 @@ make_argument (Argument *a) a->name, flags->str); else if (!strcmp (a->gtktype, "FLOAT")) out_printf(out, "\tparam_spec = g_param_spec_float (\"%s\", NULL, NULL,\n" - "\t\tG_MINFLOAT, G_MAXFLOAT,\n" + "\t\t-G_MAXFLOAT, G_MAXFLOAT,\n" "\t\t0,\n" "\t\t%s);\n", a->name, flags->str); else if (!strcmp (a->gtktype, "DOUBLE")) out_printf(out, "\tparam_spec = g_param_spec_double (\"%s\", NULL, NULL,\n" - "\t\tG_MINDOUBLE, G_MAXDOUBLE,\n" + "\t\t-G_MAXDOUBLE, G_MAXDOUBLE,\n" "\t\t0,\n" "\t\t%s);\n", a->name, flags->str); @@ -1584,367 +1843,391 @@ make_argument (Argument *a) static void make_property (Property *p) { - GString *flags; - GList *l; char *s; - char *argflags[] = { - "CONSTRUCT", - "CONSTRUCT_ONLY", - "CHILD_ARG", - "MASK", - NULL - }; - - flags = g_string_new ("(GParamFlags)("); - - if (p->get != NULL && p->set != NULL) - g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE"); - else if (p->get != NULL) - g_string_append (flags, "G_PARAM_READABLE"); - else - g_string_append (flags, "G_PARAM_WRITABLE"); if (p->get == NULL && p->set == NULL) { error_print (GOB_ERROR, p->line_no, "Property has no getter nor setter"); } - for (l = p->flags; l != NULL; l = l->next) { - char *flag = l->data; - int i; - if(strcmp (flag, "READABLE") == 0 || - strcmp (flag, "WRITABLE") == 0) { - error_print(GOB_WARN, p->line_no, - "READABLE and " - "WRITABLE argument flags are " - "set automatically"); - continue; - } - for(i = 0; argflags[i]; i++) { - if(strcmp(argflags[i], flag)==0) - break; + if (p->override) { + if (p->flags != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, flags ignored"); + if (p->nick != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, nick ignored"); + if (p->blurb != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, blurb ignored"); + if (p->minimum != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, minimum ignored"); + if (p->maximum != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, maximum ignored"); + if (p->default_value != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, default_value ignored"); + + s = g_strdup (p->name); + gob_strup (s); + out_printf (out, "\tg_object_class_override_property (g_object_class,\n" + "\t\tPROP_%s,\n" + "\t\t\"%s\");\n", s, value_for_print (p->canonical_name, p->name) ); + g_free (s); + } else { + GString *flags; + GList *l; + char *argflags[] = { + "CONSTRUCT", + "CONSTRUCT_ONLY", + "LAX_VALIDATION", + "PRIVATE", + NULL + }; + + flags = g_string_new ("(GParamFlags)("); + + if (p->get != NULL && p->set != NULL) + g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE"); + else if (p->get != NULL) + g_string_append (flags, "G_PARAM_READABLE"); + else + g_string_append (flags, "G_PARAM_WRITABLE"); + + + for (l = p->flags; l != NULL; l = l->next) { + char *flag = l->data; + int i; + if(strcmp (flag, "READABLE") == 0 || + strcmp (flag, "WRITABLE") == 0) { + error_print(GOB_WARN, p->line_no, + "READABLE and " + "WRITABLE argument flags are " + "set automatically"); + continue; + } + for(i = 0; argflags[i]; i++) { + if(strcmp(argflags[i], flag)==0) + break; + } + g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); } - /* if we haven't found it in our list */ - if( ! argflags[i]) { - error_printf(GOB_WARN, p->line_no, - "Unknown flag '%s' used, " - "perhaps it was misspelled", flag); + + g_string_append (flags, ")"); + + if (strcmp (p->gtktype, "CHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_char\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-128"), + value_for_print (p->maximum, "127"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UCHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uchar\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "0xFF"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "BOOLEAN") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_boolean\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "FALSE"), + flags->str); + } else if (strcmp (p->gtktype, "INT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_int\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MININT"), + value_for_print (p->maximum, "G_MAXINT"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UINT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uint\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXUINT"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "LONG") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_long\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MINLONG"), + value_for_print (p->maximum, "G_MAXLONG"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "ULONG") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_ulong\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXULONG"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "INT64") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_int64\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MININT64"), + value_for_print (p->maximum, "G_MAXINT64"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UINT64") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uint64\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXUINT64"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UNICHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_unichar\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "ENUM") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_ENUM"); + out_printf (out, "\tparam_spec = g_param_spec_enum\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* enum_type */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + value_for_print (p->default_value, "0"), + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "FLAGS") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_FLAGS"); + out_printf (out, "\tparam_spec = g_param_spec_flags\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* flags_type */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + value_for_print (p->default_value, "0"), + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "FLOAT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_float\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-G_MAXFLOAT"), + value_for_print (p->maximum, "G_MAXFLOAT"), + value_for_print (p->default_value, "0.0"), + flags->str); + } else if (strcmp (p->gtktype, "DOUBLE") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_double\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-G_MAXDOUBLE"), + value_for_print (p->maximum, "G_MAXDOUBLE"), + value_for_print (p->default_value, "0.0"), + flags->str); + } else if (strcmp (p->gtktype, "STRING") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_string\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "NULL"), + flags->str); + } else if (strcmp (p->gtktype, "PARAM") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_PARAM"); + out_printf (out, "\tparam_spec = g_param_spec_param\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* param_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "BOXED") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_BOXED"); + out_printf (out, "\tparam_spec = g_param_spec_boxed\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* boxed_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "POINTER") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_pointer\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + flags->str); + /* FIXME: VALUE_ARRAY */ + } else if (strcmp (p->gtktype, "CLOSURE") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_pointer\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + flags->str); + } else if (strcmp (p->gtktype, "OBJECT") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_BOXED"); + out_printf (out, "\tparam_spec = g_param_spec_object\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* object_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else { + error_printf (GOB_ERROR, p->line_no, + "%s type is not supported by properties", + p->gtktype); } - g_string_sprintfa(flags, " | G_PARAM_%s", flag); - } - g_string_append (flags, ")"); + s = g_strdup (p->name); + gob_strup (s); + out_printf (out, "\tg_object_class_install_property (g_object_class,\n" + "\t\tPROP_%s,\n" + "\t\tparam_spec);\n", s); + g_free (s); - if (strcmp (p->gtktype, "CHAR") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_char\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "-128"), - value_for_print (p->maximum, "127"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "UCHAR") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_uchar\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "0"), - value_for_print (p->maximum, "0xFF"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "BOOLEAN") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_boolean\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->default_value, "FALSE"), - flags->str); - } else if (strcmp (p->gtktype, "INT") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_int\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "G_MININT"), - value_for_print (p->maximum, "G_MAXINT"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "UINT") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_uint\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "0"), - value_for_print (p->maximum, "G_MAXUINT"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "LONG") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_long\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "G_MINLONG"), - value_for_print (p->maximum, "G_MAXLONG"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "ULONG") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_ulong\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "0"), - value_for_print (p->maximum, "G_MAXULONG"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "INT64") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_int64\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "G_MININT64"), - value_for_print (p->maximum, "G_MAXINT64"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "UINT64") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_uint64\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "0"), - value_for_print (p->maximum, "G_MAXUINT64"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "UNICHAR") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_unichar\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->default_value, "0"), - flags->str); - } else if (strcmp (p->gtktype, "ENUM") == 0) { - char *type = make_me_type (p->extra_gtktype, - "G_TYPE_ENUM"); - out_printf (out, "\tparam_spec = g_param_spec_enum\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* enum_type */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - type, - value_for_print (p->default_value, "0"), - flags->str); - g_free (type); - } else if (strcmp (p->gtktype, "FLAGS") == 0) { - char *type = make_me_type (p->extra_gtktype, - "G_TYPE_FLAGS"); - out_printf (out, "\tparam_spec = g_param_spec_flags\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* flags_type */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - type, - value_for_print (p->default_value, "0"), - flags->str); - g_free (type); - } else if (strcmp (p->gtktype, "FLOAT") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_float\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "G_MINFLOAT"), - value_for_print (p->maximum, "G_MAXFLOAT"), - value_for_print (p->default_value, "0.0"), - flags->str); - } else if (strcmp (p->gtktype, "DOUBLE") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_double\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* minimum */,\n" - "\t\t %s /* maximum */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->minimum, "G_MINDOUBLE"), - value_for_print (p->maximum, "G_MAXDOUBLE"), - value_for_print (p->default_value, "0.0"), - flags->str); - } else if (strcmp (p->gtktype, "STRING") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_string\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* default_value */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - value_for_print (p->default_value, "NULL"), - flags->str); - } else if (strcmp (p->gtktype, "PARAM") == 0) { - char *type = make_me_type (p->extra_gtktype, - "G_TYPE_PARAM"); - out_printf (out, "\tparam_spec = g_param_spec_param\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* param_type */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - type, - flags->str); - g_free (type); - } else if (strcmp (p->gtktype, "BOXED") == 0) { - char *type = make_me_type (p->extra_gtktype, - "G_TYPE_BOXED"); - out_printf (out, "\tparam_spec = g_param_spec_boxed\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* boxed_type */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - type, - flags->str); - g_free (type); - } else if (strcmp (p->gtktype, "POINTER") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_pointer\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - flags->str); - /* FIXME: VALUE_ARRAY */ - } else if (strcmp (p->gtktype, "CLOSURE") == 0) { - out_printf (out, "\tparam_spec = g_param_spec_pointer\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - flags->str); - } else if (strcmp (p->gtktype, "OBJECT") == 0) { - char *type = make_me_type (p->extra_gtktype, - "G_TYPE_BOXED"); - out_printf (out, "\tparam_spec = g_param_spec_object\n" - "\t\t(\"%s\" /* name */,\n" - "\t\t %s /* nick */,\n" - "\t\t %s /* blurb */,\n" - "\t\t %s /* object_type */,\n" - "\t\t %s);\n", - p->name, - value_for_print (p->nick, "NULL"), - value_for_print (p->blurb, "NULL"), - type, - flags->str); - g_free (type); - } else { - error_printf (GOB_ERROR, p->line_no, - "%s type is not supported by properties", - p->gtktype); + g_string_free (flags, TRUE); } - - s = g_strdup (p->name); - gob_strup (s); - out_printf (out, "\tg_object_class_install_property (g_object_class,\n" - "\t\tPROP_%s,\n" - "\t\tparam_spec);\n", s); - g_free (s); - - g_string_free (flags, TRUE); } static void @@ -1955,8 +2238,15 @@ make_arguments(Class *c) out_printf(out, "\tg_object_class->get_property = ___object_get_property;\n"); if (set_properties > 0) out_printf(out, "\tg_object_class->set_property = ___object_set_property;\n"); - out_printf (out, " {\n" - "\tGParamSpec *param_spec;\n\n"); + out_printf (out, " {\n"); + for (li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; + if ((n->type == PROPERTY_NODE && ! ((Property *) n)->override) + || n->type == ARGUMENT_NODE) { + out_printf(out, "\tGParamSpec *param_spec;\n\n"); + break; + } + } for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; @@ -1972,6 +2262,9 @@ static void print_initializer(Method *m, Variable *v) { char *root; + + if(v->glade_widget) + return; if(v->initializer == NULL) return; @@ -1985,8 +2278,15 @@ print_initializer(Method *m, Variable *v) if(v->initializer_line > 0) out_addline_infile(out, v->initializer_line); - out_printf(out, "\t%s->%s = %s;\n", + if (v->initializer_simple) + out_printf(out, "\t%s->%s = %s;\n", root, v->id, v->initializer); + else if (strcmp(v->id, "_glade_xml") == 0) + /* This is OK, this v->initializer string is set internally + and it will eat exactly one string! */ + out_printf(out,v->initializer, ((FuncArg *)m->args->data)->name); + else + out_printf(out, "%s", v->initializer); if(v->initializer_line > 0) out_addline_outfile(out); @@ -1994,6 +2294,28 @@ print_initializer(Method *m, Variable *v) g_free(root); } +static void +print_glade_widget(Method *m, Variable *v) +{ + char *root; + char *cast; + + if(!v->glade_widget) + return; + + if(v->scope == PRIVATE_SCOPE) + root = g_strconcat(((FuncArg *)m->args->data)->name, + "->_priv", NULL); + else + root = g_strdup(((FuncArg *)m->args->data)->name); + + cast = get_type(v->vtype, FALSE); + out_printf(out, "\t%s->%s = (%s)glade_xml_get_widget(%s->_glade_xml, \"%s\");\n", + root, v->id, cast, root, v->id); + + g_free(root); +} + static void print_destructor (Variable *v) { @@ -2011,11 +2333,19 @@ print_destructor (Variable *v) if(v->destructor_line > 0) out_addline_infile(out, v->destructor_line); - out_printf(out, "\tif(%s->%s) { " - "((*(void (*)(void *))%s)) (%s->%s); " - "%s->%s = NULL; }\n", - root, v->id, v->destructor, root, v->id, - root, v->id); + if (for_cpp) { + out_printf(out, "\tif(%s->%s) { " + "(reinterpret_cast(%s)) ((gpointer)%s->%s); " + "%s->%s = NULL; }\n", + root, v->id, v->destructor, root, v->id, + root, v->id); + } else { + out_printf(out, "\tif(%s->%s) { " + "%s ((gpointer) %s->%s); " + "%s->%s = NULL; }\n", + root, v->id, v->destructor, root, v->id, + root, v->id); + } if(v->destructor_line > 0) out_addline_outfile(out); @@ -2030,13 +2360,56 @@ print_destructor (Variable *v) if(v->destructor_line > 0) out_addline_outfile(out); - out_printf(out, "\tmemset(&%s, 0, sizeof(%s));\n", + out_printf(out, "\tmemset(&(%s), 0, sizeof(%s));\n", v->id, v->id); out_printf(out, "#undef VAR\n"); out_printf(out, "#undef %s\n", v->id); } } +static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void +print_unreftors (Class *c) +{ + GList *li; + for(li = ((Class *)class)->nodes; + li != NULL; + li = li->next) { + Node *n = li->data; + Variable *v = (Variable *)n; + if (n->type == VARIABLE_NODE && + v->scope != CLASS_SCOPE && + v->destructor_unref) + print_destructor (v); + } +} + static void add_dispose (Class *c) { @@ -2047,7 +2420,7 @@ add_dispose (Class *c) "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2055,6 +2428,10 @@ add_dispose (Class *c) } if (dispose_handler != NULL) { + if (unreftors > 0) { + print_unreftors (c); + } + /* so we get possible bad argument warning */ if (dispose_handler->line_no > 0) out_addline_infile (out, dispose_handler->line_no); @@ -2063,29 +2440,43 @@ add_dispose (Class *c) if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + + if (unreftors > 0) { + print_unreftors (c); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); } - if (unreftors > 0) { - GList *li; - for(li = ((Class *)class)->nodes; - li != NULL; - li = li->next) { - Node *n = li->data; - Variable *v = (Variable *)n; - if (n->type == VARIABLE_NODE && - v->scope != CLASS_SCOPE && - v->destructor_unref) - print_destructor (v); - } - } - out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } +static void +print_destructors (Class *c) +{ + GList *li; + for (li = ((Class *)class)->nodes; + li != NULL; + li = li->next) { + Node *n = li->data; + Variable *v = (Variable *)n; + if (n->type == VARIABLE_NODE && + v->scope != CLASS_SCOPE && + ! v->destructor_unref) + print_destructor (v); + } +} + static void add_finalize (Class *c) { @@ -2098,18 +2489,27 @@ add_finalize (Class *c) c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; - out_printf(out, "\t%s *self %s = %s (obj_self);\n", + out_printf(out, "\t%s *self%s = %s (obj_self);\n", typebase, unused, macrobase); } if (privates > 0) { - out_printf(out, "\tgpointer priv = self->_priv;\n"); + const char *unused = ""; + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + out_printf(out, "\tgpointer priv%s = self->_priv;\n", + unused); } if(finalize_handler) { + if (destructors > 0) { + print_destructors (c); + } + /* so we get possible bad argument warning */ if(finalize_handler->line_no > 0) out_addline_infile(out, finalize_handler->line_no); @@ -2118,27 +2518,21 @@ add_finalize (Class *c) if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { - out_printf(out, - "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" - "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); - } + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } - if (destructors > 0) { - GList *li; - for (li = ((Class *)class)->nodes; - li != NULL; - li = li->next) { - Node *n = li->data; - Variable *v = (Variable *)n; - if (n->type == VARIABLE_NODE && - v->scope != CLASS_SCOPE && - ! v->destructor_unref) - print_destructor (v); + if (destructors > 0) { + print_destructors (c); } - } - if (privates > 0) { - out_printf(out, "\tg_free (priv);\n"); + out_printf(out, + "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" + "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); } out_printf(out, "}\n" @@ -2175,6 +2569,51 @@ make_bonobo_object_epv (Class *c, const char *classname) out_addline_outfile(out); } +static void add_class_private(Class *c, Method *m) +{ + const char *dynamic = c->dynamic ? "_DYNAMIC" : ""; + + if (!privates) + return; + + out_printf(out, "\n#if !defined(G_DEFINE%s_TYPE_EXTENDED)" + " || !defined(G_ADD_PRIVATE%s)\n" + "\tg_type_class_add_private(%s, sizeof(%sPrivate));\n" + "#endif\n", + dynamic, dynamic, + ((FuncArg *)m->args->data)->name, typebase); +} + +static void get_instance_private(Class *c, Method *m) +{ + const char *self = ((FuncArg *)m->args->data)->name; + const char *dynamic = c->dynamic ? "_DYNAMIC" : ""; + + if (!privates) { + if (always_private_struct) { + out_printf(out, "\t%s->_priv = NULL;\n", self); + } + + return; + } + + out_printf(out, "\t%s->_priv = (%sPrivate *)\n" + "#if defined(G_DEFINE%s_TYPE_EXTENDED)" + " && defined(G_ADD_PRIVATE%s)\n" + "\t\t%s_get_instance_private(%s);\n" + "#else\n" + "\t\tG_TYPE_INSTANCE_GET_PRIVATE\n" + "\t\t\t( %s\n" + "\t\t\t, %s\n" + "\t\t\t, %sPrivate\n" + "\t\t\t);\n" + "#endif\n", + self, typebase, + dynamic, dynamic, + funcbase, self, + self, macrotype, typebase); +} + static void add_inits(Class *c) { @@ -2195,21 +2634,17 @@ add_inits(Class *c) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, TRUE, + FALSE); + out_printf(out, "{\n"); if(m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" + out_printf(out, "#define __GOB_FUNCTION__ \"%s::init\"\n", c->otype); - if(privates > 0) { - out_printf(out, "\t%s->_priv = " - "g_new0 (%sPrivate, 1);\n", - ((FuncArg *)m->args->data)->name, - typebase); - } else if(always_private_struct) { - out_printf(out, "\t%s->_priv = NULL;\n", - ((FuncArg *)m->args->data)->name); - } + + get_instance_private(c, m); + if(initializers > 0) { GList *li; for(li = ((Class *)class)->nodes; @@ -2223,21 +2658,37 @@ add_inits(Class *c) print_initializer(m, v); } } + if(glade_widgets > 0) { + GList *li; + for(li = ((Class *)class)->nodes; + li != NULL; + li = li->next) { + Node *n = li->data; + Variable *v = (Variable *)n; + if(n->type != VARIABLE_NODE || + v->scope == CLASS_SCOPE) + continue; + print_glade_widget(m, v); + } + } } else if(m->method == CLASS_INIT_METHOD) { gboolean did_base_obj = FALSE; if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, TRUE, + FALSE); + out_printf(out, "{\n"); if(m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" + out_printf(out, "#define __GOB_FUNCTION__ \"%s::class_init\"\n", c->otype); if (set_properties > 0 || get_properties > 0 || signals > 0 || + need_constructor || need_dispose || need_finalize) { out_printf(out, @@ -2254,6 +2705,8 @@ add_inits(Class *c) ((FuncArg *)m->args->data)->name, did_base_obj); + add_class_private(c, m); + if (initializers > 0) { GList *li; for(li = ((Class *)class)->nodes; @@ -2280,6 +2733,9 @@ add_inits(Class *c) /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -2575,10 +3031,10 @@ print_preconditions(Method *m) static void print_method_body (Method *m, gboolean pre, gboolean unused_self) { + out_printf(out, "{\n"); if (m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" - "#define __GOB_FUNCTION__ \"%s::%s\"\n", + out_printf(out, "#define __GOB_FUNCTION__ \"%s::%s\"\n", ((Class *)class)->otype, m->id); if (pre) @@ -2629,12 +3085,15 @@ put_signal_args (Method *m) li != NULL && ali != NULL; li = li->next, ali = ali->next, i++) { FuncArg *fa = li->data; - char *cast = g_strdup (get_cast (ali->data, FALSE)); + char *str = ali->data; + char *cast = g_strdup (get_cast (str, FALSE)); /* FIXME: This code is so fucking ugly it hurts */ gboolean do_static = - (strcmp ((char *)ali->data, "STRING") == 0 || - strcmp ((char *)ali->data, "BOXED") == 0); + (strcmp (str, "STRING") == 0 || + strcmp (str, "BOXED") == 0 || + strncmp (str, "BOXED_", 6) == 0); char *set_func; + char *t; if (cast == NULL) { cast = get_type (fa->atype, TRUE); @@ -2643,18 +3102,26 @@ put_signal_args (Method *m) the we know all the types */ g_assert (cast != NULL); + if (strncmp (str, "BOXED_", 6) == 0) + t = g_strdup (&(str[6])); + else + t = g_strconcat ("G_TYPE_", str, NULL); + out_printf (out, "\t___param_values[%d].g_type = 0;\n" - "\tg_value_init (&___param_values[%d], G_TYPE_%s);\n", - i, i, (char *)ali->data); + "\tg_value_init (&___param_values[%d], %s);\n", + i, i, t); + g_free (t); - if (strcmp (ali->data, "UNICHAR") == 0) + if (strcmp (str, "UNICHAR") == 0) /* hack because glib is braindamaged */ set_func = g_strdup ("g_value_set_uint"); + else if (strncmp (str, "BOXED_", 6) == 0) + set_func = g_strdup ("g_value_set_static_boxed"); else set_func = g_strdup_printf ("g_value_set%s_%s", do_static ? "_static" : "", - (char *)ali->data); + str); gob_strdown (set_func); out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n", @@ -2699,6 +3166,35 @@ get_arg_names_for_macro (Method *m) return g_string_free (gs, FALSE); } +static gboolean method_is_void(Method *m) +{ + return !strcmp(m->mtype->name, "void") && !m->mtype->pointer; +} + +static const char *method_err_retval(Method *m) +{ + if (method_is_void(m)) + return "(void)0"; + if (m->onerror) + return m->onerror; + return "0"; +} + +static void +put_interface_parent_handler(Method *m) +{ + const char *errval = method_err_retval(m); + char *name = replace_sep(m->interface, '_'); + char *args = get_arg_names_for_macro(m); + + out_printf(out, "#define PARENT_HANDLER(%s) (%s_parent_iface \\\n" + "\t? %s_parent_iface->%s(%s) \\\n" + "\t: %s)\n", args, name, name, m->id, args, errval); + + g_free(name); + g_free(args); +} + static void put_method(Method *m) { @@ -2714,17 +3210,29 @@ put_method(Method *m) g_free(doc); } } + switch(m->method) { case REGULAR_METHOD: if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); + + if (m->interface) { + out_addline_outfile(out); + put_interface_parent_handler(m); + } + print_method_body(m, TRUE, TRUE); + + if (m->interface) { + out_printf(out, "#undef PARENT_HANDLER\n"); + } + /* the outfile line was added above */ break; case SIGNAL_FIRST_METHOD: @@ -2733,14 +3241,14 @@ put_method(Method *m) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); - out_addline_outfile (out); - + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); out_printf (out, "{\n"); + out_addline_outfile (out); + out_printf (out, "\tGValue ___param_values[%d];\n" "\tGValue ___return_val;\n\n" @@ -2855,7 +3363,7 @@ put_method(Method *m) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2864,13 +3372,13 @@ put_method(Method *m) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); + out_printf(out, "{\n"); out_addline_outfile(out); - out_printf(out, "{\n" - "\t%sClass *klass;\n", typebase); + out_printf(out, "\t%sClass *klass;\n", typebase); print_preconditions(m); out_printf(out, "\tklass = %s_GET_CLASS(%s);\n\n" "\tif(klass->%s)\n", @@ -2913,7 +3421,7 @@ put_method(Method *m) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2924,7 +3432,7 @@ put_method(Method *m) out_addline_infile(out, m->line_no); s = g_strdup_printf("\n___%x_", (guint)m->unique_id); print_method(out, "static ", s, "", " ", "", "\n", - m, FALSE, FALSE, FALSE, TRUE, FALSE); + m, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE); g_free(s); out_addline_outfile(out); s = replace_sep(m->otype, '_'); @@ -2952,6 +3460,15 @@ put_method(Method *m) /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -2962,32 +3479,27 @@ open_files(void) { char *outfile, *outfileh, *outfileph; - if ( ! for_cpp) - outfile = g_strconcat (fullfilebase, ".c", NULL); - else - outfile = g_strconcat (fullfilebase, ".cc", NULL); - if (no_touch_headers) - outfileh = g_strconcat (fullfilebase, ".h#gob#", NULL); - else - outfileh = g_strconcat (fullfilebase, ".h", NULL); + outfilebase = g_strconcat (fullfilebase, for_cpp ? ".cc" : ".c", NULL); + outfile = g_strconcat(outfilebase, no_touch ? "#gob#" : "", NULL); + + outfilehbase = g_strconcat (fullfilebase, ".h", NULL); + outfileh = g_strconcat(outfilehbase, no_touch_headers ? "#gob#" : "", NULL); if ((privates > 0 || protecteds > 0 || private_header == PRIVATE_HEADER_ALWAYS) && - private_header != PRIVATE_HEADER_NEVER) - outfileph = g_strconcat (fullfilebase, "-private.h", NULL); - else + private_header != PRIVATE_HEADER_NEVER) { + char sep[2] = {0,0}; + if (file_sep != 0) + sep[0] = file_sep; + outfilephbase = g_strconcat (fullfilebase, sep, "private.h", NULL); + outfileph = g_strconcat (outfilephbase, no_touch_headers ? "#gob#" : "", NULL); + } else { + outfilephbase = NULL; outfileph = NULL; + } - - if (no_write) { - devnull = fopen ("/dev/null", "w"); - if (devnull == NULL) - error_print (GOB_ERROR, 0, "Cannot open null device"); - out = devnull; - outh = devnull; - if (outfileph != NULL) - outph = devnull; - } else { + + if ( ! no_write) { out = fopen (outfile, "w"); if (out == NULL) { error_printf (GOB_ERROR, 0, @@ -3170,6 +3682,7 @@ print_ccode_block(CCode *cc) out_addline_infile(fp, cc->line_no); break; default: + case CT_CCODE: case C_CCODE: fp = out; out_printf(fp, "\n"); @@ -3186,6 +3699,7 @@ print_ccode_block(CCode *cc) } out_printf(fp, "%s\n", cc->cbuf); if(cc->cctype == C_CCODE || + cc->cctype == AD_CCODE || cc->cctype == A_CCODE || cc->cctype == AT_CCODE || cc->cctype == PH_CCODE) @@ -3199,6 +3713,12 @@ print_class_block(Class *c) char *s; gboolean printed_private = FALSE; + if (c->glade_xml) + { + out_printf(outph ? outph : outh, "#include \n"); + out_printf(outph ? outph : outh, "#include \n\n"); + } + if(any_special) { out_printf(out, "/* utility types we may need */\n"); if(special_array[SPECIAL_2POINTER]) @@ -3325,16 +3845,19 @@ print_class_block(Class *c) out_printf (outfp, "struct _%sPrivate {\n", typebase); - for(li=c->nodes; li; li=li->next) { - Node *n = li->data; - Variable *v = (Variable *)n; - if(n->type == VARIABLE_NODE && - v->scope == PRIVATE_SCOPE) { - out_addline_infile(outfp, v->line_no); - put_variable(v, outfp); + if (privates > 0) + { + for(li=c->nodes; li; li=li->next) { + Node *n = li->data; + Variable *v = (Variable *)n; + if(n->type == VARIABLE_NODE && + v->scope == PRIVATE_SCOPE) { + out_addline_infile(outfp, v->line_no); + put_variable(v, outfp); + } } + out_addline_outfile(outfp); } - out_addline_outfile(outfp); out_printf(outfp, "};\n"); } @@ -3384,8 +3907,23 @@ print_class_block(Class *c) " * Public methods\n" " */\n"); - if ( ! overrode_get_type) { - out_printf (outh, "GType\t%s_get_type\t(void);\n", funcbase); + if (!overrode_get_type) { + /* + * For ordinary "static" types it should be safe to mark the + * get_type implementation as const, since the get_type + * function return really is constant at the call boundary + * (even though there is an initial setup on the first call). + * But for dynamic types, since the registration is explicitly + * separated, we need to settle for "pure" as the results of + * get_type differ before and after type registration. + */ + out_printf(outh, "GType\t%s_get_type\t(void) %s;\n", funcbase, + c->dynamic ? "G_GNUC_PURE" : "G_GNUC_CONST"); + } + + if (c->dynamic) { + out_printf(outh, "void\t%s_register_type\t(GTypeModule *);\n", + funcbase); } for(li = c->nodes; li != NULL; li = li->next) { @@ -3453,11 +3991,13 @@ print_class_block(Class *c) add_interface_inits (c); - if ( ! overrode_get_type) { + if (!overrode_get_type) { if (c->bonobo_object_class != NULL) - add_bonobo_object_get_type (); + add_bonobo_object_get_type(); + else if (c->dynamic) + add_dynamic_get_type(); else - add_get_type (); + add_get_type(); } out_printf (out, "/* a macro for creating a new object of our type */\n"); @@ -3480,6 +4020,55 @@ print_class_block(Class *c) no_gnu ? "" : " G_GNUC_UNUSED", typebase, typebase, typebase, funcbase); + if (c->glade_xml) + { + out_printf (out, "/* a function to connect glade callback */\n"); + out_printf (out,"static void\n" + "___glade_xml_connect_foreach(const gchar *handler_name,\n" + "GObject *object,\n" + "const gchar *signal_name,\n" + "const gchar *signal_data,\n" + "GObject *connect_object,\n" + "gboolean after,\n" + "gpointer user_data)\n" + "{\n" + "\tstatic GModule * allsymbols = NULL;\n" + " \n" + "\tif (!allsymbols) allsymbols = g_module_open(NULL, 0);\n" + "\tif (allsymbols) {\n" + "\t\tgchar * func_name = g_strdup_printf(\"%s_%%s\", handler_name);\n" + "\t\tGCallback func;\n" + "\n" + "\t\tif (!g_module_symbol(allsymbols, func_name, (gpointer)&func)){\n" + "\t\t\tif (!g_module_symbol(allsymbols, handler_name, (gpointer)&func)) {\n" + "\t\t\t\tg_warning(\"could not find signal handler '%%s'.\", func_name);\n" + "\t\t\t\tg_free(func_name);\n" + "\t\t\t\treturn;\n" + "\t\t\t}\n" + "\t\t}\n" + "\t\tif (after)\n" + "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);\n" + "\t\telse\n" + "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_SWAPPED);\n" + "\t\tg_free(func_name);\n" + "\t}\n" + "}\n" + "\n", + funcbase); + } + + for (li = nodes; li != NULL; li = li->next) { + Node *node = li->data; + if (node->type == CCODE_NODE) { + CCode *cc = (CCode *)node; + if (cc->cctype == AD_CCODE) + print_ccode_block (cc); + } + } + + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -3542,16 +4131,13 @@ print_more_useful_macros (void) static void print_file_comments(void) { - time_t curtime; - time(&curtime); out_printf(outh, "/* Generated by GOB (v%s)" " (do not edit directly) */\n\n", VERSION); if(outph) out_printf(outph, "/* Generated by GOB (v%s)" " (do not edit directly) */\n\n", VERSION); - out_printf(out, "/* Generated by GOB (v%s) on %s" - " (do not edit directly) */\n\n", - VERSION, ctime(&curtime)); + out_printf(out, "/* Generated by GOB (v%s)" + " (do not edit directly) */\n\n", VERSION); out_printf(out, "/* End world hunger, donate to the World Food Programme, http://www.wfp.org */\n\n"); } @@ -3563,8 +4149,7 @@ print_includes(void) char *p; /* We may need string.h for memset */ - if(destructors > 0 && - ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) { + if ( ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) { out_printf(out, "#include /* memset() */\n\n"); } @@ -3578,11 +4163,15 @@ print_includes(void) /* if we are creating a private header see if it was included */ if(outph) { - p = g_strconcat(filebase, "-private.h", NULL); + char sep[2] = {0,0}; + if (file_sep != 0) + sep[0] = file_sep; + p = g_strconcat(filebase, sep, "private.h", NULL); if( ! g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) { - out_printf(out, "#include \"%s-private.h\"\n\n", - filebase); + out_printf(out, "#include \"%s%sprivate.h\"\n\n", + filebase, + sep); if(found_header) error_printf(GOB_WARN, 0, "Implicit private header include " @@ -3645,12 +4234,13 @@ print_all_top(void) { GList *li; - /* print the AT_CCODE blocks */ + /* print the AT_CCODE and CT_CCODE blocks */ for(li = nodes; li != NULL; li = li->next) { Node *node = li->data; if(node->type == CCODE_NODE) { CCode *cc = (CCode *)node; - if(cc->cctype == AT_CCODE) + if (cc->cctype == AT_CCODE || + cc->cctype == CT_CCODE) print_ccode_block((CCode *)node); } } @@ -3725,7 +4315,7 @@ print_enum (EnumDef *enode) g_free (str); out_printf (outh, "%s_get_type()\n", funcprefix); - out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix); + out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix); out_printf (out, "GType\n%s_get_type (void)\n" @@ -3790,7 +4380,7 @@ print_flags (Flags *fnode) g_free (str); out_printf (outh, "%s_get_type()\n", funcprefix); - out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix); + out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix); out_printf (out, "GType\n%s_get_type (void)\n" @@ -3853,7 +4443,7 @@ print_error (Error *enode) g_free (str); out_printf (outh, "%s_get_type ()\n", funcprefix); - out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix); + out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix); out_printf (out, "GType\n%s_get_type (void)\n" @@ -3911,7 +4501,8 @@ generate_outfiles(void) if (node->type == CCODE_NODE) { CCode *cc = (CCode *)node; if (cc->cctype != HT_CCODE && - cc->cctype != AT_CCODE) + cc->cctype != AT_CCODE && + cc->cctype != AD_CCODE) print_ccode_block ((CCode *)node); } else if (node->type == CLASS_NODE) { print_class_block ((Class *)node); @@ -3929,49 +4520,84 @@ generate_outfiles(void) print_header_postfixes(); } +static void print_version(void) +{ + printf("%s (%s) %s\n", PACKAGE_NAME, PACKAGE_TARNAME, PACKAGE_VERSION); + putchar('\n'); + puts("Copyright (C) 2013 George (Jiri) Lebl et al."); + puts("Copyright (C) 2020 Nick Bowler"); + puts("License GPLv2+: GNU GPL version 2 or later ."); + puts("This is free software: you are free to change and redistribute it."); + puts("There is NO WARRANTY, to the extent permitted by law."); + +} + +static void print_usage(FILE *f) +{ + fprintf(f, "Usage: %s [options] file.gob\n", g_get_prgname()); + if (f == stderr) { + fprintf(f, "Try '%s --help' for more information.\n", + g_get_prgname()); + } +} + static void print_help(void) { - fprintf(stderr, "Gob version %s\n\n", VERSION); - fprintf(stderr, "gob [options] file.gob\n\n"); - fprintf(stderr, "Options:\n" - "\t--help,-h,-? Display this help\n" - "\t--version Display version\n" - "\t--exit-on-warn,-w Exit with an error on warnings\n" - "\t--no-exit-on-warn Don't exit on warnings [default]\n" - "\t--for-cpp Create C++ files\n" - "\t--no-extern-c Never print extern \"C\" into the " - "header\n" - "\t--no-gnu Never use GNU extentions\n" - "\t--no-touch-headers Don't touch headers unless they " - "really changed\n" - "\t--always-private-header Always create a private header " - "file,\n" - "\t even if it would be empty\n" - "\t--ondemand-private-header Create private header only when " - "needed\n" - "\t [default]\n" - "\t--no-private-header Don't create a private header, " - "put private\n" - "\t structure and protected " - "prototypes inside c file\n" - "\t--always-private-struct Always create a private pointer " - "in\n" - "\t the object structure\n" - "\t--m4 Preprocess source with m4. " - "Following args will\n" - "\t be passed to m4\n" - "\t--m4-dir Print directory that will be " - "searched for m4\n" - "\t files\n" - "\t--no-write,-n Don't write output files, just " - "check syntax\n" - "\t--no-lines Don't print '#line' to output\n" - "\t--no-self-alias Don't create self type and macro " - "aliases\n" - "\t--no-kill-underscores Ignored for compatibility\n" - "\t-o,--output-dir The directory where output " - "should be placed\n"); + print_usage(stdout); + + puts( +"This is \"GObject Builder\": a simple preprocessor to help with\n" +"implementing GObject types in C.\n" + ); + + puts("Options:"); + puts(" --help,-h,-? Display this help\n" + " --version Display version\n" + " --exit-on-warn,-w Exit with an error on warnings\n" + " --no-exit-on-warn Don't exit on warnings [default]\n" + " --for-cpp Create C++ files\n" + " --no-extern-c Never print extern \"C\" into the " + "header\n" + " --no-gnu Never use GNU extentions\n" + " --no-touch Don't touch output files unless they " + "really\n" + " changed (implies --no-touch-headers)\n" + " --no-touch-headers Don't touch headers unless they " + "really changed\n" + " --always-private-header Always create a private header " + "file,\n" + " even if it would be empty\n" + " --ondemand-private-header Create private header only when " + "needed\n" + " [default]\n" + " --no-private-header Don't create a private header, " + "put private\n" + " structure and protected " + "prototypes inside c file\n" + " --always-private-struct Always create a private pointer " + "in\n" + " the object structure\n" + " --m4 Preprocess source with m4. " + "Following args will\n" + " be passed to m4\n" + " --m4-dir Print directory that will be " + "searched for m4\n" + " files\n" + " --no-write,-n Don't write output files, just " + "check syntax\n" + " --no-lines Don't print '#line' to output\n" + " --no-self-alias Don't create self type and macro " + "aliases\n" + " --no-kill-underscores Ignored for compatibility\n" + " -o,--output-dir The directory where output " + "should be placed\n" + " --file-sep[=c] replace default \'-\' file " + "name separator\n\n" + " --gtk3 Use gtk+3\n" + ); + + puts("End world hunger, donate to the World Food Programme: https://www.wfp.org/"); } static void @@ -4021,7 +4647,7 @@ parse_options(int argc, char *argv[]) /*must be a file*/ if(got_file) { fprintf(stderr, "Specify only one file!\n"); - print_help(); + print_usage(stderr); exit(1); } filename = argv[i]; @@ -4030,7 +4656,7 @@ parse_options(int argc, char *argv[]) print_help(); exit(0); } else if(strcmp(argv[i], "--version")==0) { - fprintf(stderr, "Gob version %s\n", VERSION); + print_version(); exit(0); } else if(strcmp(argv[i], "--exit-on-warn")==0) { exit_on_warn = TRUE; @@ -4038,6 +4664,9 @@ parse_options(int argc, char *argv[]) exit_on_warn = FALSE; } else if(strcmp(argv[i], "--for-cpp")==0) { for_cpp = TRUE; + } else if(strcmp(argv[i], "--no-touch")==0) { + no_touch = TRUE; + no_touch_headers = TRUE; } else if(strcmp(argv[i], "--no-touch-headers")==0) { no_touch_headers = TRUE; } else if(strcmp(argv[i], "--ondemand-private-header")==0) { @@ -4088,13 +4717,28 @@ parse_options(int argc, char *argv[]) char *p = strchr (argv[i], '='); g_assert (p != NULL); output_dir = g_strdup (p+1); + } else if (strncmp (argv[i], "--file-sep=", + strlen ("--file-sep=")) == 0) { + char *p = strchr (argv[i], '='); + g_assert (p != NULL); + file_sep = *(p+1); + } else if (strncmp (argv[i], "--file-sep", + strlen ("--file-sep")) == 0) { + if (i+1 < argc) { + file_sep = (argv[i+1])[0]; + i++; + } else { + file_sep = 0; + } + } else if(strcmp(argv[i], "--gtk3")==0) { + gtk3_ok = TRUE; } else if(strcmp(argv[i], "--")==0) { /*further arguments are files*/ no_opts = TRUE; } else if(strncmp(argv[i], "--", 2)==0) { /*unknown long option*/ fprintf(stderr, "Unknown option '%s'!\n", argv[i]); - print_help(); + print_usage(stderr); exit(1); } else { /*by now we know we have a string starting with @@ -4115,7 +4759,7 @@ parse_options(int argc, char *argv[]) default: fprintf(stderr, "Unknown option '%c'!\n", *p); - print_help(); + print_usage(stderr); exit(1); } } @@ -4136,42 +4780,88 @@ parse_options(int argc, char *argv[]) #endif } -/* this is a somewhat ugly hack, but it appears to work */ static void -compare_and_move_header(void) +compare_and_move (const char *old_filename) { - char *hfnew = g_strconcat(fullfilebase, ".h#gob#", NULL); - char *hf = g_strconcat(fullfilebase, ".h", NULL); - struct stat s; - if(stat(hf, &s) == 0) { - char *s; - s = g_strdup_printf("cmp '%s' '%s' > /dev/null", hf, hfnew); - if(system(s) == 0) { - if(unlink(hfnew) != 0) - error_printf(GOB_ERROR, 0, - "Can't remove new header file"); - g_free(hfnew); - g_free(hf); - g_free(s); - return; + char *new_filename = g_strconcat (old_filename, "#gob#", NULL); + FILE *old_f; + gboolean equal = FALSE; + + old_f = fopen (old_filename, "r"); + if (old_f) { + FILE *new_f; + gboolean error = FALSE; + + new_f = fopen (new_filename, "r"); + if (new_f) { + char new_buf[1024]; + char old_buf[1024]; + + while (TRUE) { + size_t new_n; + size_t old_n; + + new_n = fread (new_buf, 1, sizeof (new_buf), new_f); + if (ferror (new_f)) { + error = TRUE; + error_printf (GOB_ERROR, 0, + "Can't read %s: %s", + new_filename, + g_strerror (errno)); + break; + } + + old_n = fread (old_buf, 1, sizeof (old_buf), old_f); + if (ferror (old_f) + || feof (new_f) != feof (old_f) + || new_n != old_n + || memcmp (new_buf, old_buf, new_n) != 0) + break; + + if (feof (new_f)) { + equal = TRUE; + break; + } + } + } else + error_printf (GOB_ERROR, 0, "Can't open %s: %s", + new_filename, g_strerror (errno)); + + fclose (old_f); + fclose (new_f); + + if (error) + goto end; + + if (! equal && unlink (old_filename) != 0) { + error_printf (GOB_ERROR, 0, "Can't remove %s: %s", + old_filename, g_strerror (errno)); + goto end; } - g_free(s); - if(unlink(hf) != 0) - error_printf(GOB_ERROR, 0, - "Can't remove old header file"); - } - if(rename(hfnew, hf) != 0) - error_printf(GOB_ERROR, 0, - "Can't rename new header file"); - g_free(hfnew); - g_free(hf); + } + + if (equal) { + if (unlink (new_filename) != 0) + error_printf (GOB_ERROR, 0, "Can't remove %s: %s", + new_filename, g_strerror (errno)); + } else { + if (rename (new_filename, old_filename) != 0) + error_printf (GOB_ERROR, 0, "Can't rename %s to %s: %s", + new_filename, old_filename, + g_strerror (errno)); + } + + end: + g_free (new_filename); } int main(int argc, char *argv[]) { + g_set_prgname(argc > 0 ? argv[0] : "gob2"); + parse_options(argc, argv); - + if(use_m4) { yyin = popen(m4_commandline, "r"); if(!yyin) { @@ -4218,19 +4908,29 @@ main(int argc, char *argv[]) unreftors = count_unreftors ((Class *)class); destructors = count_destructors ((Class *)class); initializers = count_initializers ((Class *)class); + glade_widgets = count_glade_widgets ((Class *)class); overrode_get_type = find_get_type ((Class *)class); make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); @@ -4243,6 +4943,7 @@ main(int argc, char *argv[]) check_property_types ((Class *)class); check_argument_types ((Class *)class); check_func_arg_checks ((Class *)class); + check_func_attrs ((Class *)class); check_for_class_destructors ((Class *)class); exit_on_error = TRUE; @@ -4256,18 +4957,23 @@ main(int argc, char *argv[]) generate_outfiles (); - if (devnull) { - fclose (devnull); - } else { + if (out) fclose (out); + if (outh) fclose (outh); - if (outph) - fclose (outph); + if (outph) + fclose (outph); + + if (!no_write) { + if (no_touch) { + compare_and_move(outfilebase); + } + if (no_touch_headers) { + compare_and_move(outfilehbase); + if (outfilephbase) + compare_and_move(outfilephbase); + } } - if (no_touch_headers && - ! no_write) - compare_and_move_header (); - return 0; }