X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b17287deb56775a49030d738d8c8c0e9cd15f9fe..dd11885aadcfaafae2d6268c381b0aac94cbc149:/src/main.c?ds=sidebyside diff --git a/src/main.c b/src/main.c index dedf432..09f59c2 100644 --- a/src/main.c +++ b/src/main.c @@ -28,7 +28,7 @@ #include #include -#include "tree.h" +#include "treefuncs.h" #include "parse.h" #include "out.h" #include "util.h" @@ -63,11 +63,17 @@ static int arguments = 0; /* number of named arguments */ 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 initializers = 0; /* number of variable initializers */ static gboolean made_aliases = FALSE; /* if we made any shorthand aliases and need the REALLY UGLY HACK to avoid warnings */ +/* the special variable types we need to define */ +static gboolean special_array[SPECIAL_LAST] = {0}; +static gboolean any_special = FALSE; + FILE *out = NULL; FILE *outh = NULL; FILE *outph = NULL; @@ -83,6 +89,7 @@ gboolean always_private_header = FALSE; gboolean no_private_header = FALSE; gboolean no_extern_c = FALSE; gboolean no_write = FALSE; +gboolean no_lines = FALSE; static void make_bases(void) @@ -119,7 +126,6 @@ get_type(Type *t, gboolean postfix_to_stars) gs = g_string_new(s); g_free(s); - extra = 0; if(postfix_to_stars) { char *p; @@ -130,7 +136,7 @@ get_type(Type *t, gboolean postfix_to_stars) for(p=t->postfix; p && *p; p++) if(*p == '[') extra++; } - g_string_append_c(gs,' '); + g_string_append_c(gs, ' '); for(i=0; i<(t->stars+extra); i++) g_string_append_c(gs, '*'); @@ -187,7 +193,7 @@ print_method(FILE *fp, char *typeprefix, char *nameprefix, out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, m->id, namepostfix); else - out_printf(fp,"%s%s_%s%s%s(", + out_printf(fp, "%s%s_%s%s%s(", nameprefix, funcbase, subnameprefix, m->id, namepostfix); @@ -214,6 +220,27 @@ print_method(FILE *fp, char *typeprefix, char *nameprefix, out_printf(fp, ")%s", postfix); } +static gboolean +any_method_to_alias(Class *c) +{ + GList *li; + + 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; + + return TRUE; + } + } + return FALSE; +} + static void make_method_gnu_aliases(Class *c) @@ -471,7 +498,7 @@ make_inits(Class *cl) (Type *)new_type(0, g_strdup("void"),NULL), NULL, NULL, NULL, g_strdup("class_init"), make_func_arg(cl->otype, TRUE, g_strdup("c")), - NULL, NULL, 0, 0, FALSE); + NULL, NULL, NULL, 0, 0, FALSE); cl->nodes = g_list_prepend(cl->nodes,node); } if(!got_init) { @@ -479,7 +506,7 @@ make_inits(Class *cl) (Type *)new_type(0, g_strdup("void"),NULL), NULL, NULL, NULL, g_strdup("init"), make_func_arg(cl->otype, FALSE, g_strdup("o")), - NULL, NULL, 0, 0, FALSE); + NULL, NULL, NULL, 0, 0, FALSE); cl->nodes = g_list_prepend(cl->nodes,node); } } @@ -512,7 +539,7 @@ make_finalize(Class *cl) g_strdup("Gtk:Object"), NULL, NULL, g_strdup("finalize"), make_func_arg("Gtk:Object",FALSE,g_strdup("o")), - NULL, + NULL, NULL, g_strdup("PARENT_HANDLER (o);\n"), 0,0,FALSE); cl->nodes = g_list_append(cl->nodes,node); @@ -559,7 +586,7 @@ find_same_type_signal(Method *m) static void print_signal_marsal_args(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; @@ -570,7 +597,7 @@ print_signal_marsal_args(Method *m) else { out_printf(out, ",\n\t\t(%s)" "GTK_VALUE_%s(args[%d])", - get_cast(li->data,FALSE), + get_cast(li->data, FALSE), (char *)li->data,i); } } @@ -594,8 +621,8 @@ add_signal_prots(Method *m) if(!marsh) marsh = g_hash_table_new(NULL,NULL); - if(strcmp(m->gtktypes->data,"NONE")==0 && - strcmp(m->gtktypes->next->data,"NONE")==0) + if(strcmp(m->gtktypes->data, "NONE")==0 && + strcmp(m->gtktypes->next->data, "NONE")==0) return; /* if we already did a signal prototype just use that */ @@ -608,16 +635,18 @@ add_signal_prots(Method *m) s = g_strdup_printf("Sig%d",sig++); - g_hash_table_insert(marsh,m,s); - eq_signal_methods = g_list_prepend(eq_signal_methods,m); + g_hash_table_insert(marsh, m, s); + eq_signal_methods = g_list_prepend(eq_signal_methods, m); /* we know that we'll know all the gtktypes (so get_cast can't fail) */ - out_printf(out,"\ntypedef %s (*___%s) (%s *, ", - get_cast(m->gtktypes->data,FALSE),s, typebase); + out_printf(out, "\ntypedef %s (*___%s) (%s *, ", + get_cast(m->gtktypes->data, FALSE), s, typebase); - for(li=m->gtktypes->next;li;li=g_list_next(li)) - out_printf(out,"%s, ",get_cast(li->data,FALSE)); - out_printf(out,"gpointer);\n"); + 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)); + } + out_printf(out, "gpointer);\n"); out_printf(out,"\nstatic void\n" "___marshal_%s (GtkObject * object,\n" @@ -626,19 +655,20 @@ add_signal_prots(Method *m) "\tGtkArg * args)\n" "{\n",s); - if(strcmp(m->gtktypes->data,"NONE")==0) { + 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); + "\t(*rfunc)((%s *)object", s, s, typebase); } else { - out_printf(out, "\t___%s rfunc;\n\t",s); - print_type(out,m->mtype,TRUE); - out_printf(out, " *retval;\n\n" - "\trfunc = (___%s)func;\n\n" - "\tretval = GTK_RETLOC_%s(args[%d]);\n\n" - "\t*retval = (*rfunc)((%s *)object", - s,(char *)m->gtktypes->data, - g_list_length(m->gtktypes)-1,typebase); + 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); } print_signal_marsal_args(m); @@ -685,6 +715,7 @@ add_enums(Class *c) 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); } @@ -842,7 +873,7 @@ add_signals(Class *c) flags = make_run_signal_flags(m, last); out_printf(out,"\tobject_signals[%s_SIGNAL] =\n" "\t\tgtk_signal_new (\"%s\",\n" - "\t\t\%s,\n" + "\t\t\t(GtkSignalRunType)(%s),\n" "\t\t\tgtk_object_class->type,\n" "\t\t\tGTK_SIGNAL_OFFSET (%sClass, %s),\n" "\t\t\t%s,\n" @@ -872,6 +903,7 @@ static void set_def_handlers(Class *c, char *oname) { GList *li; + gboolean set_line = FALSE; out_printf(out,"\n"); for(li=c->nodes;li;li=g_list_next(li)) { @@ -884,26 +916,35 @@ set_def_handlers(Class *c, char *oname) m->method != OVERRIDE_METHOD)) continue; + if(m->line_no > 0 && m->cbuf) { + out_addline_infile(out, m->line_no); + set_line = TRUE; + } else if(set_line) { + out_addline_outfile(out); + set_line = FALSE; + } if(m->method == OVERRIDE_METHOD) { char *s; - s = replace_sep(m->otype,'_'); + s = replace_sep(m->otype, '_'); g_strdown(s); if(m->cbuf) out_printf(out,"\t%s_class->%s = %s_%s;\n", - s,m->id,funcbase,m->id); + s, m->id, funcbase, m->id); else out_printf(out,"\t%s_class->%s = NULL;\n", - s,m->id); + s, m->id); } else { if(m->cbuf) out_printf(out,"\t%s->%s = ___real_%s_%s;\n", - oname,m->id,funcbase,m->id); + oname, m->id, funcbase, m->id); else out_printf(out,"\t%s->%s = NULL;\n", - oname,m->id); + oname, m->id); } } + if(set_line) + out_addline_outfile(out); } static void @@ -970,9 +1011,9 @@ make_arguments(Class *c) "\t\tGTK_TYPE_%s,\n" "\t\t%s,\n" "\t\tARG_%s);\n", - typebase,a->name,a->gtktype,flags->str,s); + typebase, a->name, a->gtktype, flags->str, s); g_free(s); - g_string_free(flags,TRUE); + g_string_free(flags, TRUE); } out_printf(out, @@ -980,6 +1021,32 @@ make_arguments(Class *c) "\tgtk_object_class->get_arg = ___object_get_arg;\n"); } +static void +print_initializer(Method *m, Variable *v) +{ + char *root; + + if(v->initializer == NULL) + 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); + + if(v->initializer_line > 0) + out_addline_infile(out, v->initializer_line); + + out_printf(out, "\t%s->%s = %s;\n", + root, v->id, v->initializer); + + if(v->initializer_line > 0) + out_addline_outfile(out); + + g_free(root); +} + static void add_inits(Class *c) { @@ -991,25 +1058,36 @@ add_inits(Class *c) continue; m = (Method *)n; if(m->method == INIT_METHOD) { - if(m->line_no>0) + if(m->line_no > 0) out_addline_infile(out,m->line_no); print_method(out, "static ", "\n", "", " ", "\n", m, FALSE, FALSE); - if(m->line_no>0) + if(m->line_no > 0) out_addline_outfile(out); out_printf(out,"{\n"); - if(privates>0) { + if(privates > 0) { out_printf(out,"\t%s->_priv = " - "g_new0 (%sPrivate,1);\n", + "g_new0 (%sPrivate, 1);\n", ((FuncArg *)m->args->data)->name, typebase); } + if(initializers > 0) { + GList *li; + for(li = ((Class *)class)->nodes; + li != NULL; + li = li->next) { + Node *n = li->data; + if(n->type != VARIABLE_NODE) + continue; + print_initializer(m, (Variable *)n); + } + } } else if(m->method == CLASS_INIT_METHOD) { - if(m->line_no>0) + if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "\n", m, FALSE, FALSE); - if(m->line_no>0) + if(m->line_no > 0) out_addline_outfile(out); out_printf(out,"{\n"); if(signals>0 || @@ -1056,7 +1134,7 @@ add_inits(Class *c) } static void -add_getset_arg(Class *c, int is_set) +add_getset_arg(Class *c, gboolean is_set) { GList *li; out_printf(out,"\nstatic void\n" @@ -1089,14 +1167,52 @@ add_getset_arg(Class *c, int is_set) continue; s = g_strdup(a->name); g_strup(s); - out_printf(out,"\tcase ARG_%s:\n" - "#define ARG (GTK_VALUE_%s(*arg))\n" - "\t\t{\n", - s,a->gtktype); + 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, "#ifdef __GNUC__\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__ */\n"); + out_printf(out, "#define ARG " + "((%s)GTK_VALUE_%s(*arg))\n", + cast, a->gtktype); + out_printf(out,"#endif /* __GNUC__ */\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); - out_addline_infile(out,line_no); + if(line_no > 0) + out_addline_infile(out, line_no); out_printf(out,"%s\n",cbuf); - out_addline_outfile(out); + if(line_no > 0) + out_addline_outfile(out); out_printf(out,"\t\t}\n\t\tbreak;\n" "#undef ARG\n"); } @@ -1109,32 +1225,32 @@ print_checks(Method *m, FuncArg *fa) GList *li; gboolean is_void; gboolean checked_null = FALSE; - is_void = (strcmp(m->mtype->name,"void")==0 && + is_void = (strcmp(m->mtype->name, "void")==0 && m->mtype->stars == 0); for(li=fa->checks;li;li=g_list_next(li)) { Check *ch = li->data; char *s; /* point to the method prot in .gob for failed checks */ - if(m->line_no>0) + if(m->line_no > 0) out_addline_infile(out,m->line_no); if(is_void) - out_printf(out,"\tg_return_if_fail ("); + out_printf(out, "\tg_return_if_fail ("); else - out_printf(out,"\tg_return_val_if_fail ("); + out_printf(out, "\tg_return_val_if_fail ("); switch(ch->chtype) { case NULL_CHECK: - out_printf(out,"%s != NULL",fa->name); + out_printf(out, "%s != NULL", fa->name); checked_null = TRUE; break; case TYPE_CHECK: - s = make_pre_macro(fa->atype->name,"IS"); + s = make_pre_macro(fa->atype->name, "IS"); if(checked_null) - out_printf(out,"%s (%s)",s,fa->name); + out_printf(out, "%s (%s)", s, fa->name); else /* if not check null, null may be valid */ - out_printf(out,"!(%s) || %s (%s)",fa->name,s, - fa->name); + out_printf(out, "!(%s) || %s (%s)", fa->name, + s, fa->name); g_free(s); break; case LT_CHECK: @@ -1157,11 +1273,11 @@ print_checks(Method *m, FuncArg *fa) break; } if(is_void) - out_printf(out,");\n"); + out_printf(out, ");\n"); else { - out_printf(out,", ("); - print_type(out,m->mtype,TRUE); - out_printf(out,")%s);\n", + out_printf(out, ", ("); + print_type(out, m->mtype, TRUE); + out_printf(out, ")%s);\n", m->onerror?m->onerror:"0"); } } @@ -1181,20 +1297,76 @@ print_preconditions(Method *m) out_addline_outfile(out); } +static void +print_destructor(char *self_id, Variable *v) +{ + char *root; + + if(v->destructor == NULL) + return; + + if(v->scope == PRIVATE_SCOPE) + root = g_strconcat(self_id, "->_priv", NULL); + else + root = g_strdup(self_id); + + if(v->destructor_simple) { + if(v->destructor_line > 0) + out_addline_infile(out, v->destructor_line); + + out_printf(out, "\tif(%s->%s) " + "((*(void (*)(void *))%s)) (%s->%s);\n", + root, v->id, v->destructor, 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, "\t{\n\t%s *self G_GNUC_UNUSED = %s;\n", + typebase, self_id); + if(v->destructor_line > 0) + out_addline_infile(out, v->destructor_line); + + out_printf(out, "\t%s}\n", v->destructor); + + if(v->destructor_line > 0) + out_addline_outfile(out); + out_printf(out, "#undef VAR\n"); + } + + g_free(root); +} + /* put in code if it's needed */ static void put_in_gen_code(Method *m) { - /* now we only have the freeing of the private structure */ - if(privates>0 && - m->method == OVERRIDE_METHOD && - strcmp(m->id,"finalize")==0) { - out_printf(out,"\tg_free (%s (%s)->_priv);\n" - "\t%s (%s)->_priv = NULL;\n", - macrobase, - ((FuncArg *)m->args->data)->name, - macrobase, - ((FuncArg *)m->args->data)->name); + if(m->method == OVERRIDE_METHOD && + strcmp(m->id, "finalize")==0) { + if(privates > 0 || destructors > 0) { + out_printf(out,"\t%s *___self = %s (%s);\n", + typebase, macrobase, + ((FuncArg *)m->args->data)->name); + } + if(destructors > 0) { + GList *li; + for(li = ((Class *)class)->nodes; + li != NULL; + li = li->next) { + Node *n = li->data; + if(n->type == VARIABLE_NODE) + print_destructor("___self", + (Variable *)n); + } + } + if(privates > 0) { + out_printf(out,"\tg_free (___self->_priv);\n" + "\t___self->_priv = NULL;\n", + macrobase, + ((FuncArg *)m->args->data)->name, + macrobase, + ((FuncArg *)m->args->data)->name); + } } } @@ -1213,13 +1385,13 @@ print_method_body(Method *m, int pre) ugly in the .c file, but that is not supposed to be human readable anyway. */ if(m->cbuf) { - out_printf(out,"{\n"); + out_printf(out, "{\n"); if(m->ccode_line>0) - out_addline_infile(out,m->ccode_line); - out_printf(out,"\t%s}",m->cbuf); + out_addline_infile(out, m->ccode_line); + out_printf(out, "\t%s}", m->cbuf); } - out_printf(out,"}\n"); + out_printf(out, "}\n"); if(m->cbuf) out_addline_outfile(out); @@ -1234,7 +1406,7 @@ put_signal_args(Method *m) li && ali; li=li->next, ali=ali->next) { FuncArg *fa = li->data; - const char *cast = get_cast(ali->data,FALSE); + const char *cast = get_cast(ali->data, FALSE); /* we should have already proved before that the we know all the types */ g_assert(cast); @@ -1249,7 +1421,7 @@ get_arg_names_for_macro(Method *m) { char *p; GList *li; - GString *gs = g_string_new(""); + GString *gs = g_string_new(NULL); p = ""; for(li=m->args;li;li=g_list_next(li)) { FuncArg *arg = li->data; @@ -1257,7 +1429,7 @@ get_arg_names_for_macro(Method *m) p = ","; } p = gs->str; - g_string_free(gs,FALSE); + g_string_free(gs, FALSE); return p; } @@ -1284,7 +1456,7 @@ put_method(Method *m) else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "\n", m, FALSE, FALSE); - print_method_body(m,TRUE); + print_method_body(m, TRUE); break; case SIGNAL_FIRST_METHOD: case SIGNAL_LAST_METHOD: @@ -1309,9 +1481,16 @@ put_method(Method *m) 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;\n"); + 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); + else + out_printf(out, ")(0);\n"); print_preconditions(m); out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (%s),\n" "\t\tobject_signals[%s_SIGNAL]", @@ -1356,18 +1535,22 @@ put_method(Method *m) out_printf(out,");\n}\n"); } else { GList *li; - out_printf(out,"\t\treturn (*klass->%s)(%s",m->id, + out_printf(out, "\t\treturn (*klass->%s)(%s",m->id, ((FuncArg *)m->args->data)->name); for(li=m->args->next;li;li=g_list_next(li)) { FuncArg *fa = li->data; out_printf(out,",%s",fa->name); } - out_printf(out,");\n" + out_printf(out, ");\n" "\telse\n" "\t\treturn ("); - print_type(out,m->mtype,TRUE); - out_printf(out,")(%s);\n}\n", - m->onerror?m->onerror:"0"); + print_type(out, m->mtype, TRUE); + if(m->defreturn) + out_printf(out, ")(%s);\n}\n", m->defreturn); + else if(m->onerror) + out_printf(out, ")(%s);\n}\n", m->onerror); + else + out_printf(out, ")(0);\n}\n"); } if(!m->cbuf) @@ -1426,38 +1609,35 @@ open_files(void) if(no_touch_headers) outfileh = g_strconcat("#gob#",filebase,".h#gob#",NULL); else - outfileh = g_strconcat(filebase,".h",NULL); + outfileh = g_strconcat(filebase, ".h", NULL); - if((privates>0 || protecteds>0 || always_private_header) && + if((privates > 0 || protecteds > 0 || always_private_header) && !no_private_header) - outfileph = g_strconcat(filebase,"-private.h",NULL); + outfileph = g_strconcat(filebase, "-private.h", NULL); else outfileph = NULL; if(no_write) { - devnull = fopen("/dev/null","w"); - if(!devnull) { - g_error("Cannot open null device",NULL); - } + devnull = fopen("/dev/null", "w"); + if(!devnull) + g_error("Cannot open null device"); out = devnull; outh = devnull; if(outfileph) outph = devnull; } else { - out = fopen(outfile,"w"); + out = fopen(outfile, "w"); if(!out) { - g_error("Cannot open outfile: %s",outfile); - } - outh = fopen(outfileh,"w"); - if(!outh) { - g_error("Cannot open outfile: %s",outfileh); + g_error("Cannot open outfile: %s", outfile); } + 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); - } + outph = fopen(outfileph, "w"); + if(!outph) + g_error("Cannot open outfile: %s", outfileh); } } } @@ -1473,38 +1653,41 @@ put_argument_nongnu_wrappers(Class *c) for(li=c->nodes;li;li=g_list_next(li)) { Node *n = li->data; Argument *a = (Argument *)n; - char *s; + char *aname; char *cast; + if(n->type != ARGUMENT_NODE) continue; - s = g_strdup(a->name); - g_strup(s); + + aname = g_strdup(a->name); + g_strup(aname); + if(a->atype) - cast = get_type(a->atype,TRUE); + cast = get_type(a->atype, TRUE); else - cast = g_strdup(get_cast(a->gtktype,TRUE)); + 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, s, a->name, cast); + macrobase, aname, a->name, cast); if(a->get) out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" "\"%s\",(%s*)(arg)\n", - macrobase, s, a->name, cast); + macrobase, aname, a->name, cast); } else { if(a->set) out_printf(outh, "#define %s_ARG_%s(arg) \t" "\"%s\",(arg)\n", - macrobase, s, a->name); + macrobase, aname, a->name); if(a->get) out_printf(outh, "#define %s_GET_ARG_%s(arg)\t" "\"%s\",(arg)\n", - macrobase, s, a->name); + macrobase, aname, a->name); } g_free(cast); - g_free(s); + g_free(aname); } } @@ -1528,7 +1711,7 @@ put_argument_gnu_wrappers(Class *c) if(a->atype) cast = get_type(a->atype,TRUE); else - cast = g_strdup(get_cast(a->gtktype,TRUE)); + cast = g_strdup(get_cast(a->gtktype, TRUE)); if(cast) { if(a->set) out_printf(outh, "#define %s_ARG_%s(arg) \t" @@ -1563,40 +1746,40 @@ print_ccode_block(CCode *cc) code but is printed before */ case H_CCODE: fp = outh; - out_printf(fp,"\n"); + out_printf(fp, "\n"); break; case AT_CCODE: /* AT code is printed exactly like normal 'all' code but is printed before */ case A_CCODE: if(outph) { - out_printf(outph,"\n"); - out_printf(outph,"%s\n",cc->cbuf); - out_addline_infile(outph,cc->line_no); + out_printf(outph, "\n"); + out_printf(outph, "%s\n", cc->cbuf); + out_addline_infile(outph, cc->line_no); out_addline_outfile(outph); } - out_printf(outh,"\n"); - out_printf(outh,"%s\n",cc->cbuf); + out_printf(outh, "\n"); + out_printf(outh, "%s\n", cc->cbuf); fp = out; - out_printf(fp,"\n"); - out_addline_infile(fp,cc->line_no); + out_printf(fp, "\n"); + out_addline_infile(fp, cc->line_no); break; default: case C_CCODE: fp = out; out_printf(fp,"\n"); - out_addline_infile(fp,cc->line_no); + out_addline_infile(fp, cc->line_no); break; case PH_CCODE: if(outph) fp = outph; else fp = out; - out_printf(fp,"\n"); - out_addline_infile(fp,cc->line_no); + out_printf(fp, "\n"); + out_addline_infile(fp, cc->line_no); break; } - out_printf(fp,"%s\n",cc->cbuf); + out_printf(fp, "%s\n", cc->cbuf); if(cc->cctype == C_CCODE || cc->cctype == A_CCODE || cc->cctype == AT_CCODE || @@ -1611,14 +1794,23 @@ print_class_block(Class *c) char *s; gboolean printed_private = FALSE; - out_printf(out,"/* utility types we may need */\n"); - out_printf(out,"typedef struct { " - "gpointer a; gpointer b; " - "} ___twopointertype;\n"); - out_printf(out,"typedef struct { " - "gpointer a; gpointer b; " - "gpointer c; " - "} ___threepointertype;\n"); + if(any_special) { + out_printf(out, "/* utility types we may need */\n"); + if(special_array[SPECIAL_2POINTER]) + out_printf(out, "typedef struct { " + "gpointer a; gpointer b; " + "} ___twopointertype;\n"); + if(special_array[SPECIAL_3POINTER]) + out_printf(out, "typedef struct { " + "gpointer a; gpointer b; " + "gpointer c; " + "} ___threepointertype;\n"); + if(special_array[SPECIAL_INT_POINTER]) + out_printf(out, "typedef struct { " + "gint a; gpointer b; " + "} ___intpointertype;\n"); + out_printf(out, "\n"); + } out_printf(outh, "\n/*\n" " * Type checking and casting macros\n" @@ -1636,7 +1828,7 @@ print_class_block(Class *c) "GTK_CHECK_TYPE((obj), %s_get_type ())\n\n", macrois,funcbase); - out_printf(out, "\n/* self casting macros */\n"); + out_printf(out, "/* self casting macros */\n"); out_printf(out, "#define SELF(x) %s(x)\n", macrobase); out_printf(out, "#define IS_SELF(x) %s(x)\n", macrois); out_printf(out, "#define SELF_CLASS(x) %s_CLASS(x)\n\n", macrobase); @@ -1804,18 +1996,22 @@ print_class_block(Class *c) add_get_type(); - if(no_gnu) - make_method_nongnu_aliases(c); - else { - out_printf(out,"\n#ifdef __GNUC__\n"); - make_method_gnu_aliases(c); - out_printf(out,"#else /* __GNUC__ */\n"); - make_method_nongnu_aliases(c); - out_printf(out,"#endif /* __GNUC__ */\n\n"); + if(any_method_to_alias(c)) { + if(no_gnu) + make_method_nongnu_aliases(c); + else { + out_printf(out,"\n#ifdef __GNUC__\n"); + make_method_gnu_aliases(c); + out_printf(out,"#else /* __GNUC__ */\n"); + make_method_nongnu_aliases(c); + out_printf(out,"#endif /* __GNUC__ */\n\n"); + } } - out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n", - funcbase); + 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); add_inits(c); @@ -1826,21 +2022,18 @@ print_class_block(Class *c) for(l=c->nodes;l;l=g_list_next(l)) { Node *n = l->data; - if(n->type == METHOD_NODE) { + if(n->type == METHOD_NODE) put_method((Method *)n); - } } - out_printf(out,"#undef GET_NEW\n"); - add_bad_hack_to_avoid_unused_warnings(c); } static void print_version_macros(void) { - int major=0,minor=0,pl=0; - sscanf(VERSION,"%d.%d.%d",&major,&minor,&pl); + int major=0, minor=0, pl=0; + 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); @@ -1852,13 +2045,14 @@ print_file_comments(void) { time_t curtime; time(&curtime); - out_printf(outh,"/* Generated by GOB (v%s)" - " (do not edit directly) */\n\n",VERSION); + 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(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)); } static void @@ -1867,18 +2061,18 @@ print_includes(void) gboolean found_header; char *p; - p = g_strconcat(filebase,".h",NULL); + p = g_strconcat(filebase, ".h", NULL); found_header = TRUE; - if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp)) { - out_printf(out,"#include \"%s.h\"\n\n",filebase); + if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) { + out_printf(out, "#include \"%s.h\"\n\n", filebase); found_header = FALSE; } g_free(p); /* if we are creating a private header see if it was included */ if(outph) { - p = g_strconcat(filebase,"-private.h",NULL); - if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp)) { + p = g_strconcat(filebase, "-private.h", NULL); + if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) { out_printf(out,"#include \"%s-private.h\"\n\n", filebase); if(found_header) @@ -1901,21 +2095,21 @@ print_header_prefixes(void) { char *p; - p = replace_sep(((Class *)class)->otype,'_'); + p = replace_sep(((Class *)class)->otype, '_'); g_strup(p); - out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n",p,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" + out_printf(outph, "#ifndef __%s_PRIVATE_H__\n" "#define __%s_PRIVATE_H__\n\n" - "#include \"%s.h\"\n\n",p,p,filebase); + "#include \"%s.h\"\n\n", p, p, filebase); g_free(p); if(!no_extern_c) { - out_printf(outh,"#ifdef __cplusplus\n" + out_printf(outh, "#ifdef __cplusplus\n" "extern \"C\" {\n" "#endif /* __cplusplus */\n\n"); if(outph) - out_printf(outph,"#ifdef __cplusplus\n" + out_printf(outph, "#ifdef __cplusplus\n" "extern \"C\" {\n" "#endif /* __cplusplus */\n\n"); } @@ -1925,16 +2119,16 @@ static void print_header_postfixes(void) { if(!no_extern_c) - out_printf(outh,"\n#ifdef __cplusplus\n" + out_printf(outh, "\n#ifdef __cplusplus\n" "}\n" "#endif /* __cplusplus */\n"); - out_printf(outh,"\n#endif"); + out_printf(outh, "\n#endif\n"); if(outph) { if(!no_extern_c) - out_printf(outph,"\n#ifdef __cplusplus\n" + out_printf(outph, "\n#ifdef __cplusplus\n" "}\n" "#endif /* __cplusplus */\n"); - out_printf(outph,"\n#endif"); + out_printf(outph, "\n#endif\n"); } } @@ -2028,7 +2222,8 @@ print_help(void) "\t structure and protected " "prototypes inside c file\n" "\t--no-write,-n Don't write output files, just " - "check syntax\n"); + "check syntax\n" + "\t--no-lines Don't print '#line' to output\n"); } static void @@ -2076,6 +2271,8 @@ parse_options(int argc, char *argv[]) no_extern_c = TRUE; } else if(strcmp(argv[i], "--no-write")==0) { no_write = TRUE; + } else if(strcmp(argv[i], "--no-lines")==0) { + no_lines = TRUE; } else if(strcmp(argv[i], "--")==0) { /*further arguments are files*/ no_opts = TRUE; @@ -2169,6 +2366,8 @@ main(int argc, char *argv[]) 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); @@ -2189,6 +2388,8 @@ main(int argc, char *argv[]) if(got_error) exit(1); + any_special = setup_special_array((Class *)class, special_array); + open_files(); generate_outfiles();