X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/4d534c82fb65897999ade6867534ab952a9bc019..797c9847e8b7ddf6dd0bb39d21bdda4c8f20ca07:/src/main.c diff --git a/src/main.c b/src/main.c index 186ac59..0e6c55c 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-2022 Nick Bowler * * Author: George (Jiri) Lebl * @@ -21,7 +22,7 @@ * USA. */ -#include "config.h" +#include #include #include #include @@ -30,15 +31,26 @@ #include #include #include +#include +#include #include "treefuncs.h" #include "parse.h" #include "out.h" #include "util.h" #include "checks.h" +#include "help.h" #include "main.h" +#include "options.h" + +static const char sopts[] = SOPT_STRING; +static const struct option lopts[] = { + LOPTS_INITIALIZER, + { 0 } +}; + char *filename = NULL; int yyparse(void); @@ -70,7 +82,7 @@ static char *ptypebase; char *output_dir = NULL; -static char file_sep = '-'; +char file_sep = '-'; static int signals = 0; /* number of signals */ static int set_properties = 0; /* number of named (set) properties */ @@ -92,16 +104,20 @@ 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; @@ -116,10 +132,13 @@ 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 */ char *m4_commandline = NULL; #define M4_INCLUDE_DIR PKGDATADIR "/m4" #define M4_BASE_FILENAME "gobm4.m4" @@ -200,6 +219,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, @@ -255,7 +275,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 @@ -270,6 +311,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; @@ -292,6 +336,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; @@ -331,6 +378,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; @@ -372,11 +422,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 @@ -385,8 +436,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 @@ -424,7 +477,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 */ @@ -435,7 +488,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 */ @@ -447,7 +500,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); } } @@ -509,15 +562,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 @@ -529,7 +584,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 */ @@ -538,16 +593,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); } } @@ -630,66 +696,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); } @@ -876,10 +944,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", @@ -896,6 +964,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) { @@ -945,7 +1066,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 @@ -979,7 +1102,7 @@ add_interface_methods (Class *c, const char *interface) } static void -add_interface_inits (Class *c) +add_interface_inits(Class *c) { GList *li; @@ -989,30 +1112,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); + char *name = replace_sep(li->data, '_'); + char *type = interface_type(li->data); - /* 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"; + out_printf(out, "static void\n" + "___%s_init (%s *iface)\n" + "{\n", name, type); - out_printf (out, "\nstatic void\n" - "___%s_init (%s%s *iface)\n" - "{\n", - name, type, end); + add_interface_methods(c, li->data); - add_interface_methods (c, interface); - - 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); @@ -1020,154 +1132,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\t%d /* n_preallocs */,\n" - "\t\t\t(GInstanceInitFunc) %s_init,\n" - "\t\t\tNULL\n" - "\t\t};\n\n", - funcbase, typebase, funcbase, typebase, prealloc, funcbase); - - add_interface_infos (); + if (!c->interfaces) + return; - out_printf (out, - "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)%s);\n", - pmacrotype, typebase, ((Class *)class)->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); + 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"; + + 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"); +} - add_interfaces (); +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 @@ -1251,7 +1508,7 @@ make_run_signal_flags(Method *m, gboolean last) "perhaps it was misspelled", flag); } - g_string_sprintfa(gs, " | G_SIGNAL_%s", flag); + g_string_append_printf(gs, " | G_SIGNAL_%s", flag); } { @@ -1297,14 +1554,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, @@ -1475,7 +1732,7 @@ make_argument (Argument *a) if(strcmp(argflags[i], flag)==0) break; } - g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); + g_string_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); } g_string_append (flags, ")"); @@ -1564,13 +1821,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); @@ -1606,28 +1863,28 @@ make_property (Property *p) if (p->override) { if (p->flags != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, flags ignored"); + "Overridden property, flags ignored"); if (p->nick != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, nick ignored"); + "Overridden property, nick ignored"); if (p->blurb != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, blurb ignored"); + "Overridden property, blurb ignored"); if (p->minimum != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, minimum ignored"); + "Overridden property, minimum ignored"); if (p->maximum != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, maximum ignored"); + "Overridden property, maximum ignored"); if (p->default_value != NULL) error_print (GOB_WARN, p->line_no, - "Overriden property, default_value ignored"); + "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, p->name); + "\t\t\"%s\");\n", s, value_for_print (p->canonical_name, p->name) ); g_free (s); } else { GString *flags; @@ -1665,7 +1922,7 @@ make_property (Property *p) if(strcmp(argflags[i], flag)==0) break; } - g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); + g_string_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); } g_string_append (flags, ")"); @@ -1679,7 +1936,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1695,7 +1952,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1709,7 +1966,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1723,7 +1980,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1739,7 +1996,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1755,7 +2012,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1771,7 +2028,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1787,7 +2044,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1803,7 +2060,7 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1817,7 +2074,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1832,7 +2089,7 @@ make_property (Property *p) "\t\t %s /* enum_type */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), type, @@ -1849,7 +2106,7 @@ make_property (Property *p) "\t\t %s /* flags_type */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), type, @@ -1865,10 +2122,10 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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_MINFLOAT"), + value_for_print (p->minimum, "-G_MAXFLOAT"), value_for_print (p->maximum, "G_MAXFLOAT"), value_for_print (p->default_value, "0.0"), flags->str); @@ -1881,10 +2138,10 @@ make_property (Property *p) "\t\t %s /* maximum */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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_MINDOUBLE"), + value_for_print (p->minimum, "-G_MAXDOUBLE"), value_for_print (p->maximum, "G_MAXDOUBLE"), value_for_print (p->default_value, "0.0"), flags->str); @@ -1895,7 +2152,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* default_value */,\n" "\t\t %s);\n", - p->name, + 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"), @@ -1909,7 +2166,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* param_type */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), type, @@ -1924,7 +2181,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* boxed_type */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), type, @@ -1936,7 +2193,7 @@ make_property (Property *p) "\t\t %s /* nick */,\n" "\t\t %s /* blurb */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), flags->str); @@ -1947,7 +2204,7 @@ make_property (Property *p) "\t\t %s /* nick */,\n" "\t\t %s /* blurb */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), flags->str); @@ -1960,7 +2217,7 @@ make_property (Property *p) "\t\t %s /* blurb */,\n" "\t\t %s /* object_type */,\n" "\t\t %s);\n", - p->name, + value_for_print (p->canonical_name, p->name), value_for_print (p->nick, "NULL"), value_for_print (p->blurb, "NULL"), type, @@ -2034,10 +2291,12 @@ print_initializer(Method *m, Variable *v) if (v->initializer_simple) out_printf(out, "\t%s->%s = %s;\n", root, v->id, v->initializer); - else if (!strcmp(v->id, "_glade_xml")) + 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,v->initializer); + out_printf(out, "%s", v->initializer); if(v->initializer_line > 0) out_addline_outfile(out); @@ -2111,13 +2370,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) { @@ -2128,7 +2430,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" : "", @@ -2136,6 +2438,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); @@ -2144,29 +2450,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) { @@ -2179,7 +2499,8 @@ 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"; @@ -2195,6 +2516,10 @@ add_finalize (Class *c) } 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); @@ -2203,25 +2528,23 @@ add_finalize (Class *c) if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + 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) { + print_destructors (c); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); } - 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); - } - } - out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } @@ -2256,6 +2579,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) { @@ -2276,23 +2644,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_TYPE_INSTANCE_GET_PRIVATE(%s,%s,%sPrivate);\n", - ((FuncArg *)m->args->data)->name, - ((FuncArg *)m->args->data)->name, - macrotype, - 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; @@ -2325,15 +2687,18 @@ 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::class_init\"\n", c->otype); if (set_properties > 0 || get_properties > 0 || signals > 0 || + need_constructor || need_dispose || need_finalize) { out_printf(out, @@ -2350,11 +2715,7 @@ add_inits(Class *c) ((FuncArg *)m->args->data)->name, did_base_obj); - if (privates > 0) - out_printf (out, - "\n\tg_type_class_add_private(%s,sizeof(%sPrivate));\n", - ((FuncArg *)m->args->data)->name, - typebase); + add_class_private(c, m); if (initializers > 0) { GList *li; @@ -2382,6 +2743,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"); @@ -2677,10 +3041,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) @@ -2806,12 +3170,41 @@ get_arg_names_for_macro (Method *m) sep = ""; for(li=m->args;li;li=g_list_next(li)) { FuncArg *arg = li->data; - g_string_sprintfa (gs, "%s___%s", sep, arg->name); + g_string_append_printf(gs, "%s___%s", sep, arg->name); sep = ","; } 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) { @@ -2827,17 +3220,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: @@ -2846,14 +3251,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" @@ -2968,7 +3373,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; @@ -2977,13 +3382,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", @@ -3026,7 +3431,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; @@ -3037,7 +3442,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, '_'); @@ -3065,6 +3470,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; } @@ -3078,7 +3492,7 @@ open_files(void) outfilebase = g_strconcat (fullfilebase, for_cpp ? ".cc" : ".c", NULL); outfile = g_strconcat(outfilebase, no_touch ? "#gob#" : "", NULL); - outfilehbase = g_strconcat (fullfilebase, ".h"); + outfilehbase = g_strconcat (fullfilebase, ".h", NULL); outfileh = g_strconcat(outfilehbase, no_touch_headers ? "#gob#" : "", NULL); if ((privates > 0 || protecteds > 0 || @@ -3088,22 +3502,14 @@ open_files(void) if (file_sep != 0) sep[0] = file_sep; outfilephbase = g_strconcat (fullfilebase, sep, "private.h", NULL); - outfileph = g_strconcat (outfilephbase, no_touch ? "#gob#" : "", 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, @@ -3286,6 +3692,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"); @@ -3302,6 +3709,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) @@ -3509,8 +3917,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 && !no_gnu) { + /* + * 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) { @@ -3578,11 +4001,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"); @@ -3642,6 +4067,18 @@ print_class_block(Class *c) 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); @@ -3736,11 +4173,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 " @@ -3803,12 +4244,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); } } @@ -3883,7 +4325,8 @@ 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)%s;\n\n", + funcprefix, no_gnu ? "": " G_GNUC_CONST"); out_printf (out, "GType\n%s_get_type (void)\n" @@ -3948,7 +4391,8 @@ 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)%s;\n\n", + funcprefix, no_gnu ? "" : " G_GNUC_CONST"); out_printf (out, "GType\n%s_get_type (void)\n" @@ -4011,7 +4455,8 @@ 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)%s;\n\n", + funcprefix, no_gnu ? "" : " G_GNUC_CONST"); out_printf (out, "GType\n%s_get_type (void)\n" @@ -4069,7 +4514,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); @@ -4087,232 +4533,192 @@ generate_outfiles(void) print_header_postfixes(); } -static void -print_help(void) +static void print_version(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 Don't touch output files unless they " - "really\n" - "\t changed (implies --no-touch-headers)\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" - "\t--file-sep[=c] replace default \'-\' file " - "name separator\n"); + printf("%s (%s) %s\n", PACKAGE_NAME, PACKAGE_TARNAME, PACKAGE_VERSION); + puts("Copyright (C) 2013 George (Jiri) Lebl et al."); + puts("Copyright (C) 2022 Nick Bowler"); + puts("License GPLv2+: GNU GPL version 2 or any later version"); + 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 -parse_options(int argc, char *argv[]) +static void print_usage(FILE *f) { - int i; - int got_file = FALSE; - int no_opts = FALSE; - int m4_opts = FALSE; /* if we are just passing on args to m4 */ - - filename = NULL; - - for(i = 1 ; i < argc; i++) { - if(m4_opts) { - char *new_commandline; - g_assert(m4_commandline!=NULL); - - /* check whether this one looks like the filename */ - if((!strcmp(argv[i],"-") || argv[i][0] != '-') - && !got_file) { - const gchar *m4_flags=use_m4_clean?"":M4_FLAGS; - filename = argv[i]; - got_file = TRUE; - - /* insert flags before the filename */ - new_commandline=g_strconcat(m4_commandline, - " ", - m4_flags, - " ", - argv[i], - NULL); - } + 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()); + } +} - /* just an ordinary option */ - else - new_commandline=g_strconcat(m4_commandline, - " ", - argv[i], - NULL); - - /* free old commandline */ - g_free(m4_commandline); - m4_commandline=new_commandline; - - } else if(no_opts || - argv[i][0] != '-') { - /*must be a file*/ - if(got_file) { - fprintf(stderr, "Specify only one file!\n"); - print_help(); - exit(1); - } - filename = argv[i]; - got_file = TRUE; - } else if(strcmp(argv[i], "--help")==0) { - print_help(); - exit(0); - } else if(strcmp(argv[i], "--version")==0) { - fprintf(stderr, "Gob version %s\n", VERSION); - exit(0); - } else if(strcmp(argv[i], "--exit-on-warn")==0) { - exit_on_warn = TRUE; - } else if(strcmp(argv[i], "--no-exit-on-warn")==0) { - 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) { - private_header = PRIVATE_HEADER_ONDEMAND; - } else if(strcmp(argv[i], "--always-private-header")==0) { - private_header = PRIVATE_HEADER_ALWAYS; - } else if(strcmp(argv[i], "--no-private-header")==0) { - private_header = PRIVATE_HEADER_NEVER; - } else if(strcmp(argv[i], "--no-gnu")==0) { - no_gnu = TRUE; - } else if(strcmp(argv[i], "--no-extern-c")==0) { - no_extern_c = TRUE; - } else if(strcmp(argv[i], "--no-write")==0) { +static void print_help(void) +{ + const struct option *opt; + + print_usage(stdout); + + puts("This is \"GObject Builder\": a simple preprocessor to help with\n" + "implementing GObject types in C."); + + puts("\nOptions:"); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + + /* Don't display obsolete options that don't do anything */ + if (!opt->flag && !opt->val) + continue; + + if (!lopt_get_help(opt, &help)) + continue; + + help_print_option(opt, help.arg, help.desc, 20); + } + putchar('\n'); + + puts("End world hunger, donate to the World Food Programme: https://www.wfp.org/"); +} + +/* + * Called after getopt_long receives an --m4 argument. Immediately stop + * processing options. Then all non-option arguments seen so far together + * with all remaining arguments are appended to M4_COMMANDLINE. If m4_clean + * is false, then M4_FLAGS is inserted before the first non-option argument, + * if any. + * + * The resulting string is returned, which should be freed by the caller. + */ +static char *parse_m4_options(int argc, char **argv, gboolean m4_clean) +{ + char **nonopt = NULL, *save_argv0, *ret; + int opt; + + /* First, conclude getopt run and reset with remaining args */ + getopt_long(optind, argv, sopts, lopts, NULL); + argv += optind-1; + argc -= optind-1; + optind = 0; + + save_argv0 = argv[0]; + argv[0] = M4_COMMANDLINE; + + if (m4_clean) { + ret = g_strjoinv(" ", argv); + argv[0] = save_argv0; + return ret; + } + + /* Locate first non-option argument, if any. */ + while ((opt = getopt_long(argc, argv, "-", NULL, NULL)) != -1) { + if (opt == 1) { + nonopt = &argv[optind-2]; + break; + } + } + + /* If there is a non-option but the above didn't see it, must be "--" */ + if (!nonopt && argv[optind]) + nonopt = &argv[optind-2]; + + if (nonopt) { + /* Found non-option, insert M4_FLAGS just before it. */ + char *save_argv[3] = { nonopt[0], nonopt[1], nonopt[2] }; + + nonopt[1] = M4_FLAGS; + nonopt[2] = NULL; + nonopt[0] = g_strjoinv(" ", argv); + + nonopt[1] = save_argv[1]; + nonopt[2] = save_argv[2]; + ret = g_strjoinv(" ", nonopt); + + g_free(nonopt[0]); + nonopt[0] = save_argv[0]; + } else { + /* Only options, not inserting M4_FLAGS. */ + ret = g_strjoinv(" ", argv); + } + + argv[0] = save_argv0; + return ret; +} + +static int parse_options(int argc, char **argv) +{ + gboolean show_m4_dir = FALSE, m4_clean = FALSE; + char *raw_file_sep = "-"; + int opt; + + opterr = 0; + while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { + switch (opt) { + case 'n': no_write = TRUE; - } else if(strcmp(argv[i], "--no-lines")==0) { - no_lines = TRUE; - } else if(strcmp(argv[i], "--no-self-alias")==0) { - no_self_alias = TRUE; - } else if(strcmp(argv[i], "--no-kill-underscores")==0) { - /* no op */; - } else if(strcmp(argv[i], "--always-private-struct")==0) { - always_private_struct = TRUE; - } else if(strcmp(argv[i], "--m4-dir")==0) { - printf("%s\n",M4_INCLUDE_DIR); - exit(0); - } else if(strcmp(argv[i], "--m4")==0) { - use_m4 = TRUE; - use_m4_clean=FALSE; - m4_opts = TRUE; - m4_commandline=g_strdup(M4_COMMANDLINE); - } else if(strcmp(argv[i], "--m4-clean")==0) { + break; + case 'o': + output_dir = optarg; + break; + case 'w': + exit_on_warn = TRUE; + break; + case LOPT_FILE_SEP: + raw_file_sep = optarg ? optarg : ""; + break; + case LOPT_M4_DIR: + show_m4_dir = TRUE; + break; + case LOPT_NO_TOUCH: + no_touch = no_touch_headers = TRUE; + break; + case LOPT_M4_CLEAN: + m4_clean = TRUE; + case LOPT_M4: use_m4 = TRUE; - use_m4_clean=TRUE; - m4_opts = TRUE; - m4_commandline=g_strdup(M4_COMMANDLINE); - } else if (strcmp (argv[i], "-o") == 0 || - strcmp (argv[i], "--output-dir") == 0) { - if (i+1 < argc) { - output_dir = g_strdup (argv[i+1]); - i++; - } else { - output_dir = NULL; - } - } else if (strncmp (argv[i], "-o=", strlen ("-o=")) == 0 || - strncmp (argv[i], - "--output-dir=", - strlen ("--output-dir=")) == 0) { - 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], "--")==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(); - exit(1); - } else { - /*by now we know we have a string starting with - - which is a short option string*/ - char *p; - for(p = argv[i] + 1; *p; p++) { - switch(*p) { - case 'w': - exit_on_warn=TRUE; - break; - case 'n': - no_write = TRUE; - break; - case 'h': - case '?': - print_help(); - exit(0); - default: - fprintf(stderr, - "Unknown option '%c'!\n", *p); - print_help(); - exit(1); - } + m4_commandline = parse_m4_options(argc, argv, m4_clean); + goto out; + case LOPT_VERSION: + print_version(); + return 1; + default: + if (optopt == '?') { + case 'h': + print_help(); + return 1; } + + /* Rewind getopt to get internal error messages. */ + optind = 0, opterr = 1; + while (getopt_long(argc, argv, sopts, lopts, NULL) + != opt); + return -1; + case 0: /* no-op or option set by flag */; } } -#if 0 - /* if we are using m4, and got no filename, append m4 flags now */ - if(!got_file && use_m4 && !use_m4_clean) { - char *new_commandline; - new_commandline=g_strconcat(m4_commandline, - " ", - M4_FLAGS, - NULL); - g_free(m4_commandline); - m4_commandline=new_commandline; + filename = argv[optind]; + if (argc > optind+1) { + char *s = g_strjoinv(" ", argv+optind+1); + fprintf(stderr, "%s: Warning: excess arguments ignored: %s\n", + g_get_prgname(), s); + g_free(s); + if (exit_on_warn) + return -1; + } +out: + file_sep = raw_file_sep[0]; + if (raw_file_sep[0] && raw_file_sep[1]) { + fprintf(stderr, "%s: Warning: --file-sep characters beyond the first are ignored\n", + g_get_prgname()); + if (exit_on_warn) + return -1; + } + + if (show_m4_dir) { + printf("%s\n", M4_INCLUDE_DIR); + return 1; } -#endif + + return 0; } static void @@ -4393,8 +4799,18 @@ compare_and_move (const char *old_filename) int main(int argc, char *argv[]) { - parse_options(argc, argv); - + int rc; + + g_set_prgname(argc > 0 ? argv[0] : "gob2"); + + rc = parse_options(argc, argv); + if (rc < 0) { + print_usage(stderr); + return EXIT_FAILURE; + } else if (rc > 0) { + return EXIT_SUCCESS; + } + if(use_m4) { yyin = popen(m4_commandline, "r"); if(!yyin) { @@ -4446,15 +4862,24 @@ main(int argc, char *argv[]) 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); @@ -4467,6 +4892,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; @@ -4480,24 +4906,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_write) { if (no_touch) { - compare_and_move (outfilebase); + compare_and_move(outfilebase); + } + if (no_touch_headers) { + compare_and_move(outfilehbase); if (outfilephbase) - compare_and_move (outfilephbase); + compare_and_move(outfilephbase); } - if (no_touch_headers) - compare_and_move (outfilehbase); } - + return 0; }