X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b3db2950b11fc5f3abd9ecdae855746e2d19c836..4d534c82fb65897999ade6867534ab952a9bc019:/src/main.c diff --git a/src/main.c b/src/main.c index c94c805..186ac59 100644 --- a/src/main.c +++ b/src/main.c @@ -1,9 +1,9 @@ /* GOB C Preprocessor * Copyright (C) 1999,2000 the Free Software Foundation. * Copyright (C) 2000 Eazel, Inc. - * Copyright (C) 2001-2004 George Lebl + * Copyright (C) 2001-2004 George (Jiri) Lebl * - * Author: George Lebl + * Author: George (Jiri) Lebl * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -54,6 +55,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 +70,8 @@ static char *ptypebase; char *output_dir = NULL; +static 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 +81,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 @@ -96,6 +103,7 @@ 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 +116,7 @@ gboolean no_write = FALSE; gboolean no_lines = FALSE; gboolean no_self_alias = FALSE; gboolean always_private_struct = 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 +131,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 && @@ -193,7 +202,9 @@ print_method (FILE *fp, const Method *m, gboolean one_arg_per_line, gboolean no_funcbase, - gboolean kill_underscore) + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) { GList *li; const char *id; @@ -214,16 +225,29 @@ print_method (FILE *fp, if(m->args) { for(li=m->args; li; li=g_list_next(li)) { FuncArg *arg = li->data; + const char *unused = ""; + + if ( ! no_gnu && + ! for_cpp && /* g++ has a cow with this */ + li == m->args && + first_unused) { + unused = " G_GNUC_UNUSED"; + } + print_type(fp, arg->atype, FALSE); + if (fake_names) + out_printf (fp, "___fake___"); if(li->next) - out_printf(fp, "%s%s,%s", arg->name, + out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", + unused, one_arg_per_line ? "\n\t\t\t\t\t" : " "); else - out_printf(fp, "%s%s", arg->name, + out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? - arg->atype->postfix : ""); + arg->atype->postfix : "", + unused); } if(m->vararg) out_printf(fp, ",%s...", @@ -256,9 +280,8 @@ any_method_to_alias(Class *c) } -/* just the vararg macros, we use the same func pointers for these as in non-gnu */ static void -make_method_gnu_aliases(Class *c) +make_method_aliases (Class *c) { GList *li; @@ -272,51 +295,12 @@ make_method_gnu_aliases(Class *c) m->method == OVERRIDE_METHOD) continue; - if(m->args != NULL) - out_printf(out, "#define self_%s(args...) " - "%s_%s(args)\n", m->id, - funcbase, m->id); - else - out_printf(out, "#define self_%s() " - "%s_%s()\n", m->id, - funcbase, m->id); - } - } -} - -static void -make_method_nongnu_aliases(Class *c) -{ - GList *li; - - gboolean local_made_aliases = FALSE; - - for(li=c->nodes; li; li=g_list_next(li)) { - Node *node = li->data; - if(node->type == METHOD_NODE) { - Method *m = (Method *)node; - - if(m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD || - m->method == OVERRIDE_METHOD) - continue; - - if( ! local_made_aliases) - out_printf(out, "\n/* Short form pointers */\n"); - - print_method(out, "static ", "(* const self_", "", ") ", - "", "", - m, FALSE, TRUE, FALSE); - out_printf(out, " = %s_%s;\n", funcbase, - m->id); - - local_made_aliases = TRUE; + out_printf (out, "#define self_%s %s_%s\n", + m->id, + funcbase, + m->id); } } - if(local_made_aliases) { - out_printf(out, "\n"); - made_aliases = TRUE; - } } static void @@ -389,10 +373,10 @@ 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); + m, FALSE, TRUE, TRUE, FALSE, FALSE); else print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE); + m, FALSE, TRUE, TRUE, FALSE, FALSE); } static void @@ -401,7 +385,8 @@ put_pub_method(const Method *m) if(m->scope != PUBLIC_SCOPE) return; - print_method(outh, "", "\t", "", "\t", "", ";\n", m, TRUE, FALSE, TRUE); + print_method(outh, "", "\t", "", "\t", "", ";\n", m, + TRUE, FALSE, TRUE, FALSE, FALSE); } static void @@ -434,35 +419,35 @@ put_signal_macro (const Method *m, gboolean gnu) /* connect */ out_printf (outh, "#define %s_connect__%s(object,func,data)\t" "g_signal_connect(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ out_printf (outh, "#define %s_connect_after__%s(object,func,data)\t" "g_signal_connect_after(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ out_printf (outh, "#define %s_connect_data__%s" "(object,func,data,destroy_data,flags)\t" "g_signal_connect_data(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -529,10 +514,10 @@ put_prot_method(const Method *m) if(outph) print_method(outph, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else print_method(out, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } static void @@ -544,7 +529,7 @@ put_priv_method_prot(const Method *m) if(m->cbuf) print_method(out, "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -555,14 +540,14 @@ put_priv_method_prot(const Method *m) char *s = g_strdup_printf("___%x_", (guint)m->unique_id); print_method(out, "static ", s, "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD) { print_method(out, "static ", "", "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -757,6 +742,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); @@ -783,6 +770,11 @@ add_signal_prots(Method *m) gboolean ret_none = FALSE; gboolean arglist_none = FALSE; const char *retcast; + const char *unused = ""; + + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } if (m->method != SIGNAL_LAST_METHOD && m->method != SIGNAL_FIRST_METHOD) @@ -829,12 +821,15 @@ add_signal_prots(Method *m) out_printf (out, "\nstatic void\n" "___marshal_%s (GClosure *closure,\n" - "\tGValue *return_value,\n" + "\tGValue *return_value%s,\n" "\tguint n_param_values,\n" "\tconst GValue *param_values,\n" - "\tgpointer invocation_hint,\n" + "\tgpointer invocation_hint%s,\n" "\tgpointer marshal_data)\n" - "{\n", s); + "{\n", + s, + unused, + unused); if ( ! ret_none) out_printf (out, "\t%s v_return;\n", retcast); @@ -892,6 +887,12 @@ add_signal_prots(Method *m) g_free (set_func); } + if (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */) { + if (ret_none) + out_printf (out, "\n\treturn_value = NULL;\n"); + out_printf (out, "\tinvocation_hint = NULL;\n"); + + } out_printf (out, "}\n\n"); } @@ -1078,16 +1079,17 @@ add_get_type(void) "\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%d /* n_preallocs */,\n" "\t\t\t(GInstanceInitFunc) %s_init,\n" + "\t\t\tNULL\n" "\t\t};\n\n", - funcbase, typebase, funcbase, typebase, funcbase); + funcbase, typebase, funcbase, typebase, prealloc, funcbase); add_interface_infos (); out_printf (out, - "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)0);\n", - pmacrotype, typebase); + "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)%s);\n", + pmacrotype, typebase, ((Class *)class)->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0"); add_interfaces (); @@ -1313,9 +1315,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"); @@ -1323,18 +1332,15 @@ add_signals(Class *c) if(strcmp(m->gtktypes->data, "NONE") != 0 || ! is_none) { GList *gl, *al; - const char *sep = ""; out_printf(out, "\tif ___GOB_UNLIKELY("); if(strcmp(m->gtktypes->data, "NONE") != 0) { - out_printf(out, "%s sizeof(", sep); + out_printf(out, "sizeof("); print_type(out, m->mtype, FALSE); out_printf(out, "%s", m->mtype->postfix ? m->mtype->postfix : ""); - out_printf(out, ") != sizeof(%s)", + out_printf(out, ") != sizeof(%s) || ", get_cast(m->gtktypes->data, FALSE)); - - sep = " || "; } for(al = m->args->next, gl = m->gtktypes->next; @@ -1343,16 +1349,18 @@ add_signals(Class *c) FuncArg *arg = al->data; char *gtkarg = gl->data; - out_printf(out, "%ssizeof(", sep); + out_printf(out, "sizeof("); print_type(out, arg->atype, FALSE); out_printf(out, "%s", arg->atype->postfix ? arg->atype->postfix : ""); - out_printf(out, ") != sizeof(%s)", + out_printf(out, ") != sizeof(%s) || ", get_cast(gtkarg, FALSE)); - - sep = " || "; } + + out_printf (out, + "parent_class == NULL /* avoid warning */"); + out_printf(out, ") {\n" "\t\tg_error(\"%s line %d: Type mismatch " "of \\\"%s\\\" signal signature\");\n" @@ -1436,8 +1444,8 @@ make_argument (Argument *a) char *argflags[] = { "CONSTRUCT", "CONSTRUCT_ONLY", - "CHILD_ARG", - "MASK", + "LAX_VALIDATION", + "PRIVATE", NULL }; @@ -1467,13 +1475,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, ")"); @@ -1594,367 +1596,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, + "Overriden property, flags ignored"); + if (p->nick != NULL) + error_print (GOB_WARN, p->line_no, + "Overriden property, nick ignored"); + if (p->blurb != NULL) + error_print (GOB_WARN, p->line_no, + "Overriden property, blurb ignored"); + if (p->minimum != NULL) + error_print (GOB_WARN, p->line_no, + "Overriden property, minimum ignored"); + if (p->maximum != NULL) + error_print (GOB_WARN, p->line_no, + "Overriden property, maximum ignored"); + if (p->default_value != NULL) + error_print (GOB_WARN, p->line_no, + "Overriden 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); + 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", + 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_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 @@ -1965,8 +1991,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; @@ -1982,6 +2015,9 @@ static void print_initializer(Method *m, Variable *v) { char *root; + + if(v->glade_widget) + return; if(v->initializer == NULL) return; @@ -1995,8 +2031,13 @@ 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")) + out_printf(out,v->initializer, ((FuncArg *)m->args->data)->name); + else + out_printf(out,v->initializer); if(v->initializer_line > 0) out_addline_outfile(out); @@ -2004,6 +2045,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) { @@ -2021,11 +2084,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); @@ -2058,8 +2129,10 @@ add_dispose (Class *c) c->otype); if (unreftors > 0) { - out_printf (out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); + out_printf (out, "\t%s *self%s = %s (obj_self);\n", + typebase, + ! no_gnu ? " G_GNUC_UNUSED" : "", + macrobase); } if (dispose_handler != NULL) { @@ -2090,9 +2163,6 @@ add_dispose (Class *c) } } - out_printf (out, "\treturn;\n"); - if (unreftors > 0) - out_printf(out, "\tself = NULL;\n"); out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } @@ -2110,11 +2180,18 @@ add_finalize (Class *c) if (privates > 0 || destructors > 0) { - out_printf(out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); + const char *unused = ""; + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + 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) { @@ -2145,14 +2222,6 @@ add_finalize (Class *c) } } - if (privates > 0) { - out_printf(out, "\tg_free (priv);\n"); - } - out_printf (out, "\treturn;\n"); - if (destructors > 0 || - privates > 0) - out_printf (out, "\tself = NULL;\n"); - out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } @@ -2190,13 +2259,16 @@ make_bonobo_object_epv (Class *c, const char *classname) static void add_inits(Class *c) { + const char *unused = ""; GList *li; + + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + for(li=c->nodes;li;li=g_list_next(li)) { Node *n = li->data; Method *m; - gboolean add_unused_class = FALSE; - if(n->type != METHOD_NODE) continue; m = (Method *)n; @@ -2204,17 +2276,19 @@ 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); + m, FALSE, FALSE, TRUE, TRUE, FALSE); if(m->line_no > 0) out_addline_outfile(out); out_printf(out, "{\n" "#define __GOB_FUNCTION__ \"%s::init\"\n", c->otype); - if(privates > 0) { + if (privates > 0) { out_printf(out, "\t%s->_priv = " - "g_new0 (%sPrivate, 1);\n", - ((FuncArg *)m->args->data)->name, - typebase); + "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); @@ -2232,13 +2306,26 @@ 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); + m, FALSE, FALSE, TRUE, TRUE, FALSE); if(m->line_no > 0) out_addline_outfile(out); out_printf(out, "{\n" @@ -2251,10 +2338,10 @@ add_inits(Class *c) need_finalize) { out_printf(out, "\tGObjectClass *" - "g_object_class = " + "g_object_class%s = " "(GObjectClass*) %s;\n", + unused, ((FuncArg *)m->args->data)->name); - add_unused_class = TRUE; did_base_obj = TRUE; } @@ -2263,6 +2350,12 @@ 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); + if (initializers > 0) { GList *li; for(li = ((Class *)class)->nodes; @@ -2312,13 +2405,6 @@ add_inits(Class *c) out_addline_outfile(out); out_printf(out, " }\n"); } - out_printf(out, "\treturn;\n"); - out_printf(out, - "\t%s = NULL;\n", - ((FuncArg *)m->args->data)->name); - if(add_unused_class) { - out_printf (out, "\tg_object_class = NULL;\n"); - } out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n"); } @@ -2356,14 +2442,25 @@ add_argument (Argument *a, gboolean is_set) if (is_set) { char *cast; + const char *unused = ""; - if (a->atype != NULL) + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } + + if (a->atype != NULL && + /* gcc -Wbad-function-cast is wanking stupid, moronic + and otherwise evil so we should just use a (gint) + or (guint) cast, not the specific type cast */ + (for_cpp || + (strcmp (a->gtktype, "ENUM") != 0 && + strcmp (a->gtktype, "FLAGS") != 0))) cast = get_type (a->atype, TRUE); else cast = g_strdup (get_cast (a->gtktype, FALSE)); - out_printf (out, "\t%s ARG = (%s) g_value_get_%s (VAL);\n", - cast, cast, the_type_lower); + out_printf (out, "\t%s ARG%s = (%s) g_value_get_%s (VAL);\n", + cast, unused, cast, the_type_lower); g_free (cast); } else if ( ! is_set) { @@ -2398,8 +2495,9 @@ add_argument (Argument *a, gboolean is_set) } g_free (the_type_lower); - if (is_set) { - out_printf (out, "\t\tif (&ARG) ;\n"); + if (is_set && + (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */)) { + out_printf (out, "\t\tif (&ARG) break;\n"); } out_printf (out, "\t\tbreak;\n"); @@ -2450,20 +2548,34 @@ static void add_getset_arg(Class *c, gboolean is_set) { GList *li; + const char *unused = ""; + const char *hack_unused = ""; + + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } else { + hack_unused = "if (&VAL || &pspec) break;\n\t\t"; + } + out_printf(out, "\nstatic void\n" "___object_%s_property (GObject *object,\n" "\tguint property_id,\n" - "\t%sGValue *VAL,\n" - "\tGParamSpec *pspec)\n" + "\t%sGValue *VAL%s,\n" + "\tGParamSpec *pspec%s)\n" "#define __GOB_FUNCTION__ \"%s::%s_property\"\n" "{\n" - "\t%s *self;\n\n" + "\t%s *self%s;\n\n" "\tself = %s (object);\n\n" "\tswitch (property_id) {\n", is_set ? "set" : "get", is_set ? "const " : "", - c->otype, is_set ? "set" : "get", - typebase, macrobase); + unused, + unused, + c->otype, + is_set ? "set" : "get", + typebase, + unused, + macrobase); for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; @@ -2479,9 +2591,9 @@ add_getset_arg(Class *c, gboolean is_set) "# define G_STRLOC __FILE__ \":\" G_STRINGIFY (__LINE__)\n" "#endif\n" "\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n" - "\t\tbreak;\n\t}\n" - "\treturn;\n\tself = NULL;\n\tVAL = NULL;\n\tpspec = NULL;\n}\n" - "#undef __GOB_FUNCTION__\n"); + "\t\t%sbreak;\n\t}\n" + "}\n" + "#undef __GOB_FUNCTION__\n", hack_unused); } static void @@ -2563,7 +2675,7 @@ print_preconditions(Method *m) } static void -print_method_body(Method *m, int pre) +print_method_body (Method *m, gboolean pre, gboolean unused_self) { if (m->line_no > 0) out_addline_outfile(out); @@ -2571,9 +2683,18 @@ print_method_body(Method *m, int pre) "#define __GOB_FUNCTION__ \"%s::%s\"\n", ((Class *)class)->otype, m->id); - if(pre) + if (pre) print_preconditions(m); + if ( ! pre && + unused_self && + (no_gnu || for_cpp) && + m->args != NULL && + ((FuncArg *)(m->args->data))->name != NULL && + strcmp (((FuncArg *)(m->args->data))->name, "self") == 0) { + out_printf (out, "\tif (&self) { ; }\n"); + } + /* Note: the trailing }'s are on one line, this is so that we get the no return warning correctly and point to the correct line in the .gob file, yes this is slightly @@ -2610,12 +2731,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); @@ -2624,18 +2748,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", @@ -2701,11 +2833,11 @@ 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); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); - print_method_body(m, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; case SIGNAL_FIRST_METHOD: @@ -2714,17 +2846,21 @@ 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); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); out_addline_outfile (out); out_printf (out, "{\n"); out_printf (out, "\tGValue ___param_values[%d];\n" - "\tGValue ___return_val = {0};\n\n", + "\tGValue ___return_val;\n\n" + "memset (&___return_val, 0, " + "sizeof (___return_val));\n" + "memset (&___param_values, 0, " + "sizeof (___param_values));\n\n", g_list_length (m->args)); print_preconditions (m); @@ -2832,8 +2968,8 @@ 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); - print_method_body(m, FALSE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case VIRTUAL_METHOD: @@ -2841,10 +2977,10 @@ 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); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -2890,8 +3026,8 @@ 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); - print_method_body(m, FALSE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case OVERRIDE_METHOD: @@ -2901,7 +3037,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); + m, FALSE, FALSE, FALSE, TRUE, FALSE); g_free(s); out_addline_outfile(out); s = replace_sep(m->otype, '_'); @@ -2925,7 +3061,7 @@ put_method(Method *m) } g_free(args); g_free(s); - print_method_body(m, TRUE); + print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; @@ -2939,21 +3075,24 @@ 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"); + 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 ? "#gob#" : "", NULL); + } else { + outfilephbase = NULL; outfileph = NULL; + } if (no_write) { @@ -3097,11 +3236,11 @@ put_argument_gnu_wrappers(Class *c) if (cast != NULL) { if (set) out_printf (outh, "#define %s_PROP_%s(arg) \t" - "\"%s\",({%sz = (arg); z;})\n", + "\"%s\", __extension__ ({%sz = (arg); z;})\n", macrobase, aname, name, cast); if (get) out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" - "\"%s\",({%s*z = (arg); z;})\n", + "\"%s\", __extension__ ({%s*z = (arg); z;})\n", macrobase, aname, name, cast); } else { if (set) @@ -3176,6 +3315,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]) @@ -3302,16 +3447,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"); } @@ -3424,13 +3572,8 @@ print_class_block(Class *c) add_enums (c); if(any_method_to_alias(c)) { - if( ! no_gnu) { - out_printf(out, "/* Short form macros */\n"); - out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n"); - make_method_gnu_aliases(c); - out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n"); - } - make_method_nongnu_aliases(c); + out_printf (out, "/* Short form macros */\n"); + make_method_aliases (c); } add_interface_inits (c); @@ -3462,6 +3605,43 @@ 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); + } + if (need_dispose) add_dispose (c); @@ -3524,16 +3704,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"); } @@ -3545,8 +3722,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"); } @@ -3690,7 +3866,7 @@ print_enum (EnumDef *enode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", enode->prefix, value->name, enode->prefix, value->name, sname); @@ -3755,7 +3931,7 @@ print_flags (Flags *fnode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", fnode->prefix, name, fnode->prefix, name, sname); @@ -3818,7 +3994,7 @@ print_error (Error *enode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", enode->prefix, name, enode->prefix, name, sname); @@ -3925,6 +4101,9 @@ print_help(void) "\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 " @@ -3953,7 +4132,9 @@ print_help(void) "aliases\n" "\t--no-kill-underscores Ignored for compatibility\n" "\t-o,--output-dir The directory where output " - "should be placed\n"); + "should be placed\n" + "\t--file-sep[=c] replace default \'-\' file " + "name separator\n"); } static void @@ -4020,6 +4201,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) { @@ -4070,6 +4254,19 @@ 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], "--")==0) { /*further arguments are files*/ no_opts = TRUE; @@ -4118,35 +4315,79 @@ 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 @@ -4200,6 +4441,7 @@ 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 (); @@ -4247,9 +4489,15 @@ main(int argc, char *argv[]) fclose (outph); } - if (no_touch_headers && - ! no_write) - compare_and_move_header (); + if (! no_write) { + if (no_touch) { + compare_and_move (outfilebase); + if (outfilephbase) + compare_and_move (outfilephbase); + } + if (no_touch_headers) + compare_and_move (outfilehbase); + } return 0; }