X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/3b10bbd3a88d6e16146414d91d06bb2f36347bfc..5b42e9400440d86723a27747b2191ab8cd59c2ee:/src/main.c diff --git a/src/main.c b/src/main.c index 226e821..a84d0db 100644 --- a/src/main.c +++ b/src/main.c @@ -70,6 +70,10 @@ 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; @@ -122,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; @@ -133,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, '*'); @@ -190,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); @@ -594,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); } } @@ -637,10 +640,10 @@ add_signal_prots(Method *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); + 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, "%s, ", get_cast(li->data, FALSE)); out_printf(out,"gpointer);\n"); out_printf(out,"\nstatic void\n" @@ -897,6 +900,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)) { @@ -909,26 +913,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 @@ -1377,7 +1390,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); @@ -1569,38 +1582,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); } } } @@ -1616,12 +1626,15 @@ 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); else @@ -1631,23 +1644,23 @@ put_argument_nongnu_wrappers(Class *c) 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); } } @@ -1671,7 +1684,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" @@ -1706,40 +1719,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 || @@ -1754,14 +1767,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" @@ -1779,7 +1801,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); @@ -1973,9 +1995,8 @@ 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); - } } add_bad_hack_to_avoid_unused_warnings(c); @@ -1984,8 +2005,8 @@ print_class_block(Class *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); @@ -2000,9 +2021,9 @@ print_file_comments(void) 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)" + 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" + out_printf(out, "/* Generated by GOB (v%s) on %s" " (do not edit directly) */\n\n", VERSION, ctime(&curtime)); } @@ -2024,7 +2045,7 @@ print_includes(void) /* 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)) { + if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) { out_printf(out,"#include \"%s-private.h\"\n\n", filebase); if(found_header) @@ -2340,6 +2361,8 @@ main(int argc, char *argv[]) if(got_error) exit(1); + any_special = setup_special_array((Class *)class, special_array); + open_files(); generate_outfiles();