X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/c9d96fcfcf9b74099775a3a260eccdfdc31474c7..797c9847e8b7ddf6dd0bb39d21bdda4c8f20ca07:/src/main.c diff --git a/src/main.c b/src/main.c index bf205ac..0e6c55c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,10 @@ /* GOB C Preprocessor * Copyright (C) 1999,2000 the Free Software Foundation. * Copyright (C) 2000 Eazel, Inc. + * Copyright (C) 2001-2011 George (Jiri) Lebl + * Copyright © 2019-2022 Nick Bowler * - * 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 @@ -20,23 +22,35 @@ * USA. */ -#include "config.h" +#include #include #include #include +#include #include #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); @@ -45,28 +59,42 @@ extern int yydebug; extern FILE * yyin; extern Node *class; extern GList *nodes; +extern GList *enums; extern GList *include_files; 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; static char *macrois; +static char *pmacrois; static char *macrotype; +static char *pmacrotype; static char *typebase; static char *ptypebase; +char *output_dir = NULL; + +char file_sep = '-'; + static int signals = 0; /* number of signals */ -static int set_arguments = 0; /* number of named (set) arguments */ -static int get_arguments = 0; /* number of named (get) arguments */ +static int set_properties = 0; /* number of named (set) properties */ +static int get_properties = 0; /* number of named (get) properties */ static int overrides = 0; /* number of override methods */ static int privates = 0; /* number of private data members */ static int protecteds = 0; /* number of protected methods */ -static int destructors = 0; /* number of variable destructors */ +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 and need the REALLY UGLY HACK to @@ -76,94 +104,84 @@ 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_destroy = FALSE; -static Method * destroy_handler = NULL; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; +static gboolean need_dispose = FALSE; +static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; + static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; FILE *outph = NULL; -FILE *devnull = NULL; +gboolean no_touch = FALSE; gboolean no_touch_headers = FALSE; gboolean for_cpp = FALSE; gboolean no_gnu = FALSE; gboolean exit_on_warn = FALSE; gboolean exit_on_error = TRUE; gboolean got_error = FALSE; -gint private_header = PRIVATE_HEADER_ALWAYS; +gint private_header = PRIVATE_HEADER_ONDEMAND; gboolean no_extern_c = FALSE; gboolean no_write = FALSE; gboolean no_lines = FALSE; gboolean no_self_alias = FALSE; -gboolean no_kill_underscores = FALSE; gboolean always_private_struct = FALSE; +gboolean gtk3_ok = FALSE; + +gint prealloc = 0; + + + +gboolean use_m4 = FALSE; /* preprocess sources with m4 */ +char *m4_commandline = NULL; +#define M4_INCLUDE_DIR PKGDATADIR "/m4" +#define M4_BASE_FILENAME "gobm4.m4" +#define M4_FLAGS "-P -s -I" M4_INCLUDE_DIR " -DGOBM4_GOB_VERSION=" VERSION " " M4_BASE_FILENAME +#define M4_COMMANDLINE "m4" int method_unique_id = 1; static void -make_bases(void) +make_bases (void) { - filebase = replace_sep(((Class *)class)->otype, '-'); - g_strdown(filebase); + filebase = replace_sep (((Class *)class)->otype, file_sep); + gob_strdown (filebase); - funcbase = replace_sep(((Class *)class)->otype, '_'); - g_strdown(funcbase); - - pfuncbase = replace_sep(((Class *)class)->ptype, '_'); - g_strdown(pfuncbase); - - macrobase = replace_sep(((Class *)class)->otype, '_'); - g_strup(macrobase); - - macrois = make_pre_macro(((Class *)class)->otype, "IS"); - macrotype = make_pre_macro(((Class *)class)->otype, "TYPE"); + if (output_dir != NULL && + output_dir[0] != '\0') { + fullfilebase = g_build_filename (output_dir, filebase, NULL); + } else { + fullfilebase = g_strdup (filebase); + } - typebase = remove_sep(((Class *)class)->otype); + funcbase = replace_sep (((Class *)class)->otype, '_'); + gob_strdown (funcbase); - ptypebase = remove_sep(((Class *)class)->ptype); -} + pfuncbase = replace_sep (((Class *)class)->ptype, '_'); + gob_strdown (pfuncbase); -static char * -get_type(const Type *t, gboolean postfix_to_stars) -{ - char *s; - int i; - int extra; - GString *gs; + macrobase = replace_sep (((Class *)class)->otype, '_'); + gob_strup (macrobase); + + macrois = make_pre_macro (((Class *)class)->otype, "IS"); + pmacrois = make_pre_macro (((Class *)class)->ptype, "IS"); - s = remove_sep(t->name); - gs = g_string_new(s); - g_free(s); + macrotype = make_pre_macro (((Class *)class)->otype, "TYPE"); + pmacrotype = make_pre_macro (((Class *)class)->ptype, "TYPE"); - extra = 0; - if(postfix_to_stars) { - const char *p; - /*XXX: this is ugly perhaps we can do this whole postfix thing - in a nicer way, we just count the number of '[' s and from - that we deduce the number of dimensions, so that we can print - that many stars */ - for(p=t->postfix; p && *p; p++) - if(*p == '[') extra++; - } - g_string_append_c(gs, ' '); + typebase = remove_sep (((Class *)class)->otype); - if(t->pointer) { - g_string_append(gs, t->pointer); - for(i=0; i < extra; i++) - g_string_append_c(gs, '*'); - g_string_append_c(gs, ' '); - } - - s = gs->str; - g_string_free(gs, FALSE); - return s; + ptypebase = remove_sep (((Class *)class)->ptype); } static char * -get_gtk_doc(const char *id) +get_gtk_doc (const char *id) { char *val; @@ -173,11 +191,11 @@ get_gtk_doc(const char *id) val = g_hash_table_lookup(gtk_doc_hash, id); if(val) return g_strdup_printf("/**\n * %s_%s:\n%s **/\n", - funcbase, get_real_id(id), val); - val = g_hash_table_lookup(gtk_doc_hash, get_real_id(id)); + funcbase, id, val); + val = g_hash_table_lookup(gtk_doc_hash, id); if(val) return g_strdup_printf("/**\n * %s_%s:\n%s **/\n", - funcbase, get_real_id(id), val); + funcbase, id, val); return NULL; } @@ -193,12 +211,20 @@ print_type(FILE *fp, const Type *t, gboolean postfix_to_stars) static void -print_method(FILE *fp, const char *typeprefix, const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, const char *postfix, const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore) +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean print_funcattrs, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) { GList *li; const char *id; @@ -206,10 +232,7 @@ print_method(FILE *fp, const char *typeprefix, const char *nameprefix, out_printf(fp, "%s", typeprefix); print_type(fp, m->mtype, TRUE); - if(kill_underscore) - id = get_real_id(m->id); - else - id = m->id; + id = m->id; if(no_funcbase) out_printf(fp, "%s%s%s%s(", @@ -222,16 +245,29 @@ print_method(FILE *fp, const char *typeprefix, const char *nameprefix, 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...", @@ -239,7 +275,28 @@ print_method(FILE *fp, const char *typeprefix, const char *nameprefix, } else { out_printf(fp, "void"); } - out_printf(fp, ")%s", 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 @@ -254,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; @@ -264,9 +324,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; @@ -277,65 +336,22 @@ make_method_gnu_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; - /* in C++ mode don't alias new */ - if(for_cpp && strcmp(m->id, "new")==0) - continue; - - if(m->args != NULL) - out_printf(out, "#define %s(args...) " - "%s_%s(##args)\n", m->id, - funcbase, get_real_id(m->id)); - else - out_printf(out, "#define %s() " - "%s_%s()\n", m->id, - funcbase, get_real_id(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; - - /* in C++ mode don't alias new */ - if(for_cpp && strcmp(m->id, "new")==0) - continue; - - if( ! local_made_aliases) - out_printf(out, "\n/* Short form pointers */\n"); - - print_method(out, "static ", "(* const ", "", ") ", "", - m, FALSE, TRUE, FALSE); - out_printf(out, " = %s_%s;\n", funcbase, - get_real_id(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 -add_bad_hack_to_avoid_unused_warnings(Class *c) +add_bad_hack_to_avoid_unused_warnings(const Class *c) { GList *li; @@ -354,6 +370,7 @@ add_bad_hack_to_avoid_unused_warnings(Class *c) "static void\n" "___%s_really_bad_hack_to_avoid_warnings(void)\n" "{\n", funcbase); + out_printf(out, "\t((void (*)(void))GET_NEW_VARG)();\n"); for(li=c->nodes;li;li=g_list_next(li)) { Node *node = li->data; if(node->type == METHOD_NODE) { @@ -361,6 +378,9 @@ add_bad_hack_to_avoid_unused_warnings(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; @@ -368,7 +388,7 @@ add_bad_hack_to_avoid_unused_warnings(Class *c) if(for_cpp && strcmp(m->id, "new")==0) continue; - out_printf(out, "\t((void (*)(void))%s)();\n", m->id); + out_printf(out, "\t((void (*)(void))self_%s)();\n", m->id); } } out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n", @@ -380,7 +400,7 @@ add_bad_hack_to_avoid_unused_warnings(Class *c) } static void -put_variable(Variable *v, FILE *fp) +put_variable(const Variable *v, FILE *fp) { out_printf(fp, "\t"); print_type(fp, v->vtype, FALSE); @@ -402,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); + print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE); else - print_method(outh, "\t", "(* ", "", ") ", ";\n", - m, FALSE, TRUE, TRUE); + print_method(outh, "\t", "(* ", "", ") ", "", ";\n", + m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE); + } static void @@ -415,71 +436,155 @@ put_pub_method(const Method *m) if(m->scope != PUBLIC_SCOPE) return; - print_method(outh, "", "\t", "", "\t", ";\n", m, TRUE, FALSE, TRUE); + out_addline_infile(outh, m->line_no); + print_method(outh, "", "\t", "", "\t", "", ";\n", m, + TRUE, TRUE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(outh); +} + +static void +put_signal_macro (const Method *m, gboolean gnu) +{ + if(m->method != SIGNAL_LAST_METHOD && + m->method != SIGNAL_FIRST_METHOD) + return; + + if ( ! gnu) { + /* connect */ + out_printf (outh, "#define %s_connect__%s(object,func,data)\t" + "g_signal_connect(%s(object),\"%s\"," + "(GCallback)(func),(data))\n", + funcbase, m->id, macrobase, m->id); + + /* connect_after */ + out_printf (outh, "#define %s_connect_after__%s(object,func,data)\t" + "g_signal_connect_after(%s(object),\"%s\"," + "(GCallback)(func),(data))\n", + funcbase, m->id, macrobase, m->id); + + /* connect_data */ + out_printf (outh, "#define %s_connect_data__%s" + "(object,func,data,destroy_data,flags)\t" + "g_signal_connect_data(%s(object),\"%s\"," + "(GCallback)(func),(data),(destroy_data),(GConnectFlags)(flags))\n", + funcbase, m->id, macrobase, m->id); + } else { + /* connect */ + out_printf (outh, "#define %s_connect__%s(object,func,data)\t" + "g_signal_connect(" + "%s(__extension__ ({%s *___object = (object); ___object; }))," + "\"%s\"," + "(GCallback) __extension__ ({", + funcbase, m->id, macrobase, typebase, m->id); + print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, FALSE, 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(__extension__ ({%s *___object = (object); ___object; }))," + "\"%s\"," + "(GCallback) __extension__ ({", + funcbase, m->id, macrobase, typebase, m->id); + print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, FALSE, 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(__extension__ ({%s *___object = (object); ___object; }))," + "\"%s\"," + "(GCallback) __extension__ ({", + funcbase, m->id, macrobase, typebase, m->id); + print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE); + out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); + } +} + +static void +put_signal_macros (const Class *c, gboolean gnu) +{ + const GList *li; + + if (signals < 0) + return; + + for (li = c->nodes; li != NULL; li = li->next) { + const Node *n = li->data; + if (n->type == METHOD_NODE) + put_signal_macro ((Method *)n, gnu); + } } -/* I'm starting not to like this idea */ -#if 0 static void -put_signal_connect(Method *m) +put_local_signal_macro (const Method *m) { if(m->method != SIGNAL_LAST_METHOD && m->method != SIGNAL_FIRST_METHOD) return; - out_printf(outh, "guint \t%s_%s__connect_full\t(%s *object,\n" - "\t\t\t\t\tconst char *name,\n" - "\t\t\t\t\tGtkSignalFunc func,\n" - "\t\t\t\t\tGtkCallbackMarshal marshal,\n" - "\t\t\t\t\tgpointer data,\n" - "\t\t\t\t\tGtkDestroyNotify destroy_func,\n" - "\t\t\t\t\tgboolean object_signal,\n" - "\t\t\t\t\tgboolean after);\n", - funcbase, m->id, typebase); + /* connect */ + out_printf (out, "#define self_connect__%s(object,func,data)\t" + "%s_connect__%s((object),(func),(data))\n", + m->id, funcbase, m->id); + + /* connect_after */ + out_printf (out, "#define self_connect_after__%s(object,func,data)\t" + "%s_connect_after__%s((object),(func),(data))\n", + m->id, funcbase, m->id); + + /* connect_data */ + out_printf (out, "#define self_connect_data__%s(object,func,data,destroy_data,flags)\t" + "%s_connect_data__%s((object),(func),(data),(destroy_data),(flags))\n", + m->id, funcbase, m->id); +} + +static void +put_local_signal_macros (const Class *c) +{ + const GList *li; - out_printf(outh, "#define %s_%s__connect(object,name,func,data) " - "%s_%s__connect_full((object),(name),(func),NULL," - "(data),NULL,FALSE,FALSE)\n", - funcbase, m->id, funcbase, m->id); - out_printf(outh, "#define %s_%s__connect_after(object,name,func,data) " - "%s__connect_%s_full((object),(name),(func),NULL," - "(data),NULL,FALSE,TRUE)\n", - funcbase, m->id, funcbase, m->id); + if (signals < 0) + return; - out_printf(outh, "guint \t%s_%s__connect_while_alive\t(%s *object,\n" - "\t\t\t\t\tconst char *name,\n" - "\t\t\t\t\tGtkSignalFunc func,\n" - "\t\t\t\t\tgpointer data,\n" - "\t\t\t\t\tGtkObject *alive_object);\n\n", - funcbase, m->id, typebase); + for (li = c->nodes; li != NULL; li = li->next) { + const Node *n = li->data; + if (n->type == METHOD_NODE) + put_local_signal_macro ((Method *)n); + } } -#endif 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); - else - print_method(out, "", "\t", "", "\t", ";\n", - m, FALSE, FALSE, TRUE); + 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 -put_priv_method_prot(Method *m) +put_priv_method_prot(const Method *m) { if(m->method == SIGNAL_LAST_METHOD || m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) print_method(out, - "static ", "___real_", "", " ", ";\n", - m, FALSE, FALSE, TRUE); + "static ", "___real_", "", " ", "", ";\n", + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -488,33 +593,51 @@ put_priv_method_prot(Method *m) m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", + 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); + 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) - print_method(out, "static ", "", "", " ", + 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); + m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE); + if (m->line_no > 0) + out_addline_outfile(out); + } } static GList * -make_func_arg(char *typename, int is_class, char *name) +make_func_arg (const char *typename, gboolean is_class, const char *name) { Node *node; Node *type; char *tn; - if(is_class) - tn = g_strconcat(typename, ":Class", NULL); + if (is_class) + tn = g_strconcat (typename, ":Class", NULL); else - tn = g_strdup(typename); - - type = new_type(tn, g_strdup("*"), NULL); - node = new_funcarg((Type *)type, name, NULL); - return g_list_prepend(NULL, node); + tn = g_strdup (typename); + + type = node_new (TYPE_NODE, + "name:steal", tn, + "pointer", "*", + NULL); + node = node_new (FUNCARG_NODE, + "atype:steal", (Type *)type, + "name", name, + NULL); + return g_list_prepend (NULL, node); } static void @@ -540,89 +663,101 @@ make_inits(Class *cl) } } if(!got_class_init) { - node = new_method(NO_SCOPE, CLASS_INIT_METHOD, - (Type *)new_type(g_strdup("void"), - NULL, NULL), - NULL, NULL, NULL, g_strdup("class_init"), - make_func_arg(cl->otype, TRUE, g_strdup("c")), - NULL, NULL, NULL, 0, 0, FALSE, - method_unique_id++); + Type *type = (Type *)node_new (TYPE_NODE, + "name", "void", + NULL); + node = node_new (METHOD_NODE, + "scope", NO_SCOPE, + "method", CLASS_INIT_METHOD, + "mtype:steal", type, + "id", "class_init", + "args:steal", make_func_arg (cl->otype, + TRUE /* is_class */, + "c" /* name */), + "unique_id", method_unique_id++, + NULL); cl->nodes = g_list_prepend(cl->nodes, node); } if(!got_init) { - node = new_method(NO_SCOPE, INIT_METHOD, - (Type *)new_type(g_strdup("void"), - NULL, NULL), - NULL, NULL, NULL, g_strdup("init"), - make_func_arg(cl->otype, FALSE, g_strdup("o")), - NULL, NULL, NULL, 0, 0, FALSE, - method_unique_id++); + Type *type = (Type *)node_new (TYPE_NODE, + "name", "void", + NULL); + node = node_new (METHOD_NODE, + "scope", NO_SCOPE, + "method", INIT_METHOD, + "mtype:steal", type, + "id", "init", + "args:steal", make_func_arg (cl->otype, + FALSE /* is_class */, + "o" /* name */), + "unique_id", method_unique_id++, + NULL); cl->nodes = g_list_prepend(cl->nodes, node); } } -static void -find_destroy(Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - destroy_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, "destroy")==0) { - if(strcmp(m->otype, "Gtk:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "destroy method override " - "of class other then " - "Gtk:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "destroy method override " - "with more then one " - "parameter"); - } - destroy_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(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, "Gtk:Object") != 0 && - strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "Gtk:Object (or G:Object" - "for GTK+ 2.0)"); - } - 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); } @@ -636,7 +771,7 @@ static GList *eq_signal_methods = NULL; /* compare a list of strings */ static gboolean -is_list_equal(GList *a, GList *b) +is_list_equal(const GList *a, const GList *b) { for(;a && b; a=a->next, b=b->next) { if(strcmp(a->data, b->data)!=0) { @@ -650,7 +785,7 @@ is_list_equal(GList *a, GList *b) } static Method * -find_same_type_signal(Method *m) +find_same_type_signal(const Method *m) { GList *li; for(li=eq_signal_methods;li;li=li->next) { @@ -662,25 +797,34 @@ find_same_type_signal(Method *m) } static void -print_signal_marsal_args(Method *m) +print_signal_marsal_args (const Method *m) { - if(strcmp(m->gtktypes->next->data, "NONE")!=0) { + if (strcmp (m->gtktypes->next->data, "NONE") != 0) { GList *li; int i; - for(i=0, li=m->gtktypes->next;li; - i++, li=g_list_next(li)) { - if(!for_cpp) - out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])", - (char *)li->data, i); - else { - out_printf(out, ",\n\t\t(%s)" - "GTK_VALUE_%s(args[%d])", - get_cast(li->data, FALSE), - (char *)li->data, i); - } + for (i = 0, li = m->gtktypes->next; + li != NULL; + i++, li = li->next) { + char *get_func; + + 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); + + gob_strdown (get_func); + out_printf (out, ",\n\t\t(%s) " + "%s (param_values + %d)", + get_cast (li->data, FALSE), + get_func, i + 1); + g_free (get_func); } } - out_printf(out, ",\n\t\tfunc_data);\n}\n\n"); + out_printf (out, ",\n\t\tdata2);\n"); } @@ -691,25 +835,42 @@ add_signal_prots(Method *m) static int sig = 1; char *s; Method *mm; + 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) + if (m->method != SIGNAL_LAST_METHOD && + m->method != SIGNAL_FIRST_METHOD) return; - if(!marsh) + if (marsh == NULL) marsh = g_hash_table_new(NULL, NULL); + + g_assert (m->gtktypes->next != NULL); + + ret_none = strcmp(m->gtktypes->data, "NONE") == 0; + arglist_none = strcmp(m->gtktypes->next->data, "NONE") == 0; - if(strcmp(m->gtktypes->data, "NONE")==0 && - strcmp(m->gtktypes->next->data, "NONE")==0) + if (ret_none && arglist_none) return; /* if we already did a signal prototype just use that */ - mm = find_same_type_signal(m); - if(mm) { - s = g_hash_table_lookup(marsh, mm); - g_hash_table_insert(marsh, m, s); + mm = find_same_type_signal (m); + if (mm != NULL) { + s = g_hash_table_lookup (marsh, mm); + g_hash_table_insert (marsh, m, s); return; } + + if (ret_none) + retcast = NULL; + else + retcast = get_cast (m->gtktypes->data, FALSE); s = g_strdup_printf("Sig%d", sig++); @@ -720,36 +881,140 @@ add_signal_prots(Method *m) out_printf(out, "\ntypedef %s (*___%s) (%s *, ", get_cast(m->gtktypes->data, FALSE), s, typebase); - if(strcmp(m->gtktypes->next->data, "NONE")!=0) { - for(li=m->gtktypes->next; li; li=g_list_next(li)) - out_printf(out, "%s, ", get_cast(li->data, FALSE)); + if ( ! arglist_none) { + for (li = m->gtktypes->next; li != NULL; li = li->next) + out_printf (out, "%s, ", get_cast (li->data, FALSE)); } - out_printf(out, "gpointer);\n"); + out_printf (out, "gpointer);\n"); - out_printf(out, "\nstatic void\n" - "___marshal_%s (GtkObject * object,\n" - "\tGtkSignalFunc func,\n" - "\tgpointer func_data,\n" - "\tGtkArg * args)\n" - "{\n", s); + out_printf (out, "\nstatic void\n" + "___marshal_%s (GClosure *closure,\n" + "\tGValue *return_value%s,\n" + "\tguint n_param_values,\n" + "\tconst GValue *param_values,\n" + "\tgpointer invocation_hint%s,\n" + "\tgpointer marshal_data)\n" + "{\n", + s, + unused, + unused); + + if ( ! ret_none) + out_printf (out, "\t%s v_return;\n", retcast); + + out_printf (out, "\tregister ___%s callback;\n" + "\tregister GCClosure *cc = (GCClosure*) closure;\n" + "\tregister gpointer data1, data2;\n\n", + s); + + out_printf (out, "\tg_return_if_fail (n_param_values == %d);\n\n", + arglist_none ? 1 : g_list_length (m->gtktypes)); + + out_printf (out, + "\tif (G_CCLOSURE_SWAP_DATA (closure)) {\n" + "\t\tdata1 = closure->data;\n" + "\t\tdata2 = g_value_peek_pointer (param_values + 0);\n" + "\t} else {\n" + "\t\tdata1 = g_value_peek_pointer (param_values + 0);\n" + "\t\tdata2 = closure->data;\n" + "\t}\n\n"); + + out_printf (out, "\tcallback = (___%s) " + "(marshal_data != NULL ? marshal_data : cc->callback);" + "\n\n", s); - if(strcmp(m->gtktypes->data, "NONE")==0) { - out_printf(out, "\t___%s rfunc;\n\n" - "\trfunc = (___%s)func;\n\n" - "\t(*rfunc)((%s *)object", s, s, typebase); + if (ret_none) { + out_printf (out, "\tcallback ((%s *)data1", typebase); } else { - const char *retcast = get_cast(m->gtktypes->data, FALSE); - out_printf(out, - "\t___%s rfunc;\n\t" - "%s *retval;\n\n" - "\trfunc = (___%s)func;\n\n" - "\tretval = GTK_RETLOC_%s(args[%d]);\n\n" - "\t*retval = (*rfunc)((%s *)object", - s, retcast, s, (char *)m->gtktypes->data, - g_list_length(m->gtktypes)-1, typebase); + out_printf (out, "\tv_return = callback ((%s *)data1", + typebase); + } + + print_signal_marsal_args (m); + + if ( ! ret_none) { + /* FIXME: This code is so fucking ugly it hurts */ + gboolean take_ownership = + (strcmp ((char *)m->gtktypes->data, "STRING") == 0 || + strcmp ((char *)m->gtktypes->data, "BOXED") == 0); + char *set_func; + + + if (strcmp (m->gtktypes->data, "UNICHAR") == 0) + /* hack because glib is braindamaged */ + set_func = g_strdup ("g_value_set_uint"); + else + set_func = g_strdup_printf ("g_value_%s_%s", + take_ownership ? + "take" : "set", + (char *)m->gtktypes->data); + gob_strdown (set_func); + + out_printf (out, "\n\t%s (return_value, v_return);\n", + set_func); + + 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"); +} + +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"; } - print_signal_marsal_args(m); + 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 @@ -765,8 +1030,8 @@ add_enums(Class *c) Method *m = (Method *)n; if(m->method == SIGNAL_LAST_METHOD || m->method == SIGNAL_FIRST_METHOD) { - char *s = g_strdup(get_real_id(m->id)); - g_strup(s); + char *s = g_strdup(m->id); + gob_strup(s); out_printf(out, "\t%s_SIGNAL,\n", s); g_free(s); } @@ -774,172 +1039,500 @@ add_enums(Class *c) } out_printf(out, "\tLAST_SIGNAL\n};\n\n"); } - if(set_arguments > 0 || get_arguments > 0) { - out_printf(out, "enum {\n\tARG_0"); + if (set_properties > 0 || + get_properties > 0) { + out_printf(out, "enum {\n\tPROP_0"); for(li=c->nodes;li;li=g_list_next(li)) { Node *n = li->data; - if(n->type == ARGUMENT_NODE) { + if (n->type == PROPERTY_NODE) { + Property *p = (Property *)n; + char *s = g_strdup (p->name); + gob_strup (s); + out_printf (out, ",\n\tPROP_%s", s); + g_free(s); + } else if (n->type == ARGUMENT_NODE) { Argument *a = (Argument *)n; char *s = g_strdup(a->name); - g_strup(s); - out_printf(out, ",\n\tARG_%s", s); + gob_strup (s); + out_printf(out, ",\n\tPROP_%s", s); g_free(s); } } out_printf(out, "\n};\n\n"); } - if(signals>0) + if (signals > 0) out_printf(out, "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); -} - -static void -add_get_type(void) -{ - char *chunk_size = ((Class*)class)->chunk_size; - - out_printf(out, - "GtkType\n" - "%s_get_type (void)\n" - "{\n" - "\tstatic guint type = 0;\n\n" - "\tif ( ! type) {\n" - "\t\tstatic const GtkTypeInfo info = {\n" - "\t\t\t\"%s\",\n" - "\t\t\tsizeof (%s),\n" - "\t\t\tsizeof (%sClass),\n" - "\t\t\t(GtkClassInitFunc) %s_class_init,\n" - "\t\t\t(GtkObjectInitFunc) %s_init,\n" - "\t\t\t/* reserved_1 */ NULL,\n" - "\t\t\t/* reserved_2 */ NULL,\n" - "\t\t\t(GtkClassInitFunc) NULL\n" - "\t\t};\n\n" - "\t\ttype = gtk_type_unique (%s_get_type(), &info);\n", - funcbase, typebase, typebase, typebase, - funcbase, funcbase, pfuncbase); - 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, "static %sClass *parent_class = NULL;\n", ptypebase); + define_parent_interface_refs(c); + out_printf(out, "\n"); } static void -add_overrides(Class *c, const char *oname, gboolean did_base_obj) +add_interface_methods (Class *c, const char *interface) { GList *li; - GHashTable *done; - char *s; - - done = g_hash_table_new(g_str_hash, g_str_equal); - if(did_base_obj) { - s = g_strdup("GtkObject"); /* This was already done */ - g_hash_table_insert(done, s, s); - s = g_strdup("GObject"); /* This was probably already done as well (if using Gtk/Glib 1.3/2.0) */ - g_hash_table_insert(done, s, s); - } - for(li=c->nodes; li; li=g_list_next(li)) { + gboolean added_line = FALSE; + + for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; - char *f; Method *m = (Method *)n; - if(n->type != METHOD_NODE || - m->method != OVERRIDE_METHOD) + if (n->type != METHOD_NODE || + m->method == OVERRIDE_METHOD || + m->interface == NULL || + strcmp (m->interface, interface) != 0) continue; - s = remove_sep(m->otype); - - if(g_hash_table_lookup(done, s)) { - g_free(s); - continue; + if (m->line_no > 0) { + out_addline_infile (out, m->line_no); + added_line = TRUE; + } else if (m->line_no == 0 && + added_line) { + out_addline_outfile (out); + added_line = FALSE; } - g_hash_table_insert(done, s, s); - - f = replace_sep(m->otype, '_'); - g_strdown(f); - - out_printf(out, "\t%sClass *%s_class = (%sClass *)%s;\n", - s, f, s, oname); - - g_free(f); + out_printf (out, "\tiface->%s = self_%s;\n", + m->id, m->id); } - g_hash_table_foreach(done, (GHFunc)g_free, NULL); - g_hash_table_destroy(done); + if (added_line) + out_addline_outfile (out); } -static char * -make_run_signal_flags(Method *m, gboolean last) +static void +add_interface_inits(Class *c) { GList *li; - GString *gs; - char *flags[] = { - "FIRST", - "LAST", - "BOTH", - "NO_RECURSE", - "ACTION", - "NO_HOOKS", - NULL - }; - gs = g_string_new(NULL); + if (c->interfaces == NULL) + return; - if(last) - g_string_assign(gs, "GTK_RUN_LAST"); - else - g_string_assign(gs, "GTK_RUN_FIRST"); + out_printf(out, "\n"); - if(m->scope == PUBLIC_SCOPE) - g_string_append(gs, " | GTK_RUN_ACTION"); + for (li = c->interfaces; li != NULL; li = li->next) { + char *name = replace_sep(li->data, '_'); + char *type = interface_type(li->data); - for(li = m->flags; li; li = li->next) { - char *flag = li->data; - int i; - for(i=0;flags[i];i++) { - if(strcmp(flags[i], flag)==0) - break; - } - /* if we haven't found it in our list */ - if( ! flags[i]) { - error_printf(GOB_WARN, m->line_no, - "Unknown flag '%s' used, " - "perhaps it was misspelled", - flag); - } - g_string_sprintfa(gs, " | GTK_RUN_%s", flag); - } + out_printf(out, "static void\n" + "___%s_init (%s *iface)\n" + "{\n", name, type); - { - char *ret = gs->str; - g_string_free(gs, FALSE); - return ret; + add_interface_methods(c, li->data); + + 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); } } - static void -add_signals(Class *c) +add_interface_infos(Class *c, gboolean static_storage) { GList *li; + 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"); - for(li=c->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - char *mar, *sig, *flags; - gboolean is_none, last = FALSE; - Method *m = (Method *)n; +} - if(n->type != METHOD_NODE || - (m->method != SIGNAL_FIRST_METHOD && +static void +define_add_interfaces(Class *c) +{ + GList *li; + + if (!c->interfaces) + return; + + 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 +define_dynamic_add_interfaces(Class *c) +{ + GList *li; + + if (!c->interfaces) + return; + + 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"); +} + +static void +add_dynamic_get_type(void) +{ + Class *c = (Class *)class; + + define_dynamic_add_interfaces(c); + define_add_privates(c); + + /* + * 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, ");\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) +{ + Class *c = (Class *)class; + + define_add_interfaces(c); + + 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 +add_overrides(Class *c, const char *oname, + gboolean did_base_obj) +{ + GList *li; + GHashTable *done; + char *s; + + done = g_hash_table_new (g_str_hash, g_str_equal); + if (did_base_obj) { + s = g_strdup ("GObject"); + g_hash_table_insert (done, s, s); + } + for (li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; + char *f; + Method *m = (Method *)n; + if(n->type != METHOD_NODE || + m->method != OVERRIDE_METHOD) + continue; + + s = remove_sep(m->otype); + + if(g_hash_table_lookup(done, s)) { + g_free(s); + continue; + } + g_hash_table_insert(done, s, s); + + f = replace_sep(m->otype, '_'); + gob_strdown(f); + + out_printf(out, "\t%sClass *%s_class = (%sClass *)%s;\n", + s, f, s, oname); + + g_free(f); + } + g_hash_table_foreach (done, (GHFunc)g_free, NULL); + g_hash_table_destroy (done); +} + +static char * +make_run_signal_flags(Method *m, gboolean last) +{ + GList *li; + GString *gs; + char *flags[] = { + "RUN_FIRST", + "RUN_LAST", + "RUN_CLEANUP", + "NO_RECURSE", + "DETAILED", + "ACTION", + "NO_HOOKS", + NULL + }; + + gs = g_string_new(NULL); + + if(last) + g_string_assign(gs, "G_SIGNAL_RUN_LAST"); + else + g_string_assign(gs, "G_SIGNAL_RUN_FIRST"); + + if(m->scope == PUBLIC_SCOPE) + g_string_append(gs, " | G_SIGNAL_ACTION"); + + for(li = m->flags; li; li = li->next) { + char *flag = li->data; + int i; + for(i=0;flags[i];i++) { + if(strcmp(flags[i], flag)==0) + break; + } + /* if we haven't found it in our list */ + if( ! flags[i]) { + error_printf(GOB_WARN, m->line_no, + "Unknown flag '%s' used, " + "perhaps it was misspelled", + flag); + } + g_string_append_printf(gs, " | G_SIGNAL_%s", flag); + } + + { + char *ret = gs->str; + g_string_free(gs, FALSE); + return ret; + } +} + + +static void +add_signals(Class *c) +{ + GList *li; + + out_printf(out, "\n"); + for(li=c->nodes;li;li=g_list_next(li)) { + Node *n = li->data; + char *mar, *sig, *flags; + gboolean is_none, last = FALSE; + Method *m = (Method *)n; + + if(n->type != METHOD_NODE || + (m->method != SIGNAL_FIRST_METHOD && m->method != SIGNAL_LAST_METHOD)) continue; @@ -953,34 +1546,42 @@ add_signals(Class *c) (char *)g_hash_table_lookup(marsh, m), NULL); else - mar = g_strdup("gtk_signal_default_marshaller"); + mar = g_strdup("g_cclosure_marshal_VOID__VOID"); is_none = (strcmp(m->gtktypes->next->data, "NONE")==0); - sig = g_strdup(get_real_id(m->id)); - g_strup(sig); - flags = make_run_signal_flags(m, last); - out_printf(out, "\tobject_signals[%s_SIGNAL] =\n" - "\t\tgtk_signal_new (\"%s\",\n" - "\t\t\t(GtkSignalRunType)(%s),\n" - "\t\t\tGTK_CLASS_TYPE(gtk_object_class),\n" - "\t\t\tGTK_SIGNAL_OFFSET (%sClass, %s),\n" - "\t\t\t%s,\n" - "\t\t\tGTK_TYPE_%s, %d", - sig, get_real_id(m->id), - flags, - typebase, get_real_id(m->id), mar, - (char *)m->gtktypes->data, - is_none ? 0 : g_list_length(m->gtktypes->next)); + sig = g_strdup (m->id); + 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\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->signal_name /*m->id* if not given signal_name*/, + flags, + typebase, m->id, mar, + (char *)m->gtktypes->data, + is_none ? 0 : g_list_length(m->gtktypes->next)); g_free(mar); g_free(sig); g_free(flags); if( ! is_none) { GList *l; - for(l = m->gtktypes->next; l != NULL; l = l->next) - out_printf(out, ",\n\t\t\tGTK_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"); @@ -988,18 +1589,15 @@ add_signals(Class *c) if(strcmp(m->gtktypes->data, "NONE") != 0 || ! is_none) { GList *gl, *al; - char *sep = ""; - out_printf(out, "\tif("); + 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; @@ -1008,26 +1606,26 @@ 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" "\t}\n", - filename, m->line_no, get_real_id(m->id)); + filename, m->line_no, m->id); } } - out_printf(out, "\tgtk_object_class_add_signals (gtk_object_class,\n" - "\t\tobject_signals, LAST_SIGNAL);\n\n"); } static void @@ -1057,41 +1655,37 @@ set_def_handlers(Class *c, const char *oname) } - if(m->method == OVERRIDE_METHOD) { + if (m->method == OVERRIDE_METHOD) { char *s; - s = replace_sep(m->otype, '_'); - g_strdown(s); - - if(need_destroy && - destroy_handler && - strcmp(get_real_id(m->id), "destroy") == 0) - out_printf(out, "\tgtk_object_class->destroy " - "= ___destroy;\n"); - else if(need_finalize && + s = replace_sep (m->otype, '_'); + gob_strdown (s); + + if (need_dispose && + dispose_handler != NULL && + strcmp (m->id, "dispose") == 0) + out_printf (out, "\tg_object_class->dispose " + "= ___dispose;\n"); + else if (need_finalize && finalize_handler && - strcmp(get_real_id(m->id), "finalize") == 0) + strcmp(m->id, "finalize") == 0) out_printf(out, - "#ifdef G_OBJECT_CLASS\n" - "\tg_object_class->finalize = ___finalize;\n" - "#else /* !G_OBJECT_CLASS */\n" - "\tgtk_object_class->finalize = ___finalize;\n" - "#endif /* G_OBJECT_CLASS */\n"); - else if(m->cbuf) + "\tg_object_class->finalize = ___finalize;\n"); + else if (m->cbuf != NULL) out_printf(out, "\t%s_class->%s = ___%x_%s_%s;\n", - s, get_real_id(m->id), (guint)m->unique_id, - funcbase, get_real_id(m->id)); + s, m->id, (guint)m->unique_id, + funcbase, m->id); else out_printf(out, "\t%s_class->%s = NULL;\n", - s, get_real_id(m->id)); + s, m->id); } else { if(m->cbuf) out_printf(out, "\t%s->%s = ___real_%s_%s;\n", - oname, get_real_id(m->id), - funcbase, get_real_id(m->id)); + oname, m->id, + funcbase, m->id); else out_printf(out, "\t%s->%s = NULL;\n", - oname, get_real_id(m->id)); + oname, m->id); } } if(set_line) @@ -1099,46 +1693,227 @@ set_def_handlers(Class *c, const char *oname) } static void -make_arguments(Class *c) +make_argument (Argument *a) { - GList *li; + GString *flags; + GList *l; + char *s; char *argflags[] = { "CONSTRUCT", "CONSTRUCT_ONLY", - "CHILD_ARG", - "MASK", + "LAX_VALIDATION", + "PRIVATE", NULL }; - out_printf(out, "\n"); - for(li=c->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - Argument *a; - GString *flags; - GList *l; - char *s; - if(n->type != ARGUMENT_NODE) + flags = g_string_new ("(GParamFlags)("); + + if(a->get && a->set) + g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE"); + else if(a->get) + g_string_append (flags, "G_PARAM_READABLE"); + else + g_string_append (flags, "G_PARAM_WRITABLE"); + + g_assert(a->get || a->set); + + for (l = a->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, a->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_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); + } - a = (Argument *)n; - - if(a->get && a->set) - flags = g_string_new("GTK_ARG_READWRITE"); - else if(a->get) - flags = g_string_new("GTK_ARG_READABLE"); + g_string_append (flags, ")"); + + s = g_strdup(a->name); + gob_strup (s); + if (!strcmp (a->gtktype, "ENUM")) + out_printf(out, "\tparam_spec = g_param_spec_enum (\"%s\", NULL, NULL,\n" + "\t\tG_TYPE_ENUM, 0,\n" + "\t\t%s);\n", + a->name, flags->str); + if (!strcmp (a->gtktype, "FLAGS")) + out_printf(out, "\tparam_spec = g_param_spec_flags (\"%s\", NULL, NULL,\n" + "\t\tG_TYPE_FLAGS, 0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "OBJECT")) + out_printf(out, "\tparam_spec = g_param_spec_object (\"%s\", NULL, NULL,\n" + "\t\tG_TYPE_OBJECT,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "STRING")) + out_printf(out, "\tparam_spec = g_param_spec_string (\"%s\", NULL, NULL,\n" + "\t\tNULL,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "INT")) + out_printf(out, "\tparam_spec = g_param_spec_int (\"%s\", NULL, NULL,\n" + "\t\tG_MININT, G_MAXINT,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "UINT")) + out_printf(out, "\tparam_spec = g_param_spec_uint (\"%s\", NULL, NULL,\n" + "\t\t0, G_MAXUINT,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "INT")) + out_printf(out, "\tparam_spec = g_param_spec_int (\"%s\", NULL, NULL,\n" + "\t\tG_MININT, G_MAXINT,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "CHAR")) + out_printf(out, "\tparam_spec = g_param_spec_char (\"%s\", NULL, NULL,\n" + "\t\t-128, 127,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "UCHAR")) + out_printf(out, "\tparam_spec = g_param_spec_uchar (\"%s\", NULL, NULL,\n" + "\t\t0, 0xFF,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "BOOL") || + !strcmp (a->gtktype, "BOOLEAN")) + out_printf(out, "\tparam_spec = g_param_spec_boolean (\"%s\", NULL, NULL,\n" + "\t\tFALSE,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "LONG")) + out_printf(out, "\tparam_spec = g_param_spec_long (\"%s\", NULL, NULL,\n" + "\t\tG_MINLONG, G_MAXLONG,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "ULONG")) + out_printf(out, "\tparam_spec = g_param_spec_ulong (\"%s\", NULL, NULL,\n" + "\t\t0, G_MAXULONG,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "INT64")) + out_printf(out, "\tparam_spec = g_param_spec_int64 (\"%s\", NULL, NULL,\n" + "\t\tG_MININT64, G_MAXINT64,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "UINT64")) + out_printf(out, "\tparam_spec = g_param_spec_uint64 (\"%s\", NULL, NULL,\n" + "\t\t0, G_MAXUINT64,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "FLOAT")) + out_printf(out, "\tparam_spec = g_param_spec_float (\"%s\", NULL, NULL,\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\t-G_MAXDOUBLE, G_MAXDOUBLE,\n" + "\t\t0,\n" + "\t\t%s);\n", + a->name, flags->str); + else if (!strcmp (a->gtktype, "POINTER")) + out_printf(out, "\tparam_spec = g_param_spec_pointer (\"%s\", NULL, NULL,\n" + "\t\t%s);\n", + a->name, flags->str); + else + error_printf (GOB_ERROR, a->line_no, + "%s type is not supported for arguments, try using properties", + a->gtktype); + + out_printf(out, "\tg_object_class_install_property (g_object_class,\n" + "\t\tPROP_%s, param_spec);\n", s); + + + g_free(s); + g_string_free(flags, TRUE); +} + +#define value_for_print(str, alt) (str != NULL ? str : alt) + +static void +make_property (Property *p) +{ + char *s; + + if (p->get == NULL && p->set == NULL) { + error_print (GOB_ERROR, p->line_no, + "Property has no getter nor setter"); + } + + if (p->override) { + if (p->flags != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, flags ignored"); + if (p->nick != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, nick ignored"); + if (p->blurb != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, blurb ignored"); + if (p->minimum != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, minimum ignored"); + if (p->maximum != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, maximum ignored"); + if (p->default_value != NULL) + error_print (GOB_WARN, p->line_no, + "Overridden property, default_value ignored"); + + s = g_strdup (p->name); + gob_strup (s); + out_printf (out, "\tg_object_class_override_property (g_object_class,\n" + "\t\tPROP_%s,\n" + "\t\t\"%s\");\n", s, value_for_print (p->canonical_name, p->name) ); + g_free (s); + } else { + GString *flags; + GList *l; + char *argflags[] = { + "CONSTRUCT", + "CONSTRUCT_ONLY", + "LAX_VALIDATION", + "PRIVATE", + NULL + }; + + flags = g_string_new ("(GParamFlags)("); + + if (p->get != NULL && p->set != NULL) + g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE"); + else if (p->get != NULL) + g_string_append (flags, "G_PARAM_READABLE"); else - flags = g_string_new("GTK_ARG_WRITABLE"); + g_string_append (flags, "G_PARAM_WRITABLE"); - g_assert(a->get || a->set); - - for(l=a->flags;l;l=g_list_next(l)) { + + for (l = p->flags; l != NULL; l = l->next) { char *flag = l->data; int i; - if(strcmp(flag, "READWRITE")==0 || - strcmp(flag, "READABLE")==0 || - strcmp(flag, "WRITABLE")==0) { - error_print(GOB_WARN, a->line_no, - "READWRITE, READABLE and " + 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; @@ -1147,37 +1922,359 @@ make_arguments(Class *c) 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, " | GTK_ARG_%s", flag); + g_string_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag); } - s = g_strdup(a->name); - g_strup(s); - out_printf(out, "\tgtk_object_add_arg_type(\"%s::%s\",\n" - "\t\tGTK_TYPE_%s,\n" - "\t\t%s,\n" - "\t\tARG_%s);\n", - typebase, a->name, a->gtktype, flags->str, s); - g_free(s); - g_string_free(flags, TRUE); + g_string_append (flags, ")"); + + if (strcmp (p->gtktype, "CHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_char\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-128"), + value_for_print (p->maximum, "127"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UCHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uchar\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "0xFF"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "BOOLEAN") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_boolean\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "FALSE"), + flags->str); + } else if (strcmp (p->gtktype, "INT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_int\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MININT"), + value_for_print (p->maximum, "G_MAXINT"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UINT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uint\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXUINT"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "LONG") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_long\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MINLONG"), + value_for_print (p->maximum, "G_MAXLONG"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "ULONG") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_ulong\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXULONG"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "INT64") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_int64\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "G_MININT64"), + value_for_print (p->maximum, "G_MAXINT64"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UINT64") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_uint64\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "0"), + value_for_print (p->maximum, "G_MAXUINT64"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "UNICHAR") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_unichar\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "0"), + flags->str); + } else if (strcmp (p->gtktype, "ENUM") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_ENUM"); + out_printf (out, "\tparam_spec = g_param_spec_enum\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* enum_type */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + value_for_print (p->default_value, "0"), + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "FLAGS") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_FLAGS"); + out_printf (out, "\tparam_spec = g_param_spec_flags\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* flags_type */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + value_for_print (p->default_value, "0"), + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "FLOAT") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_float\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-G_MAXFLOAT"), + value_for_print (p->maximum, "G_MAXFLOAT"), + value_for_print (p->default_value, "0.0"), + flags->str); + } else if (strcmp (p->gtktype, "DOUBLE") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_double\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* minimum */,\n" + "\t\t %s /* maximum */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->minimum, "-G_MAXDOUBLE"), + value_for_print (p->maximum, "G_MAXDOUBLE"), + value_for_print (p->default_value, "0.0"), + flags->str); + } else if (strcmp (p->gtktype, "STRING") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_string\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* default_value */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + value_for_print (p->default_value, "NULL"), + flags->str); + } else if (strcmp (p->gtktype, "PARAM") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_PARAM"); + out_printf (out, "\tparam_spec = g_param_spec_param\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* param_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "BOXED") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_BOXED"); + out_printf (out, "\tparam_spec = g_param_spec_boxed\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* boxed_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else if (strcmp (p->gtktype, "POINTER") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_pointer\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + flags->str); + /* FIXME: VALUE_ARRAY */ + } else if (strcmp (p->gtktype, "CLOSURE") == 0) { + out_printf (out, "\tparam_spec = g_param_spec_pointer\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + flags->str); + } else if (strcmp (p->gtktype, "OBJECT") == 0) { + char *type = make_me_type (p->extra_gtktype, + "G_TYPE_BOXED"); + out_printf (out, "\tparam_spec = g_param_spec_object\n" + "\t\t(\"%s\" /* name */,\n" + "\t\t %s /* nick */,\n" + "\t\t %s /* blurb */,\n" + "\t\t %s /* object_type */,\n" + "\t\t %s);\n", + value_for_print (p->canonical_name, p->name), + value_for_print (p->nick, "NULL"), + value_for_print (p->blurb, "NULL"), + type, + flags->str); + g_free (type); + } else { + error_printf (GOB_ERROR, p->line_no, + "%s type is not supported by properties", + p->gtktype); + } + + 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); } - - out_printf(out, "\n"); - if(get_arguments > 0) - out_printf(out, "\tgtk_object_class->get_arg = ___object_get_arg;\n"); - if(set_arguments > 0) - out_printf(out, "\tgtk_object_class->set_arg = ___object_set_arg;\n"); +} + +static void +make_arguments(Class *c) +{ + GList *li; + if (get_properties > 0) + 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"); + 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; + if (n->type == PROPERTY_NODE) + make_property ((Property *)n); + else if (n->type == ARGUMENT_NODE) + make_argument ((Argument *)n); + } + out_printf(out, " }\n"); } static void print_initializer(Method *m, Variable *v) { char *root; + + if(v->glade_widget) + return; if(v->initializer == NULL) return; @@ -1191,8 +2288,15 @@ print_initializer(Method *m, Variable *v) if(v->initializer_line > 0) out_addline_infile(out, v->initializer_line); - out_printf(out, "\t%s->%s = %s;\n", + if (v->initializer_simple) + out_printf(out, "\t%s->%s = %s;\n", root, v->id, v->initializer); + else if (strcmp(v->id, "_glade_xml") == 0) + /* This is OK, this v->initializer string is set internally + and it will eat exactly one string! */ + out_printf(out,v->initializer, ((FuncArg *)m->args->data)->name); + else + out_printf(out, "%s", v->initializer); if(v->initializer_line > 0) out_addline_outfile(out); @@ -1201,9 +2305,31 @@ print_initializer(Method *m, Variable *v) } static void -print_destructor(Variable *v) +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) +{ + const char *root; if(v->destructor == NULL) return; @@ -1217,16 +2343,25 @@ 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); } else { - out_printf(out, "#define VAR (%s->%s)\n", root, v->id); + out_printf(out, "#define %s (%s->%s)\n", v->id, root, v->id); + out_printf(out, "#define VAR %s\n", v->id); out_printf(out, "\t{\n"); if(v->destructor_line > 0) out_addline_infile(out, v->destructor_line); @@ -1235,84 +2370,156 @@ print_destructor(Variable *v) if(v->destructor_line > 0) out_addline_outfile(out); - out_printf(out, "\tmemset(&VAR, 0, sizeof(VAR));\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_destroy(Class *c) +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) { out_printf(out, "\nstatic void\n" - "___destroy(GtkObject *obj_self)\n" + "___dispose (GObject *obj_self)\n" "{\n"); out_printf(out, - "#define __GOB_FUNCTION__ \"%s::destroy\"\n", + "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if(destructors > 0) { - out_printf(out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); + if (unreftors > 0 || user_dispose_method != NULL) { + out_printf (out, "\t%s *self%s = %s (obj_self);\n", + typebase, + ! no_gnu ? " G_GNUC_UNUSED" : "", + macrobase); } - if(destroy_handler) { + if (dispose_handler != NULL) { + if (unreftors > 0) { + print_unreftors (c); + } + /* so we get possible bad argument warning */ - if(destroy_handler->line_no > 0) - out_addline_infile(out, destroy_handler->line_no); - out_printf(out, "\t___%x_%s_destroy(obj_self);\n", - (guint)destroy_handler->unique_id, funcbase); - if(destroy_handler->line_no > 0) - out_addline_outfile(out); + if (dispose_handler->line_no > 0) + out_addline_infile (out, dispose_handler->line_no); + out_printf (out, "\t___%x_%s_dispose(obj_self);\n", + (guint)dispose_handler->unique_id, funcbase); + if (dispose_handler->line_no > 0) + out_addline_outfile (out); } else { - out_printf(out, - "\tif(GTK_OBJECT_CLASS(parent_class)->destroy) \\\n" - "\t\t(* GTK_OBJECT_CLASS(parent_class)->destroy)(obj_self);\n"); - } + 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(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) - print_destructor(v); + 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"); } - out_printf(out, "\treturn;\n"); - if(destructors > 0) - out_printf(out, "\tself = NULL;\n"); out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } static void -add_finalize(Class *c) +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) { - /* Sort of a hack to make it work with gtk+ 1.3/2.0 */ out_printf(out, - "\n#ifdef G_OBJECT_CLASS\n" - "static void\n" + "\nstatic void\n" "___finalize(GObject *obj_self)\n" - "#else /* !G_OBJECT_CLASS */\n" - "static void\n" - "___finalize(GtkObject *obj_self)\n" - "#endif /* G_OBJECT_CLASS */\n" "{\n"); out_printf(out, "#define __GOB_FUNCTION__ \"%s::finalize\"\n", c->otype); - if(privates > 0) { - out_printf(out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); - out_printf(out, "\tgpointer priv = self->_priv;\n"); + if (privates > 0 || + destructors > 0 || + user_finalize_method != NULL) { + const char *unused = ""; + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + out_printf(out, "\t%s *self%s = %s (obj_self);\n", + typebase, unused, macrobase); + } + if (privates > 0) { + const char *unused = ""; + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + out_printf(out, "\tgpointer priv%s = self->_priv;\n", + unused); } if(finalize_handler) { + if (destructors > 0) { + print_destructors (c); + } + /* so we get possible bad argument warning */ if(finalize_handler->line_no > 0) out_addline_infile(out, finalize_handler->line_no); @@ -1321,57 +2528,133 @@ add_finalize(Class *c) if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { - /* Sort of a hack to make it work with gtk+ 1.3/2.0 */ + 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, - "#ifdef G_OBJECT_CLASS\n" "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" - "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n" - "#else /* !G_OBJECT_CLASS */\n" - "\tif(GTK_OBJECT_CLASS(parent_class)->finalize) \\\n" - "\t\t(* GTK_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n" - "#endif /* G_OBJECT_CLASS */\n"); - } - - if(privates > 0) { - out_printf(out, "\tg_free(priv);\n"); + "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); } out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } +static void +make_bonobo_object_epv (Class *c, const char *classname) +{ + GList *li; + gboolean added_line = FALSE; + + for (li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; + Method *m = (Method *)n; + if(n->type != METHOD_NODE || + m->method == OVERRIDE_METHOD) + continue; + + if (m->bonobo_object_func) { + if(m->line_no > 0) { + out_addline_infile(out, m->line_no); + added_line = TRUE; + } else if (m->line_no == 0 && + added_line) { + out_addline_outfile(out); + added_line = FALSE; + } + out_printf (out, "\t%s->_epv.%s = self_%s;\n", + classname, m->id, m->id); + } + } + if (added_line) + 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) { + 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; if(m->method == INIT_METHOD) { if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n", "", " ", "\n", - m, FALSE, FALSE, TRUE); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, TRUE, + FALSE); + out_printf(out, "{\n"); if(m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" + out_printf(out, "#define __GOB_FUNCTION__ \"%s::init\"\n", c->otype); - if(privates > 0) { - out_printf(out, "\t%s->_priv = " - "g_new0 (%sPrivate, 1);\n", - ((FuncArg *)m->args->data)->name, - typebase); - } else if(always_private_struct) { - out_printf(out, "\t%s->_priv = NULL;\n", - ((FuncArg *)m->args->data)->name); - } + + get_instance_private(c, m); + if(initializers > 0) { GList *li; for(li = ((Class *)class)->nodes; @@ -1385,45 +2668,56 @@ 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); + print_method(out, "static ", "\n", "", " ", "", "\n", + 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(signals > 0 || - set_arguments > 0 || - get_arguments > 0 || - need_destroy || - need_finalize) { - add_unused_class = TRUE; + if (set_properties > 0 || + get_properties > 0 || + signals > 0 || + need_constructor || + need_dispose || + need_finalize) { out_printf(out, - "\tGtkObjectClass *" - "gtk_object_class = " - "(GtkObjectClass*) %s;\n", - ((FuncArg *)m->args->data)->name); - out_printf(out, - "#ifdef G_OBJECT_CLASS\n" "\tGObjectClass *" - "g_object_class = " - "(GObjectClass*) %s;\n" - "#endif /* G_OBJECT_CLASS */\n", + "g_object_class%s = " + "(GObjectClass*) %s;\n", + unused, ((FuncArg *)m->args->data)->name); did_base_obj = TRUE; } - if(overrides > 0) - add_overrides(c, - ((FuncArg *)m->args->data)->name, - did_base_obj); + if (overrides > 0) + add_overrides (c, + ((FuncArg *)m->args->data)->name, + did_base_obj); - if(initializers > 0) { + add_class_private(c, m); + + if (initializers > 0) { GList *li; for(li = ((Class *)class)->nodes; li != NULL; @@ -1439,8 +2733,8 @@ add_inits(Class *c) out_printf(out, "\n\tparent_class = "); if(for_cpp) out_printf(out, "(%sClass *)", ptypebase); - out_printf(out, "gtk_type_class (%s_get_type ());\n", - pfuncbase); + out_printf(out, "g_type_class_ref (%s);\n", + pmacrotype); if(signals > 0) add_signals(c); @@ -1449,20 +2743,22 @@ add_inits(Class *c) /* if there are no handlers for these things, we * need to set them up here */ - if(need_destroy && !destroy_handler) - out_printf(out, "\tgtk_object_class->destroy " - "= ___destroy;\n"); + 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"); if(need_finalize && !finalize_handler) - out_printf(out, - "#ifdef G_OBJECT_CLASS\n" - "\tg_object_class->finalize = ___finalize;\n" - "#else /* !G_OBJECT_CLASS */\n" - "\tgtk_object_class->finalize = ___finalize;\n" - "#endif /* G_OBJECT_CLASS */\n"); + out_printf(out, "\tg_object_class->finalize = " + "___finalize;\n"); - if(get_arguments > 0 || set_arguments > 0) + if(get_properties > 0 || set_properties > 0) make_arguments(c); + if (c->bonobo_object_class != NULL) { + make_bonobo_object_epv (c, ((FuncArg *)m->args->data)->name); + } } else continue; @@ -1473,115 +2769,199 @@ 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, - "\tgtk_object_class = NULL;\n" - "#ifdef G_OBJECT_CLASS\n" - "\tg_object_class = NULL;\n" - "#endif /* G_OBJECT_CLASS */\n"); - } out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n"); } } +static void +add_argument (Argument *a, gboolean is_set) +{ + char *s; + char *cbuf; + char *the_type_lower; + int line_no; + + if(is_set) { + cbuf = a->set; + line_no = a->set_line; + } else { + cbuf = a->get; + line_no = a->get_line; + } + if (cbuf == NULL) + return; + s = g_strdup(a->name); + gob_strup (s); + out_printf(out, "\tcase PROP_%s:\n\t{", s); + + the_type_lower = g_strdup (a->gtktype); + gob_strdown (the_type_lower); + + /* HACK because there is no g_value_set/get for unichar */ + if (strcmp (the_type_lower, "unichar") == 0) { + g_free (the_type_lower); + the_type_lower = g_strdup ("uint"); + } + + if (is_set) { + char *cast; + const char *unused = ""; + + 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 = (%s) g_value_get_%s (VAL);\n", + cast, unused, cast, the_type_lower); + + g_free (cast); + } else if ( ! is_set) { + char *cast; + + if (a->atype != NULL) + cast = get_type (a->atype, TRUE); + else + cast = g_strdup (get_cast (a->gtktype, FALSE)); + out_printf (out, "\t%s ARG;\n" + "\tmemset (&ARG, 0, sizeof (%s));\n", + cast, cast); + + g_free(cast); + } + g_free (s); + out_printf(out, "\t\t{\n"); + if (line_no > 0) + out_addline_infile (out, line_no); + out_printf (out, "%s\n", cbuf); + if (line_no > 0) + out_addline_outfile (out); + out_printf (out, "\t\t}\n"); + if ( ! is_set) { + if (strcmp (a->gtktype, "OBJECT") == 0) + out_printf (out, "\t\tg_value_set_%s (VAL, G_OBJECT (ARG));\n", + the_type_lower); + else + out_printf (out, "\t\t" + "g_value_set_%s (VAL, ARG);\n", + the_type_lower); + } + g_free (the_type_lower); + + 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"); + + out_printf (out, "\t}\n"); +} + +static void +add_property (Property *p, gboolean is_set) +{ + const char *cbuf; + char *the_type_lower; + char *name_upper; + int line_no; + + if (is_set) { + cbuf = p->set; + line_no = p->set_line; + } else { + cbuf = p->get; + line_no = p->get_line; + } + if (cbuf == NULL) + return; + + name_upper = g_strdup (p->name); + gob_strup (name_upper); + the_type_lower = g_strdup (p->gtktype); + gob_strdown (the_type_lower); + + out_printf (out, "\tcase PROP_%s:\n", name_upper); + + out_printf(out, "\t\t{\n"); + if (line_no > 0) + out_addline_infile (out, line_no); + out_printf (out, "%s\n", cbuf); + if (line_no > 0) + out_addline_outfile (out); + out_printf (out, "\t\t}\n"); + + g_free (name_upper); + g_free (the_type_lower); + + out_printf (out, "\t\tbreak;\n"); +} + 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_arg (GtkObject *object,\n" - "\tGtkArg *arg,\n" - "\tguint arg_id)\n" - "#define __GOB_FUNCTION__ \"%s::%s_arg\"\n" + "___object_%s_property (GObject *object,\n" + "\tguint property_id,\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 (arg_id) {\n", + "\tswitch (property_id) {\n", is_set ? "set" : "get", - c->otype, is_set ? "set" : "get", - typebase, macrobase); + is_set ? "const " : "", + unused, + unused, + c->otype, + is_set ? "set" : "get", + typebase, + unused, + macrobase); - for(li=c->nodes;li;li=g_list_next(li)) { + for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; - Argument *a; - char *s; - char *cbuf; - int line_no; - if(n->type != ARGUMENT_NODE) - continue; - a = (Argument *)n; - if(is_set) { - cbuf = a->set; - line_no = a->set_line; - } else { - cbuf = a->get; - line_no = a->get_line; - } - if(!cbuf) - continue; - s = g_strdup(a->name); - g_strup(s); - out_printf(out, "\tcase ARG_%s:\n", s); - if(is_set && a->atype) { - char *cast = get_type(a->atype, TRUE); - if(no_gnu || for_cpp) { - out_printf(out, "#define ARG " - "((%s)GTK_VALUE_%s(*arg))\n", - cast, a->gtktype); - } else { - out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n"); - if(strcmp(a->gtktype, "OBJECT")==0) { - out_printf(out, "#define ARG " - "({%s foo = " - "GTK_VALUE_POINTER(*arg); " - "foo; })\n", - cast); - } else { - out_printf(out, "#define ARG " - "({%s foo = " - "GTK_VALUE_%s(*arg); " - "foo; })\n", - cast, a->gtktype); - } - out_printf(out, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n"); - out_printf(out, "#define ARG " - "((%s)GTK_VALUE_%s(*arg))\n", - cast, a->gtktype); - out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n"); - } - out_printf(out, "\t\t{\n"); - g_free(cast); - } else if(!is_set && strcmp(a->gtktype, "OBJECT")==0) { - out_printf(out, - "#define ARG (GTK_VALUE_POINTER(*arg))\n" - "\t\t{\n"); - } else { - out_printf(out, - "#define ARG (GTK_VALUE_%s(*arg))\n" - "\t\t{\n", - a->gtktype); - } - g_free(s); - if(line_no > 0) - out_addline_infile(out, line_no); - out_printf(out, "%s\n", cbuf); - if(line_no > 0) - out_addline_outfile(out); - out_printf(out, "\t\t}\n\t\tbreak;\n" - "#undef ARG\n"); + if (n->type == PROPERTY_NODE) + add_property ((Property *)n, is_set); + else if (n->type == ARGUMENT_NODE) + add_argument ((Argument *)n, is_set); } - out_printf(out, "\tdefault:\n\t\tbreak;\n\t}\n" - "\treturn;\n\tself = NULL;\n\targ = NULL;\n}\n" - "#undef __GOB_FUNCTION__\n"); + out_printf (out, "\tdefault:\n" + "/* Apparently in g++ this is needed, glib is b0rk */\n" + "#ifndef __PRETTY_FUNCTION__\n" + "# undef G_STRLOC\n" + "# define G_STRLOC __FILE__ \":\" G_STRINGIFY (__LINE__)\n" + "#endif\n" + "\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n" + "\t\t%sbreak;\n\t}\n" + "}\n" + "#undef __GOB_FUNCTION__\n", hack_unused); } static void -print_checks(Method *m, FuncArg *fa) +print_checks (Method *m, FuncArg *fa) { GList *li; gboolean is_void; @@ -1589,7 +2969,7 @@ print_checks(Method *m, FuncArg *fa) is_void = (strcmp(m->mtype->name, "void")==0 && m->mtype->pointer == NULL); - for(li = fa->checks; li; li = g_list_next(li)) { + for(li = fa->checks; li != NULL; li = li->next) { Check *ch = li->data; char *s; /* point to the method prot in .gob for failed checks */ @@ -1659,15 +3039,26 @@ print_preconditions(Method *m) } static void -print_method_body(Method *m, int pre) +print_method_body (Method *m, gboolean pre, gboolean unused_self) { - out_printf(out, "{\n" - "#define __GOB_FUNCTION__ \"%s::%s\"\n", + out_printf(out, "{\n"); + if (m->line_no > 0) + out_addline_outfile(out); + out_printf(out, "#define __GOB_FUNCTION__ \"%s::%s\"\n", ((Class *)class)->otype, - get_real_id(m->id)); - if(pre) + m->id); + 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 @@ -1691,39 +3082,127 @@ print_method_body(Method *m, int pre) } static void -put_signal_args(Method *m) +put_signal_args (Method *m) { GList *li; GList *ali; - for(ali = m->gtktypes->next, li=m->args->next; - li && ali; - li=li->next, ali=ali->next) { + int i; + + if (m->args->next == NULL) + return; + + for (ali = m->gtktypes->next, li = m->args->next, i = 1; + li != NULL && ali != NULL; + li = li->next, ali = ali->next, i++) { FuncArg *fa = li->data; - const char *cast = 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 (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); + } /* we should have already proved before that the we know all the types */ - g_assert(cast); + 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], %s);\n", + i, i, t); + g_free (t); + + 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" : "", + str); + gob_strdown (set_func); + + out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n", + set_func, i, cast, fa->name); - out_printf(out, ",\n\t\t(%s)%s", cast, - fa->name); + g_free (set_func); + g_free (cast); + } +} + +static void +clear_signal_args (Method *m) +{ + GList *li; + int i; + + out_printf (out, "\n\tg_value_unset (&___param_values[0]);\n"); + + if (m->args->next == NULL) + return; + + for (li = m->args->next, i = 1; + li != NULL; + li = li->next, i++) { + out_printf (out, + "\tg_value_unset (&___param_values[%d]);\n", i); } } static char * -get_arg_names_for_macro(Method *m) +get_arg_names_for_macro (Method *m) { - char *p; + const char *sep; GList *li; GString *gs = g_string_new(NULL); - p = ""; + sep = ""; for(li=m->args;li;li=g_list_next(li)) { FuncArg *arg = li->data; - g_string_sprintfa(gs, "%s___%s", p, arg->name); - p = ","; + g_string_append_printf(gs, "%s___%s", sep, arg->name); + sep = ","; } - p = gs->str; - g_string_free(gs, FALSE); - return p; + 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 @@ -1741,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); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "\n", - m, FALSE, FALSE, TRUE); - print_method_body(m, TRUE); + print_method(out, "", "\n", "", " ", "", "\n", + 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: @@ -1759,75 +3250,155 @@ put_method(Method *m) 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); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "\n", - m, FALSE, FALSE, TRUE); - out_addline_outfile(out); - out_printf(out, "{\n"); - s = g_strdup(get_real_id(m->id)); - g_strup(s); - if(strcmp(m->mtype->name, "void") == 0 && - m->mtype->pointer == NULL) { - print_preconditions(m); - if(((FuncArg *)m->args->data)->name) - out_printf(out, "\tgtk_signal_emit (GTK_OBJECT (%s),\n" - "\t\tobject_signals[%s_SIGNAL]", - ((FuncArg *)m->args->data)->name, s); - put_signal_args(m); - out_printf(out, ");\n}\n"); - } else { - out_printf(out, "\t"); - print_type(out, m->mtype, TRUE); - out_printf(out, "return_val = ("); - print_type(out, m->mtype, TRUE); - if(m->defreturn) - out_printf(out, ")(%s);\n", m->defreturn); - else if(m->onerror) - out_printf(out, ")(%s);\n", m->onerror); + print_method(out, "", "\n", "", " ", "", "\n", + 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" + "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); + + out_printf (out, + "\n\t___param_values[0].g_type = 0;\n" + "\tg_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (%s));\n" + "\tg_value_set_instance (&___param_values[0], (gpointer) %s);\n\n", + ((FuncArg *)m->args->data)->name, + ((FuncArg *)m->args->data)->name); + + put_signal_args (m); + + if (strcmp (m->gtktypes->data, "NONE") != 0) { + const char *defret = NULL; + + out_printf (out, "\tg_value_init (&___return_val, G_TYPE_%s);\n", + (char *)m->gtktypes->data); + + if (m->defreturn != NULL) + defret = m->defreturn; + else if (m->onerror != NULL) + defret = m->onerror; + + if (defret != NULL) { + char *set_func; + /* FIXME: This code is so fucking ugly it hurts */ + gboolean do_static = + (strcmp ((char *)m->gtktypes->data, "STRING") == 0 || + strcmp ((char *)m->gtktypes->data, "BOXED") == 0); + char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE)); + if (cast == NULL) + cast = get_type (m->mtype, TRUE); + + if (strcmp (m->gtktypes->data, "UNICHAR") == 0) + /* hack because glib is braindamaged */ + set_func = g_strdup ("g_value_set_uint"); + else + set_func = g_strdup_printf ("g_value_set%s_%s", + do_static ? "_static" : "", + (char *)m->gtktypes->data); + gob_strdown (set_func); + + out_printf (out, "\t%s (&___return_val, (%s) (%s));\n", + set_func, cast, defret); + + g_free (set_func); + g_free (cast); + } + out_printf (out, "\n"); + } + + s = g_strdup (m->id); + gob_strup (s); + + out_printf(out, "\tg_signal_emitv (___param_values,\n" + "\t\tobject_signals[%s_SIGNAL],\n" + "\t\t0 /* detail */,\n" + "\t\t&___return_val);\n", s); + + g_free (s); + + clear_signal_args (m); + + if (strcmp (m->gtktypes->data, "NONE") != 0) { + char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE)); + char *getfunc; + /* Hack because glib is very very braindead */ + gboolean do_dup = + (strcmp ((char *)m->gtktypes->data, "STRING") == 0 || + strcmp ((char *)m->gtktypes->data, "BOXED") == 0 || + strcmp ((char *)m->gtktypes->data, "OBJECT") == 0 || + strcmp ((char *)m->gtktypes->data, "PARAM") == 0); + + if (strcmp (m->gtktypes->data, "UNICHAR") == 0) + /* hack because glib is braindamaged */ + getfunc = g_strdup ("g_value_get_uint"); else - out_printf(out, ")(0);\n"); - print_preconditions(m); - out_printf(out, "\tgtk_signal_emit (GTK_OBJECT (%s),\n" - "\t\tobject_signals[%s_SIGNAL]", - ((FuncArg *)m->args->data)->name, s); - put_signal_args(m); - out_printf(out, ",\n\t\t&return_val);\n" - "\treturn return_val;\n}\n"); + getfunc = g_strdup_printf ("g_value_%s_%s", + do_dup ? "dup" : "get", + (char *)m->gtktypes->data); + gob_strdown (getfunc); + + if (cast == NULL) + cast = get_type (m->mtype, TRUE); + + out_printf (out, + "\n\t{\n" + "\t\t"); + print_type (out, m->mtype, TRUE); + out_printf (out, + " ___ret = (%s) %s (&___return_val);\n" + "\t\tg_value_unset (&___return_val);\n" + "\t\treturn ___ret;\n" + "\t}\n", + cast, getfunc); + + g_free (cast); + g_free (getfunc); } + out_printf(out, "}\n"); if(!m->cbuf) break; 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); + print_method(out, "static ", "\n___real_", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case VIRTUAL_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); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "\n", - m, FALSE, FALSE, TRUE); + print_method(out, "", "\n", "", " ", "", "\n", + 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", macrobase, ((FuncArg *)m->args->data)->name, - get_real_id(m->id)); + m->id); if(strcmp(m->mtype->name, "void") == 0 && m->mtype->pointer == NULL) { GList *li; out_printf(out, "\t\t(*klass->%s)(%s", - get_real_id(m->id), + m->id, ((FuncArg *)m->args->data)->name); for(li=m->args->next;li;li=g_list_next(li)) { FuncArg *fa = li->data; @@ -1837,7 +3408,7 @@ put_method(Method *m) } else { GList *li; out_printf(out, "\t\treturn (*klass->%s)(%s", - get_real_id(m->id), + m->id, ((FuncArg *)m->args->data)->name); for(li=m->args->next;li;li=g_list_next(li)) { FuncArg *fa = li->data; @@ -1859,9 +3430,9 @@ put_method(Method *m) break; 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); + print_method(out, "static ", "\n___real_", "", " ", "", "\n", + m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case OVERRIDE_METHOD: @@ -1870,24 +3441,24 @@ put_method(Method *m) if(m->line_no > 0) 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); + print_method(out, "static ", s, "", " ", "", "\n", + m, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE); g_free(s); out_addline_outfile(out); s = replace_sep(m->otype, '_'); - g_strup(s); + gob_strup (s); args = get_arg_names_for_macro(m); if(is_void) { out_printf(out, "#define PARENT_HANDLER(%s) \\\n" "\t{ if(%s_CLASS(parent_class)->%s) \\\n" "\t\t(* %s_CLASS(parent_class)->%s)(%s); }\n", - args, s, get_real_id(m->id), s, get_real_id(m->id), args); + args, s, m->id, s, m->id, args); } else { out_printf(out, "#define PARENT_HANDLER(%s) \\\n" "\t((%s_CLASS(parent_class)->%s)? \\\n" "\t\t(* %s_CLASS(parent_class)->%s)(%s): \\\n" "\t\t(", - args, s, get_real_id(m->id), s, get_real_id(m->id), args); + args, s, m->id, s, m->id, args); out_printf(out, "("); print_type(out, m->mtype, TRUE); out_printf(out, ")%s))\n", @@ -1895,10 +3466,19 @@ 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; + 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; } @@ -1909,93 +3489,111 @@ open_files(void) { char *outfile, *outfileh, *outfileph; - if(!for_cpp) - outfile = g_strconcat(filebase, ".c", NULL); - else - outfile = g_strconcat(filebase, ".cc", NULL); - if(no_touch_headers) - outfileh = g_strconcat("#gob#", filebase, ".h#gob#", NULL); - else - outfileh = g_strconcat(filebase, ".h", NULL); + outfilebase = g_strconcat (fullfilebase, for_cpp ? ".cc" : ".c", NULL); + outfile = g_strconcat(outfilebase, no_touch ? "#gob#" : "", NULL); - if((privates > 0 || protecteds > 0 || - private_header == PRIVATE_HEADER_ALWAYS) && - private_header != PRIVATE_HEADER_NEVER) - outfileph = g_strconcat(filebase, "-private.h", NULL); - else - outfileph = NULL; + outfilehbase = g_strconcat (fullfilebase, ".h", NULL); + outfileh = g_strconcat(outfilehbase, no_touch_headers ? "#gob#" : "", NULL); - - if(no_write) { - devnull = fopen("/dev/null", "w"); - if(!devnull) - g_error("Cannot open null device"); - out = devnull; - outh = devnull; - if(outfileph) - outph = devnull; + if ((privates > 0 || protecteds > 0 || + private_header == PRIVATE_HEADER_ALWAYS) && + private_header != PRIVATE_HEADER_NEVER) { + char sep[2] = {0,0}; + if (file_sep != 0) + sep[0] = file_sep; + outfilephbase = g_strconcat (fullfilebase, sep, "private.h", NULL); + outfileph = g_strconcat (outfilephbase, no_touch_headers ? "#gob#" : "", NULL); } else { - out = fopen(outfile, "w"); - if(!out) { - g_error("Cannot open outfile: %s", outfile); + outfilephbase = NULL; + outfileph = NULL; + } + + + if ( ! no_write) { + out = fopen (outfile, "w"); + if (out == NULL) { + error_printf (GOB_ERROR, 0, + "Cannot open outfile: %s", outfile); + } + outh = fopen (outfileh, "w"); + if (outh == NULL) { + error_printf (GOB_ERROR, 0, + "Cannot open outfile: %s", outfileh); } - outh = fopen(outfileh, "w"); - if(!outh) - g_error("Cannot open outfile: %s", outfileh); - if(outfileph) { - outph = fopen(outfileph, "w"); - if(!outph) - g_error("Cannot open outfile: %s", outfileh); + if (outfileph != NULL) { + outph = fopen (outfileph, "w"); + if (outph == NULL) { + error_printf (GOB_ERROR, 0, + "Cannot open outfile: %s", + outfileph); + } } } } static void -put_argument_nongnu_wrappers(Class *c) +put_argument_nongnu_wrappers (Class *c) { GList *li; - if(get_arguments < 0 && set_arguments < 0) + if (get_properties < 0 && set_properties < 0) return; - for(li=c->nodes;li;li=g_list_next(li)) { + for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; - Argument *a = (Argument *)n; + const char *name, *gtktype; + gboolean get, set; + Type *atype; char *aname; char *cast; - if(n->type != ARGUMENT_NODE) + if (n->type == ARGUMENT_NODE) { + Argument *a = (Argument *)n; + name = a->name; + gtktype = a->gtktype; + atype = a->atype; + get = a->get != NULL; + set = a->set != NULL; + } else if (n->type == PROPERTY_NODE) { + Property *p = (Property *)n; + name = p->name; + gtktype = p->gtktype; + atype = p->ptype; + get = p->get != NULL; + set = p->set != NULL; + } else { continue; + } - aname = g_strdup(a->name); - g_strup(aname); + aname = g_strdup (name); + gob_strup (aname); - if(a->atype) - cast = get_type(a->atype, TRUE); + if (atype != NULL) + cast = get_type (atype, TRUE); else - cast = g_strdup(get_cast(a->gtktype, TRUE)); - - if(cast) { - if(a->set) - out_printf(outh, "#define %s_ARG_%s(arg) \t" - "\"%s\",(%s)(arg)\n", - macrobase, aname, a->name, cast); - if(a->get) - out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" - "\"%s\",(%s*)(arg)\n", - macrobase, aname, a->name, cast); + cast = g_strdup (get_cast (gtktype, TRUE)); + + if (cast != NULL) { + if (set) + out_printf (outh, "#define %s_PROP_%s(arg) \t" + "\"%s\",(%s)(arg)\n", + macrobase, aname, name, cast); + if (get) + out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" + "\"%s\",(%s*)(arg)\n", + macrobase, aname, name, cast); } else { - if(a->set) - out_printf(outh, "#define %s_ARG_%s(arg) \t" - "\"%s\",(arg)\n", - macrobase, aname, a->name); - if(a->get) - out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" - "\"%s\",(arg)\n", - macrobase, aname, a->name); + if(set) + out_printf (outh, "#define %s_PROP_%s(arg) \t" + "\"%s\",(arg)\n", + macrobase, aname, name); + if(get) + out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" + "\"%s\",(arg)\n", + macrobase, aname, name); } - g_free(cast); - g_free(aname); + g_free (cast); + g_free (aname); } } @@ -2004,43 +3602,64 @@ put_argument_gnu_wrappers(Class *c) { GList *li; - if(get_arguments < 0 && set_arguments < 0) + if(get_properties < 0 && set_properties < 0) return; - for(li=c->nodes;li;li=g_list_next(li)) { + for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; - Argument *a = (Argument *)n; - char *s; + const char *name, *gtktype; + gboolean get, set; + Type *atype; + char *aname; char *cast; - if(n->type != ARGUMENT_NODE) + + if (n->type == ARGUMENT_NODE) { + Argument *a = (Argument *)n; + name = a->name; + gtktype = a->gtktype; + atype = a->atype; + get = a->get != NULL; + set = a->set != NULL; + } else if (n->type == PROPERTY_NODE) { + Property *p = (Property *)n; + name = p->name; + gtktype = p->gtktype; + atype = p->ptype; + get = p->get != NULL; + set = p->set != NULL; + } else { continue; - s = g_strdup(a->name); - g_strup(s); - if(a->atype) - cast = get_type(a->atype, TRUE); + } + + aname = g_strdup (name); + gob_strup (aname); + + if (atype != NULL) + cast = get_type (atype, TRUE); else - cast = g_strdup(get_cast(a->gtktype, TRUE)); - if(cast) { - if(a->set) - out_printf(outh, "#define %s_ARG_%s(arg) \t" - "\"%s\",({%sz = (arg); z;})\n", - macrobase, s, a->name, cast); - if(a->get) - out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" - "\"%s\",({%s*z = (arg); z;})\n", - macrobase, s, a->name, cast); + cast = g_strdup (get_cast (gtktype, TRUE)); + + if (cast != NULL) { + if (set) + out_printf (outh, "#define %s_PROP_%s(arg) \t" + "\"%s\", __extension__ ({%sz = (arg); z;})\n", + macrobase, aname, name, cast); + if (get) + out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" + "\"%s\", __extension__ ({%s*z = (arg); z;})\n", + macrobase, aname, name, cast); } else { - if(a->set) - out_printf(outh, "#define %s_ARG_%s(arg) \t" + if (set) + out_printf (outh, "#define %s_PROP_%s(arg) \t" "\"%s\",(arg)\n", - macrobase, s, a->name); - if(a->get) - out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" + macrobase, aname, name); + if (get) + out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" "\"%s\",(arg)\n", - macrobase, s, a->name); + macrobase, aname, name); } - g_free(cast); - g_free(s); + g_free (cast); + g_free (aname); } } @@ -2073,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"); @@ -2089,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) @@ -2098,10 +3719,16 @@ print_ccode_block(CCode *cc) static void print_class_block(Class *c) { - GList *l; + GList *li; 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]) @@ -2127,32 +3754,28 @@ print_class_block(Class *c) "(%s_get_type())\n", macrotype, funcbase); out_printf(outh, "#define %s(obj)\t" - "GTK_CHECK_CAST((obj), %s_get_type(), %s)\n", + "G_TYPE_CHECK_INSTANCE_CAST((obj), %s_get_type(), %s)\n", macrobase, funcbase, typebase); out_printf(outh, "#define %s_CONST(obj)\t" - "GTK_CHECK_CAST((obj), %s_get_type(), %s const)\n", + "G_TYPE_CHECK_INSTANCE_CAST((obj), %s_get_type(), %s const)\n", macrobase, funcbase, typebase); out_printf(outh, "#define %s_CLASS(klass)\t" - "GTK_CHECK_CLASS_CAST((klass), %s_get_type(), %sClass)\n", + "G_TYPE_CHECK_CLASS_CAST((klass), %s_get_type(), %sClass)\n", macrobase, funcbase, typebase); out_printf(outh, "#define %s(obj)\t" - "GTK_CHECK_TYPE((obj), %s_get_type ())\n\n", + "G_TYPE_CHECK_INSTANCE_TYPE((obj), %s_get_type ())\n\n", macrois, funcbase); - out_printf(outh, "#ifdef GTK_CHECK_GET_CLASS\n" + out_printf(outh, "#define %s_GET_CLASS(obj)\t" - "GTK_CHECK_GET_CLASS((obj), %s_get_type(), %sClass)\n", + "G_TYPE_INSTANCE_GET_CLASS((obj), %s_get_type(), %sClass)\n", macrobase, funcbase, typebase); - out_printf(outh, "#else /* !GTK_CHECK_GET_CLASS */\n" - "#define %s_GET_CLASS(obj)\t" - "((%sClass *)GTK_OBJECT(obj)->klass)\n" - "#endif /* GTK_CHECK_GET_CLASS */\n", - macrobase, typebase); - if( ! no_self_alias) { + if ( ! no_self_alias) { out_printf(out, "/* self casting macros */\n"); out_printf(out, "#define SELF(x) %s(x)\n", macrobase); out_printf(out, "#define SELF_CONST(x) %s_CONST(x)\n", macrobase); out_printf(out, "#define IS_SELF(x) %s(x)\n", macrois); + out_printf(out, "#define TYPE_SELF %s\n", macrotype); out_printf(out, "#define SELF_CLASS(x) %s_CLASS(x)\n\n", macrobase); out_printf(out, "#define SELF_GET_CLASS(x) %s_GET_CLASS(x)\n\n", @@ -2163,36 +3786,31 @@ print_class_block(Class *c) out_printf(out, "typedef %sClass SelfClass;\n\n", typebase); } - out_printf(out, "/* GTK_CLASS_TYPE for 1.2<->1.3/2.0 GTK+ compatibility */\n"); - out_printf(out, - "#ifndef GTK_CLASS_TYPE\n" - "#define GTK_CLASS_TYPE(x) (GTK_OBJECT_CLASS(x)->type)\n" - "#endif /* GTK_CLASS_TYPE */\n\n"); - - if(privates > 0 || always_private_struct) { - out_printf(outh, "\n/* Private structure type */\n"); - out_printf(outh, "typedef struct _%sPrivate %sPrivate;\n", + if (privates > 0 || + always_private_struct) { + out_printf (outh, "\n/* Private structure type */\n"); + out_printf (outh, "typedef struct _%sPrivate %sPrivate;\n", typebase, typebase); - if(privates == 0) - out_printf(outh, "/* There are no privates, this " - "structure is thus never defined */\n"); + if (privates == 0) + out_printf (outh, "/* There are no privates, this " + "structure is thus never defined */\n"); } - out_printf(outh, "\n/*\n" - " * Main object structure\n" - " */\n"); - s = replace_sep(c->otype, '_'); - g_strup(s); - out_printf(outh, "#ifndef __TYPEDEF_%s__\n" - "#define __TYPEDEF_%s__\n", s, s); - g_free(s); - out_printf(outh, "typedef struct _%s %s;\n" - "#endif\n", typebase, typebase); - out_printf(outh, "struct _%s {\n\t%s __parent__;\n", - typebase, ptypebase); - for(l=c->nodes; l; l=g_list_next(l)) { + out_printf (outh, "\n/*\n" + " * Main object structure\n" + " */\n"); + s = replace_sep (c->otype, '_'); + gob_strup (s); + out_printf (outh, "#ifndef __TYPEDEF_%s__\n" + "#define __TYPEDEF_%s__\n", s, s); + g_free (s); + out_printf (outh, "typedef struct _%s %s;\n" + "#endif\n", typebase, typebase); + out_printf (outh, "struct _%s {\n\t%s __parent__;\n", + typebase, ptypebase); + for (li = c->nodes; li; li=li->next) { static gboolean printed_public = FALSE; - Node *n = l->data; + Node *n = li->data; Variable *v = (Variable *)n; if(n->type == VARIABLE_NODE && v->scope == PUBLIC_SCOPE) { @@ -2204,48 +3822,52 @@ print_class_block(Class *c) } } /* put protecteds always AFTER publics */ - for(l=c->nodes; l; l=g_list_next(l)) { - Node *n = l->data; + for (li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; Variable *v = (Variable *)n; - if(n->type == VARIABLE_NODE && - v->scope == PROTECTED_SCOPE) { - if( ! printed_private) { - out_printf(outh, "\t/*< private >*/\n"); + if (n->type == VARIABLE_NODE && + v->scope == PROTECTED_SCOPE) { + if ( ! printed_private) { + out_printf (outh, "\t/*< private >*/\n"); printed_private = TRUE; } - put_variable((Variable *)n, outh); + put_variable ((Variable *)n, outh); } } - if(privates > 0 || always_private_struct) { - if( ! printed_private) - out_printf(outh, "\t/*< private >*/\n"); - out_printf(outh, "\t%sPrivate *_priv;\n", typebase); + if (privates > 0 || + always_private_struct) { + if ( ! printed_private) + out_printf (outh, "\t/*< private >*/\n"); + out_printf (outh, "\t%sPrivate *_priv;\n", typebase); } - out_printf(outh, "};\n"); + out_printf (outh, "};\n"); - if(privates > 0) { + if (privates > 0) { FILE *outfp; /* if we are to stick this into the private header, if not stick it directly into the C file */ - if(outph) + if (outph != NULL) outfp = outph; else outfp = out; - out_printf(outfp, "struct _%sPrivate {\n", - typebase); - for(l=c->nodes; l; l=l->next) { - Node *n = l->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_printf (outfp, "struct _%sPrivate {\n", + typebase); + 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"); } @@ -2257,46 +3879,65 @@ print_class_block(Class *c) out_printf(outh, "struct _%sClass {\n\t%sClass __parent__;\n", typebase, ptypebase); - for(l = c->nodes; l != NULL; l = l->next) { - Node *n = l->data; + for(li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; if(n->type == METHOD_NODE) put_vs_method((Method *)n); } + /* If BonoboX type class put down the epv */ + if (c->bonobo_object_class != NULL) { + out_printf (outh, + "\t/* Bonobo object epv */\n" + "\tPOA_%s__epv _epv;\n", + c->bonobo_object_class); + } /* put class scope variables */ - for(l = c->nodes; l != NULL; l = l->next) { - Node *n = l->data; + for (li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; Variable *v = (Variable *)n; - if(n->type == VARIABLE_NODE && - v->scope == CLASS_SCOPE) - put_variable((Variable *)n, outh); + if (n->type == VARIABLE_NODE && + v->scope == CLASS_SCOPE) + put_variable ((Variable *)n, outh); } - out_printf(outh, "};\n\n"); + out_printf (outh, "};\n\n"); - out_printf(out, "/* here are local prototypes */\n"); - if(set_arguments > 0) { - out_printf(out, "static void ___object_set_arg " - "(GtkObject *object, GtkArg *arg, " - "guint arg_id);\n"); + out_printf (out, "/* here are local prototypes */\n"); + if (set_properties > 0) { + out_printf (out, "static void ___object_set_property " + "(GObject *object, guint property_id, " + "const GValue *value, GParamSpec *pspec);\n"); } - if(get_arguments > 0) { - out_printf(out, "static void ___object_get_arg " - "(GtkObject *object, GtkArg *arg, " - "guint arg_id);\n"); + if (get_properties > 0) { + out_printf (out, "static void ___object_get_property " + "(GObject *object, guint property_id, " + "GValue *value, GParamSpec *pspec);\n"); } - out_printf(outh, "\n/*\n" - " * Public methods\n" - " */\n"); + out_printf (outh, "\n/*\n" + " * Public methods\n" + " */\n"); + + 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"); + } - out_printf(outh, "GtkType\t%s_get_type\t(void)", funcbase); - if ( ! no_gnu) { - out_printf(outh, " G_GNUC_CONST;\n"); - } else { - out_printf(outh, ";\n"); + if (c->dynamic) { + out_printf(outh, "void\t%s_register_type\t(GTypeModule *);\n", + funcbase); } - for(l = c->nodes; l != NULL; l = l->next) { - Node *n = l->data; + for(li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; if(n->type == METHOD_NODE) { put_pub_method((Method *)n); put_prot_method((Method *)n); @@ -2304,88 +3945,158 @@ print_class_block(Class *c) } } -/* this idea is less and less apealing to me */ -#if 0 - if(!no_signal_connect) { - if(signals>0) { - out_printf(outh, "\n/*\n" - " * Signal connection methods\n" - " */\n"); + /* this idea is less and less apealing to me */ + if (signals > 0) { + out_printf (outh, "\n/*\n" + " * Signal connection wrapper macros\n" + " */\n"); + if( ! no_gnu) { + out_printf(outh, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n"); + put_signal_macros (c, TRUE); + out_printf(outh, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n"); + put_signal_macros (c, FALSE); + out_printf(outh, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n"); + } else { + put_signal_macros (c, FALSE); + out_printf(outh, "\n"); } - for(l=c->nodes;l;l=g_list_next(l)) { - Node *n = l->data; - if(n->type == METHOD_NODE) - put_signal_connect((Method *)n); - } + out_printf (out, "\n/*\n" + " * Signal connection wrapper macro shortcuts\n" + " */\n"); + put_local_signal_macros (c); + out_printf(outh, "\n"); } -#endif - /* argument wrapping macros */ - if(get_arguments > 0 || set_arguments > 0) { + if(get_properties > 0 || set_properties > 0) { + out_printf(outh, "\n/*\n" + " * Argument wrapping macros\n" + " */\n"); if( ! no_gnu) { - out_printf(outh, "\n/*\n" - " * Argument wrapping macros\n" - " */\n"); out_printf(outh, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n"); put_argument_gnu_wrappers(c); out_printf(outh, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n"); put_argument_nongnu_wrappers(c); out_printf(outh, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n"); } else { - out_printf(outh, "\n/*\n" - " * Argument wrapping macros\n" - " */\n"); put_argument_nongnu_wrappers(c); } } if(signals > 0) { - for(l = c->nodes; l != NULL; l = l->next) { - Node *n = l->data; + for(li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; if(n->type == METHOD_NODE) add_signal_prots((Method *)n); } } - add_enums(c); - - add_get_type(); + 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"); + out_printf (out, "/* Short form macros */\n"); + make_method_aliases (c); + } + + add_interface_inits (c); + + if (!overrode_get_type) { + if (c->bonobo_object_class != NULL) + add_bonobo_object_get_type(); + else if (c->dynamic) + add_dynamic_get_type(); + else + add_get_type(); + } + + out_printf (out, "/* a macro for creating a new object of our type */\n"); + out_printf (out, + "#define GET_NEW ((%s *)g_object_new(%s_get_type(), NULL))\n\n", + typebase, funcbase); + + out_printf (out, "/* a function for creating a new object of our type */\n"); + out_printf (out, "#include \n"); + out_printf (out, + "static %s * GET_NEW_VARG (const char *first, ...)%s;\n" + "static %s *\nGET_NEW_VARG (const char *first, ...)\n" + "{\n\t%s *ret;\n\tva_list ap;\n" + "\tva_start (ap, first);\n" + "\tret = (%s *)g_object_new_valist (%s_get_type (), " + "first, ap);\n" + "\tva_end (ap);\n" + "\treturn ret;\n}\n\n", + typebase, + no_gnu ? "" : " G_GNUC_UNUSED", + typebase, typebase, typebase, funcbase); + + if (c->glade_xml) + { + out_printf (out, "/* a function to connect glade callback */\n"); + out_printf (out,"static void\n" + "___glade_xml_connect_foreach(const gchar *handler_name,\n" + "GObject *object,\n" + "const gchar *signal_name,\n" + "const gchar *signal_data,\n" + "GObject *connect_object,\n" + "gboolean after,\n" + "gpointer user_data)\n" + "{\n" + "\tstatic GModule * allsymbols = NULL;\n" + " \n" + "\tif (!allsymbols) allsymbols = g_module_open(NULL, 0);\n" + "\tif (allsymbols) {\n" + "\t\tgchar * func_name = g_strdup_printf(\"%s_%%s\", handler_name);\n" + "\t\tGCallback func;\n" + "\n" + "\t\tif (!g_module_symbol(allsymbols, func_name, (gpointer)&func)){\n" + "\t\t\tif (!g_module_symbol(allsymbols, handler_name, (gpointer)&func)) {\n" + "\t\t\t\tg_warning(\"could not find signal handler '%%s'.\", func_name);\n" + "\t\t\t\tg_free(func_name);\n" + "\t\t\t\treturn;\n" + "\t\t\t}\n" + "\t\t}\n" + "\t\tif (after)\n" + "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);\n" + "\t\telse\n" + "\t\t\tg_signal_connect_data(object, signal_name, func, user_data, NULL, G_CONNECT_SWAPPED);\n" + "\t\tg_free(func_name);\n" + "\t}\n" + "}\n" + "\n", + funcbase); + } + + for (li = nodes; li != NULL; li = li->next) { + Node *node = li->data; + if (node->type == CCODE_NODE) { + CCode *cc = (CCode *)node; + if (cc->cctype == AD_CCODE) + print_ccode_block (cc); } - make_method_nongnu_aliases(c); } - out_printf(out, "/* a macro for creating a new object of our type */\n"); - out_printf(out, - "#define GET_NEW ((%s *)gtk_type_new(%s_get_type()))\n\n", - typebase, funcbase); + if (need_constructor) + add_constructor (c); - if(need_destroy) - add_destroy(c); + if (need_dispose) + add_dispose (c); - if(need_finalize) - add_finalize(c); + if (need_finalize) + add_finalize (c); add_inits(c); - if(set_arguments > 0) { + if(set_properties > 0) { add_getset_arg(c, TRUE); } - if(get_arguments > 0) { + if(get_properties > 0) { add_getset_arg(c, FALSE); } - for(l = c->nodes; l != NULL; l = l->next) { - Node *n = l->data; + for(li = c->nodes; li != NULL; li = li->next) { + Node *n = li->data; if(n->type == METHOD_NODE) put_method((Method *)n); } @@ -2394,29 +4105,49 @@ print_class_block(Class *c) } static void -print_version_macros(void) +print_useful_macros(void) { - int major=0, minor=0, pl=0; - sscanf(VERSION, "%d.%d.%d", &major, &minor, &pl); + int major = 0, minor = 0, pl = 0; + + /* Version stuff */ + sscanf (VERSION, "%d.%d.%d", &major, &minor, &pl); + out_printf (out, "#define GOB_VERSION_MAJOR %d\n", major); + out_printf (out, "#define GOB_VERSION_MINOR %d\n", minor); + out_printf (out, "#define GOB_VERSION_PATCHLEVEL %d\n\n", pl); + + /* Useful priv macro thingie */ + /* FIXME: this should be done the same way that priv is, as a var, + * not a define */ + out_printf (out, "#define selfp (self->_priv)\n\n"); +} - out_printf(out, "#define GOB_VERSION_MAJOR %d\n", major); - out_printf(out, "#define GOB_VERSION_MINOR %d\n", minor); - out_printf(out, "#define GOB_VERSION_PATCHLEVEL %d\n\n", pl); +static void +print_more_useful_macros (void) +{ + if (no_gnu) { + out_printf (out, "#define ___GOB_LIKELY(expr) (expr)\n"); + out_printf (out, "#define ___GOB_UNLIKELY(expr) (expr)\n"); + } else { + out_printf (out, "#ifdef G_LIKELY\n"); + out_printf (out, "#define ___GOB_LIKELY(expr) G_LIKELY(expr)\n"); + out_printf (out, "#define ___GOB_UNLIKELY(expr) G_UNLIKELY(expr)\n"); + out_printf (out, "#else /* ! G_LIKELY */\n"); + out_printf (out, "#define ___GOB_LIKELY(expr) (expr)\n"); + out_printf (out, "#define ___GOB_UNLIKELY(expr) (expr)\n"); + out_printf (out, "#endif /* G_LIKELY */\n"); + } } 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"); } @@ -2428,8 +4159,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"); } @@ -2443,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 " @@ -2469,7 +4203,7 @@ print_header_prefixes(void) char *p; p = replace_sep(((Class *)class)->otype, '_'); - g_strup(p); + gob_strup (p); out_printf(outh, "#ifndef __%s_H__\n#define __%s_H__\n\n", p, p); if(outph) out_printf(outph, "#ifndef __%s_PRIVATE_H__\n" @@ -2510,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); } } @@ -2526,20 +4261,235 @@ print_header_top(void) { GList *li; - /* mandatory include */ - out_printf(outh, "#include \n\n"); + /* mandatory includes */ + out_printf (outh, "#include \n"); + out_printf (outh, "#include \n"); /* print the HT_CCODE blocks */ - for(li=nodes;li;li=g_list_next(li)) { + for (li = nodes; li != NULL; li = li->next) { Node *node = li->data; - if(node->type == CCODE_NODE) { + if (node->type == CCODE_NODE) { CCode *cc = (CCode *)node; - if(cc->cctype == HT_CCODE) - print_ccode_block((CCode *)node); + if (cc->cctype == HT_CCODE) + print_ccode_block ((CCode *)node); } } } +static void +print_enum (EnumDef *enode) +{ + GList *li; + char *funcprefix; + char *type; + char *str; + + funcprefix = replace_sep (enode->etype, '_'); + gob_strdown (funcprefix); + out_printf (out, "static const GEnumValue _%s_values[] = {\n", + funcprefix); + type = remove_sep (enode->etype); + + out_printf (outh, "\ntypedef enum {\n"); + + for (li = enode->values; li != NULL; li = li->next) { + EnumValue *value = li->data; + char *p; + char *sname = gob_strdown (g_strdup (value->name)); + + while ((p = strchr (sname, '_')) != NULL) + *p = '-'; + + out_printf (outh, "\t%s_%s", enode->prefix, value->name); + if (value->value != NULL) + out_printf (outh, " = %s", value->value); + if (li->next != NULL) + out_printf (outh, ",\n"); + else + out_printf (outh, "\n"); + + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", + enode->prefix, value->name, + enode->prefix, value->name, + sname); + + g_free (sname); + } + + out_printf (out, "\t{ 0, NULL, NULL }\n};\n\n"); + + out_printf (outh, "} %s;\n", type); + + str = make_pre_macro (enode->etype, "TYPE"); + out_printf (outh, "#define %s ", str); + g_free (str); + + out_printf (outh, "%s_get_type()\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" + "{\n" + "\tstatic GType type = 0;\n" + "\tif ___GOB_UNLIKELY(type == 0)\n" + "\t\ttype = g_enum_register_static (\"%s\", _%s_values);\n" + "\treturn type;\n" + "}\n\n", + funcprefix, type, funcprefix); + + g_free (funcprefix); + g_free (type); +} + +static void +print_flags (Flags *fnode) +{ + GList *li; + char *funcprefix; + char *type; + char *str; + int i; + + funcprefix = replace_sep (fnode->ftype, '_'); + gob_strdown (funcprefix); + out_printf (out, "static const GFlagsValue _%s_values[] = {\n", + funcprefix); + type = remove_sep (fnode->ftype); + + out_printf (outh, "\ntypedef enum {\n"); + + for (i = 0, li = fnode->values; li != NULL; i++, li = li->next) { + const char *name = li->data; + char *p; + char *sname = gob_strdown (g_strdup (name)); + + while ((p = strchr (sname, '_')) != NULL) + *p = '-'; + + out_printf (outh, "\t%s_%s = 1<<%d", + fnode->prefix, name, i); + if (li->next != NULL) + out_printf (outh, ",\n"); + else + out_printf (outh, "\n"); + + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", + fnode->prefix, name, + fnode->prefix, name, + sname); + + g_free (sname); + } + + out_printf (out, "\t{ 0, NULL, NULL }\n};\n\n"); + + out_printf (outh, "} %s;\n", type); + + str = make_pre_macro (fnode->ftype, "TYPE"); + out_printf (outh, "#define %s ", str); + g_free (str); + + out_printf (outh, "%s_get_type()\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" + "{\n" + "\tstatic GType type = 0;\n" + "\tif ___GOB_UNLIKELY(type == 0)\n" + "\t\ttype = g_flags_register_static (\"%s\", _%s_values);\n" + "\treturn type;\n" + "}\n\n", + funcprefix, type, funcprefix); + + g_free (funcprefix); + g_free (type); +} + +static void +print_error (Error *enode) +{ + GList *li; + char *funcprefix; + char *type; + char *str; + + funcprefix = replace_sep (enode->etype, '_'); + gob_strdown (funcprefix); + out_printf (out, "static const GEnumValue _%s_values[] = {\n", + funcprefix); + type = remove_sep (enode->etype); + + out_printf (outh, "\ntypedef enum {\n"); + + for (li = enode->values; li != NULL; li = li->next) { + const char *name = li->data; + char *p; + char *sname = gob_strdown (g_strdup (name)); + + while ((p = strchr (sname, '_')) != NULL) + *p = '-'; + + out_printf (outh, "\t%s_%s", enode->prefix, name); + if (li->next != NULL) + out_printf (outh, ",\n"); + else + out_printf (outh, "\n"); + + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", + enode->prefix, name, + enode->prefix, name, + sname); + + g_free (sname); + } + + out_printf (out, "\t{ 0, NULL, NULL }\n};\n\n"); + + out_printf (outh, "} %s;\n", type); + + str = make_pre_macro (enode->etype, "TYPE"); + out_printf (outh, "#define %s ", str); + g_free (str); + + out_printf (outh, "%s_get_type ()\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" + "{\n" + "\tstatic GType type = 0;\n" + "\tif ___GOB_UNLIKELY(type == 0)\n" + "\t\ttype = g_enum_register_static (\"%s\", _%s_values);\n" + "\treturn type;\n" + "}\n\n", + funcprefix, type, funcprefix); + + out_printf (outh, "#define %s %s_quark ()\n", enode->prefix, funcprefix); + out_printf (outh, "GQuark %s_quark (void);\n\n", funcprefix); + + str = replace_sep (enode->etype, '-'); + gob_strdown (str); + + out_printf (out, + "GQuark\n%s_quark (void)\n" + "{\n" + "\tstatic GQuark q = 0;\n" + "\tif (q == 0)\n" + "\t\tq = g_quark_from_static_string (\"%s\");\n" + "\treturn q;\n" + "}\n\n", + funcprefix, str); + + g_free (str); + + g_free (funcprefix); + g_free (type); +} + static void generate_outfiles(void) { @@ -2553,265 +4503,426 @@ generate_outfiles(void) print_header_prefixes(); - print_version_macros(); + print_useful_macros(); print_includes(); - for(li=nodes;li;li=g_list_next(li)) { + print_more_useful_macros (); + + for (li = nodes; li != NULL; li = li->next) { Node *node = li->data; - if(node->type == CCODE_NODE) { + if (node->type == CCODE_NODE) { CCode *cc = (CCode *)node; - if(cc->cctype != HT_CCODE && - cc->cctype != AT_CCODE) - print_ccode_block((CCode *)node); - } else if(node->type == CLASS_NODE) { - print_class_block((Class *)node); - } else + if (cc->cctype != HT_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); + } else if (node->type == ENUMDEF_NODE) { + print_enum ((EnumDef *)node); + } else if (node->type == FLAGS_NODE) { + print_flags ((Flags *)node); + } else if (node->type == ERROR_NODE) { + print_error ((Error *)node); + } else { g_assert_not_reached(); + } } print_header_postfixes(); } -static void -print_help(void) -{ - fprintf(stderr, "Gob version %s\n\n", VERSION); - fprintf(stderr, "gob [options] file.gob\n\n"); - fprintf(stderr, "Options:\n" - "\t--help,-h,-? Display this help\n" - "\t--version Display version\n" - "\t--exit-on-warn,-w Exit with an error on warnings\n" - "\t--no-exit-on-warn Don't exit on warnings [default]\n" - "\t--for-cpp Create C++ files\n" - "\t--no-extern-c Never print extern \"C\" into the " - "header\n" - "\t--no-gnu Never use GNU extentions\n" - "\t--no-touch-headers Don't touch headers unless they " - "really changed\n" - "\t--always-private-header Always create a private header " - "file,\n" - "\t even if it would be empty " - "[default]\n" - "\t--ondemand-private-header Create private header only when " - "needed\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--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 Don't remove the leading underscore " - "from\n" - "\t short id names\n"); -} - -static void -parse_options(int argc, char *argv[]) +static void print_version(void) { - int i; - int got_file = FALSE; - int no_opts = FALSE; + 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."); +} - filename = NULL; +static void print_usage(FILE *f) +{ + fprintf(f, "Usage: %s [options] file.gob\n", g_get_prgname()); + if (f == stderr) { + fprintf(f, "Try '%s --help' for more information.\n", + g_get_prgname()); + } +} - for(i = 1 ; i < argc; i++) { - 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-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_kill_underscores = TRUE; - } else if(strcmp(argv[i], "--always-private-struct")==0) { - always_private_struct = TRUE; - } else if(strcmp(argv[i], "--")==0) { - /*further arguments are files*/ - no_opts = TRUE; - } else if(strncmp(argv[i], "--", 2)==0) { - /*unknown long option*/ - fprintf(stderr, "Unknown option '%s'!\n", argv[i]); - print_help(); - 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); - } + 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; + 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 */; } } + + 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; + } + + return 0; } -/* 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("#gob#", filebase, ".h#gob#", NULL); - char *hf = g_strconcat(filebase, ".h", NULL); - struct stat s; - if(stat(hf, &s) == 0) { - char *s; - s = g_strdup_printf("cmp '%s' '%s' > /dev/null", hf, hfnew); - if(system(s) == 0) { - if(unlink(hfnew) != 0) - error_printf(GOB_ERROR, 0, - "Can't remove new header file"); - g_free(hfnew); - g_free(hf); - g_free(s); - return; + char *new_filename = g_strconcat (old_filename, "#gob#", NULL); + FILE *old_f; + gboolean equal = FALSE; + + old_f = fopen (old_filename, "r"); + if (old_f) { + FILE *new_f; + gboolean error = FALSE; + + new_f = fopen (new_filename, "r"); + if (new_f) { + char new_buf[1024]; + char old_buf[1024]; + + while (TRUE) { + size_t new_n; + size_t old_n; + + new_n = fread (new_buf, 1, sizeof (new_buf), new_f); + if (ferror (new_f)) { + error = TRUE; + error_printf (GOB_ERROR, 0, + "Can't read %s: %s", + new_filename, + g_strerror (errno)); + break; + } + + old_n = fread (old_buf, 1, sizeof (old_buf), old_f); + if (ferror (old_f) + || feof (new_f) != feof (old_f) + || new_n != old_n + || memcmp (new_buf, old_buf, new_n) != 0) + break; + + if (feof (new_f)) { + equal = TRUE; + break; + } + } + } else + error_printf (GOB_ERROR, 0, "Can't open %s: %s", + new_filename, g_strerror (errno)); + + fclose (old_f); + fclose (new_f); + + if (error) + goto end; + + if (! equal && unlink (old_filename) != 0) { + error_printf (GOB_ERROR, 0, "Can't remove %s: %s", + old_filename, g_strerror (errno)); + goto end; } - g_free(s); - if(unlink(hf) != 0) - error_printf(GOB_ERROR, 0, - "Can't remove old header file"); } - if(rename(hfnew, hf) != 0) - error_printf(GOB_ERROR, 0, - "Can't rename new header file"); - g_free(hfnew); - g_free(hf); + + if (equal) { + if (unlink (new_filename) != 0) + error_printf (GOB_ERROR, 0, "Can't remove %s: %s", + new_filename, g_strerror (errno)); + } else { + if (rename (new_filename, old_filename) != 0) + error_printf (GOB_ERROR, 0, "Can't rename %s to %s: %s", + new_filename, old_filename, + g_strerror (errno)); + } + + end: + g_free (new_filename); } int main(int argc, char *argv[]) { - parse_options(argc, argv); - - if(filename) { + 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) { + fprintf(stderr, "Error: can't open pipe from '%s'\n", + m4_commandline); + exit(1); + } + } else if(filename) { yyin = fopen(filename, "r"); if(!yyin) { fprintf(stderr, "Error: can't open file '%s'\n", filename); exit(1); } - } else + } + + if(filename==NULL) filename = "stdin"; /* This is where parsing is done */ /*yydebug = 1;*/ if(yyparse() != 0) - g_error("Parsing errors, quitting"); + error_print (GOB_ERROR, 0, "Parsing errors, quitting"); + + /* close input file */ + if(use_m4) pclose(yyin); + else fclose(yyin); + yyin=stdin; if( ! class) - error_print(GOB_ERROR, 0, " no class defined"); + error_print (GOB_ERROR, 0, "no class defined"); exit_on_error = FALSE; - signals = count_signals((Class *)class); - set_arguments = count_set_arguments((Class *)class); - get_arguments = count_get_arguments((Class *)class); - overrides = count_overrides((Class *)class); - privates = count_privates((Class *)class); - protecteds = count_protecteds((Class *)class); - destructors = count_destructors((Class *)class); - initializers = count_initializers((Class *)class); - - make_bases(); - make_inits((Class *)class); - if(destructors > 0) { - need_destroy = TRUE; - find_destroy((Class *)class); - } - if(privates > 0) { + signals = count_signals ((Class *)class); + set_properties = count_set_properties ((Class *)class) + + count_set_arguments ((Class *)class); + get_properties = count_get_properties ((Class *)class) + + count_get_arguments ((Class *)class); + overrides = count_overrides ((Class *)class); + privates = count_privates ((Class *)class); + protecteds = count_protecteds ((Class *)class); + unreftors = count_unreftors ((Class *)class); + destructors = count_destructors ((Class *)class); + initializers = count_initializers ((Class *)class); + glade_widgets = count_glade_widgets ((Class *)class); + overrode_get_type = find_get_type ((Class *)class); + + make_bases (); + make_inits ((Class *)class); + + 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_finalize ((Class *)class); + if (destructors > 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); - check_duplicate_signals_args((Class *)class); - check_public_new((Class *)class); - check_vararg((Class *)class); - check_firstarg((Class *)class); - check_nonvoidempty((Class *)class); - check_signal_args((Class *)class); - check_argument_types((Class *)class); - check_func_arg_checks((Class *)class); + } + + check_bad_symbols ((Class *)class); + check_duplicate_symbols ((Class *)class); + check_duplicate_overrides ((Class *)class); + check_duplicate_signals_args ((Class *)class); + check_public_new ((Class *)class); + check_vararg ((Class *)class); + check_firstarg ((Class *)class); + check_nonvoidempty ((Class *)class); + check_signal_args ((Class *)class); + 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; - if(got_error) - exit(1); + if (got_error) + exit (1); - any_special = setup_special_array((Class *)class, special_array); + any_special = setup_special_array ((Class *)class, special_array); - open_files(); + open_files (); - generate_outfiles(); - - if(devnull) - fclose(devnull); - else { - fclose(out); - fclose(outh); - if(outph) - fclose(outph); + generate_outfiles (); + + if (out) + fclose (out); + if (outh) + fclose (outh); + if (outph) + fclose (outph); + + if (!no_write) { + if (no_touch) { + compare_and_move(outfilebase); + } + if (no_touch_headers) { + compare_and_move(outfilehbase); + if (outfilephbase) + compare_and_move(outfilephbase); + } } - if(no_touch_headers && - ! no_write) - compare_and_move_header(); - return 0; }