]> git.draconx.ca Git - gob-dx.git/blobdiff - src/main.c
Release 0.92.2
[gob-dx.git] / src / main.c
index b429ef991362f324e2710f5274c51410e944e975..d86697d83cd8b2852fce037ce075f5740f21628a 100644 (file)
@@ -21,9 +21,6 @@
 
 #include "config.h"
 #include <glib.h>
-#if 0
-#include <popt.h>
-#endif
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
@@ -33,6 +30,9 @@
 #include "tree.h"
 #include "parse.h"
 #include "out.h"
+#include "util.h"
+#include "checks.h"
+
 #include "main.h"
 
 char *filename = NULL;
@@ -71,100 +71,13 @@ FILE *outph = NULL;
 
 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;
 gboolean always_private_header = FALSE;
 gboolean no_private_header = FALSE;
-
-void
-print_error(int is_warn, char *error,int line)
-{
-       char *w;
-       if(is_warn)
-               w = "Warning:";
-       else {
-               w = "Error:";
-               got_error = TRUE;
-       }
-       if(line>0)
-               fprintf(stderr,"%s:%d: %s %s\n",filename,line,w,error);
-       else
-               fprintf(stderr,"%s: %s %s\n",filename,w,error);
-       if((!is_warn || exit_on_warn) && exit_on_error)
-               exit(1);
-}
-
-static char *
-remove_sep(char *base)
-{
-       char *p;
-       char *s = g_strdup(base);
-       while((p=strchr(s,':')))
-               strcpy(p,p+1);
-       return s;
-}
-
-static char *
-replace_sep(char *base, char r)
-{
-       char *p;
-       char *s = g_strdup(base);
-       while((p=strchr(s,':')))
-               *p = r;
-       if(*s == r) {
-               p = g_strdup(s+1);
-               g_free(s);
-               return p;
-       }
-       return s;
-}
-
-/*separate the namespace part and then replace rest of
-  separators with r*/
-static void
-separns_replace_sep(char *base, char **ns, char **name, char r)
-{
-       char *p;
-       char *s = g_strdup(base);
-       *ns = NULL;
-       if((p=strchr(s,':')) && p!=s) {
-               *p = '\0';
-               *ns = g_strdup(s);
-               p = g_strdup(p+1);
-               g_free(s);
-               s = p;
-       }
-       while((p=strchr(s,':')))
-               *p = r;
-       if(*s == r) {
-               *name = g_strdup(s+1);
-               g_free(s);
-       } else
-               *name = s;
-}
-
-/* make a macro with some prefix before the name but after
-   namespace */
-static char *
-make_pre_macro(char *base, char *pre)
-{
-       char *s1,*s2;
-       char *s;
-
-       separns_replace_sep(base,&s1,&s2,'_');
-       if(s1)
-               s = g_strconcat(s1,"_",pre,"_",s2,NULL);
-       else
-               s = g_strconcat(pre,"_",s2,NULL);
-
-       g_strup(s);
-       
-       g_free(s1);
-       g_free(s2);
-
-       return s;
-}
+gboolean no_extern_c = FALSE;
 
 static void
 make_bases(void)
@@ -189,17 +102,19 @@ make_bases(void)
        ptypebase = remove_sep(((Class *)class)->ptype);
 }
 
-static void
-print_type(FILE *fp, Type *t, gboolean postfix_to_stars)
+static char *
+get_type(Type *t, gboolean postfix_to_stars)
 {
        char *s;
        int i;
        int extra;
+       GString *gs;
 
        s = remove_sep(t->name);
-       out_printf(fp,"%s ",s); 
+       gs = g_string_new(s);
        g_free(s);
 
+
        extra = 0;
        if(postfix_to_stars) {
                char *p;
@@ -210,11 +125,27 @@ print_type(FILE *fp, Type *t, gboolean postfix_to_stars)
                for(p=t->postfix; p && *p; p++)
                        if(*p == '[') extra++;
        }
+       g_string_append_c(gs,' ');
        
        for(i=0;i<(t->stars+extra);i++)
-               out_printf(fp,"*"); 
+               g_string_append_c(gs,'*');
+
+       s = gs->str;
+       g_string_free(gs,FALSE);
+       return s;
 }
 
+static void
+print_type(FILE *fp, Type *t, gboolean postfix_to_stars)
+{
+       char *s;
+
+       s = get_type(t,postfix_to_stars);
+       out_printf(fp,"%s",s); 
+       g_free(s);
+}
+
+
 static void
 print_method(FILE *fp, char *typeprefix, char *nameprefix,
             char *namepostfix,char *postfix, Method *m,
@@ -254,11 +185,39 @@ print_method(FILE *fp, char *typeprefix, char *nameprefix,
 
 
 static void
-make_method_pointers(Class *c)
+make_method_gnu_aliases(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;
+
+                       /* in C++ mode don't alias new */
+                       if(for_cpp && strcmp(m->id, "new")==0)
+                               continue;
+
+                       out_printf(out, "static const typeof(&%s_%s) %s "
+                                  "__attribute__ ((__unused__)) "
+                                  "= %s_%s;\n", funcbase, m->id, m->id,
+                                  funcbase, m->id);
+                       out_printf(out, "#define %s(args...) "
+                                  "%s_%s(##args)\n", m->id, funcbase, m->id);
+               }
+       }
+}
+
+static void
+make_method_nongnu_aliases(Class *c)
 {
        GList *li;
        
-       out_printf(out,"\n");
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *node = li->data;
                if(node->type == METHOD_NODE) {
@@ -279,7 +238,6 @@ make_method_pointers(Class *c)
                        made_aliases = TRUE;
                }
        }
-       out_printf(out,"\n");
 }
 
 static void
@@ -291,12 +249,16 @@ add_bad_hack_to_avoid_unused_warnings(Class *c)
        if(!made_aliases)
                return;
        
-       out_printf(out,"\n\n/*REALLY BAD HACK\n"
+       if(!no_gnu)
+               out_printf(out,"\n\n#ifndef __GNUC__\n");
+       out_printf(out,
+                  "/*REALLY BAD HACK\n"
                   "  This is to avoid unused warnings if you don't call\n"
                   "  some method.  I need to find a better way to do\n"
-                  "  this */\n");
-       out_printf(out,"static void\n"
-                  "__%s_really_bad_hack_to_avoid_warnings(void)\n"
+                  "  this, not needed in GCC since we use some gcc\n"
+                  "  extentions to make saner, faster code */\n"
+                  "static void\n"
+                  "___%s_really_bad_hack_to_avoid_warnings(void)\n"
                   "{\n",funcbase);
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *node = li->data;
@@ -315,9 +277,12 @@ add_bad_hack_to_avoid_unused_warnings(Class *c)
                        out_printf(out,"\t((void (*)(void))%s)();\n",m->id);
                }
        }
-       out_printf(out, "\t__%s_really_bad_hack_to_avoid_warnings();\n",
+       out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n",
                   funcbase);
-       out_printf(out,"}\n\n");
+       if(!no_gnu)
+               out_printf(out,"}\n#endif /* __GNUC__ */\n\n");
+       else
+               out_printf(out,"}\n\n");
 }
 
 static void
@@ -372,7 +337,7 @@ put_priv_method_prot(Method *m)
           m->method == SIGNAL_FIRST_METHOD ||
           m->method == VIRTUAL_METHOD) {
                if(m->cbuf)
-                       print_method(out,"static ","_real_"," ",";\n",m,FALSE);
+                       print_method(out,"static ","___real_"," ",";\n",m,FALSE);
        }
 
        if(m->scope == PRIVATE_SCOPE ||
@@ -380,7 +345,9 @@ put_priv_method_prot(Method *m)
           m->method == CLASS_INIT_METHOD ||
           (m->method == OVERRIDE_METHOD &&
            m->cbuf))
-               print_method(out,"static ",""," ",";\n",m,FALSE);
+               print_method(out,"static ",""," ",
+                            no_gnu?";\n":" ___NO_UNUSED_WARNING;\n"
+                            ,m,FALSE);
 }
 
 static GList *
@@ -441,9 +408,9 @@ make_inits(Class *cl)
 }
 
 static void
-make_destroy(Class *cl)
+make_finalize(Class *cl)
 {
-       int got_destroy = FALSE;
+       int got_finalize = FALSE;
        GList *li;
        Node *node;
        for(li=cl->nodes;li;li=g_list_next(li)) {
@@ -451,12 +418,12 @@ make_destroy(Class *cl)
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->method == OVERRIDE_METHOD &&
-                          strcmp(m->id,"destroy")==0) {
+                          strcmp(m->id,"finalize")==0) {
                                if(strcmp(m->otype,"Gtk:Object")==0) {
-                                       got_destroy = TRUE;
+                                       got_finalize = TRUE;
                                        break;
                                } else {
-                                       print_error(FALSE,"destroy method override "
+                                       print_error(FALSE,"finalize method override "
                                                    "of class other then Gtk:Object",
                                                    m->line_no);
                                }
@@ -464,11 +431,11 @@ make_destroy(Class *cl)
                        }
                }
        }
-       if(!got_destroy) {
+       if(!got_finalize) {
                node = new_method(NO_SCOPE, OVERRIDE_METHOD,
                                  (Type *)new_type(0,g_strdup("void"),NULL),
                                  g_strdup("Gtk:Object"),
-                                 NULL,g_strdup("destroy"),
+                                 NULL,g_strdup("finalize"),
                                  make_func_arg("Gtk:Object",FALSE,g_strdup("o")),
                                  NULL,
                                  g_strdup("PARENT_HANDLER (o);\n"),
@@ -478,50 +445,6 @@ make_destroy(Class *cl)
        }
 }
 
-/* here we will find out how inconsistent gtk really is :) */
-/* the commented out types mean that these types don't actually
-   exist. so we "emulate them" with an equivalent */
-const struct {
-       char *gtkname;
-       char *typename;
-} our_gtk_type_table[] = {
-       { "NONE",       "void" },
-       { "CHAR",       "gchar" },
-       { "UCHAR",      "guchar" },
-       { "BOOL",       "gboolean" },
-       { "INT",        "gint" },
-       { "UINT",       "guint" },
-       { "LONG",       "glong" },
-       { "ULONG",      "gulong" },
-       { "FLOAT",      "gfloat" },
-       { "DOUBLE",     "gdouble" },
-       { "STRING",     /*"GtkString"*/"gchar *" },
-       { "ENUM",       /*"GtkEnum"*/"gint" },
-       { "FLAGS",      /*"GtkFlags"*/"guint" },
-       { "BOXED",      /*"GtkBoxed"*/"gpointer" },
-       { "POINTER",    "gpointer" },
-       { "OBJECT",     "GtkObject *" },
-       { "SIGNAL",     /*"GtkSignal"*/"__twopointertype" },
-       { "ARGS",       /*"GtkArgs"*/"__twopointertype" },
-       { "CALLBACK",   /*"GtkCallback"*/"__threepointertype" },
-       { "C_CALLBACK", /*"GtkCCallback"*/"__twopointertype" },
-       { "FOREIGN",    /*"GtkForeign"*/"__twopointertype" },
-
-       { NULL, NULL }
-};
-
-static const char *
-get_cast(char *type)
-{
-       int i;
-       for(i=0;our_gtk_type_table[i].gtkname;i++) {
-               if(strcmp(our_gtk_type_table[i].gtkname,type)==0) {
-                       return our_gtk_type_table[i].typename;
-               }
-       }
-       return NULL;
-}
-
 
 /* hash of method -> name of signal prototype */
 static GHashTable *marsh = NULL;
@@ -572,7 +495,7 @@ print_signal_marsal_args(Method *m)
                        else {
                                out_printf(out, ",\n\t\t(%s)"
                                           "GTK_VALUE_%s(args[%d])",
-                                          get_cast(li->data),
+                                          get_cast(li->data,FALSE),
                                           (char *)li->data,i);
                        }
                }
@@ -608,35 +531,35 @@ add_signal_prots(Method *m)
                return;
        }
        
-       s = g_strdup_printf("__Sig%d",sig++);
+       s = g_strdup_printf("Sig%d",sig++);
        
        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),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));
+               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"
+               "___marshal_%s (GtkObject * object,\n"
                "\tGtkSignalFunc func,\n"
                "\tgpointer func_data,\n"
                "\tGtkArg * args)\n"
                "{\n",s);
        
        if(strcmp(m->gtktypes->data,"NONE")==0) {
-               out_printf(out, "\t%s rfunc;\n\n"
-                       "\trfunc = (%s)func;\n\n"
+               out_printf(out, "\t___%s rfunc;\n\n"
+                       "\trfunc = (___%s)func;\n\n"
                        "\t(*rfunc)((%s *)object",s,s,typebase);
        } else {
-               out_printf(out, "\t%s rfunc;\n\t",s);
+               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"
+                       "\trfunc = (___%s)func;\n\n"
                        "\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
                        "\t*retval = (*rfunc)((%s *)object",
                        s,(char *)m->gtktypes->data,
@@ -781,7 +704,7 @@ add_signals(Class *c)
                        last = TRUE;
 
                if(g_hash_table_lookup(marsh,m))
-                       mar = g_strconcat("marshal_",
+                       mar = g_strconcat("___marshal_",
                                          (char *)g_hash_table_lookup(marsh,m),
                                          NULL);
                else
@@ -847,7 +770,7 @@ set_def_handlers(Class *c, char *oname)
                                           s,m->id);
                } else {
                        if(m->cbuf)
-                               out_printf(out,"\t%s->%s = _real_%s_%s;\n",
+                               out_printf(out,"\t%s->%s = ___real_%s_%s;\n",
                                        oname,m->id,funcbase,m->id);
                        else
                                out_printf(out,"\t%s->%s = NULL;\n",
@@ -860,6 +783,13 @@ static void
 make_arguments(Class *c)
 {
        GList *li;
+       char *argflags[] = {
+               "CONSTRUCT",
+               "CONSTRUCT_ONLY",
+               "CHILD_ARG",
+               "MASK",
+               NULL
+       };
 
        out_printf(out,"\n");
        for(li=c->nodes;li;li=g_list_next(li)) {
@@ -880,8 +810,32 @@ make_arguments(Class *c)
                else
                        flags = g_string_new("GTK_ARG_WRITABLE");
                
-               for(l=a->flags;l;l=g_list_next(l))
-                       g_string_sprintfa(flags," | GTK_ARG_%s",(char *)l->data);
+               for(l=a->flags;l;l=g_list_next(l)) {
+                       char *flag = l->data;
+                       int i;
+                       if(strcmp(flag,"READWRITE")==0 ||
+                          strcmp(flag,"READABLE")==0 ||
+                          strcmp(flag,"WRITABLE")==0) {
+                               print_error(TRUE,"READWRITE, READABLE and "
+                                           "WRITABLE argument flags are "
+                                           "set automatically",a->line_no);
+                               continue;
+                       }
+                       for(i=0;argflags[i];i++) {
+                               if(strcmp(argflags[i],flag)==0)
+                                       break;
+                       }
+                       /* if we haven't found it in our list */
+                       if(!argflags[i]) {
+                               char *s;
+                               s = g_strdup_printf("Unknown flag '%s' used, "
+                                                   "perhaps it was misspelled",
+                                                   flag);
+                               print_error(TRUE,s,a->line_no);
+                               g_free(s);
+                       }
+                       g_string_sprintfa(flags, " | GTK_ARG_%s",flag);
+               }
 
                s = g_strdup(a->name);
                g_strup(s);
@@ -895,8 +849,8 @@ make_arguments(Class *c)
        }
        
        out_printf(out,
-                  "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
-                  "\tgtk_object_class->get_arg = __object_get_arg;\n");
+                  "\n\tgtk_object_class->set_arg = ___object_set_arg;\n"
+                  "\tgtk_object_class->get_arg = ___object_get_arg;\n");
 }
 
 static void
@@ -977,7 +931,7 @@ add_getset_arg(Class *c, int is_set)
 {
        GList *li;
        out_printf(out,"\nstatic void\n"
-               "__object_%s_arg (GtkObject *object,\n"
+               "___object_%s_arg (GtkObject *object,\n"
                "\tGtkArg *arg,\n"
                "\tguint arg_id)\n"
                "{\n"
@@ -1025,12 +979,16 @@ print_checks(Method *m, FuncArg *fa)
 {
        GList *li;
        gboolean is_void;
+       gboolean checked_null = FALSE;
        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)
+                       out_addline_infile(out,m->line_no);
                if(is_void)
                        out_printf(out,"\tg_return_if_fail (");
                else
@@ -1038,10 +996,16 @@ print_checks(Method *m, FuncArg *fa)
                switch(ch->chtype) {
                case NULL_CHECK:
                        out_printf(out,"%s != NULL",fa->name);
+                       checked_null = TRUE;
                        break;
                case TYPE_CHECK:
                        s = make_pre_macro(fa->atype->name,"IS");
-                       out_printf(out,"%s (%s)",s,fa->name);
+                       if(checked_null)
+                               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);
                        g_free(s);
                        break;
                case LT_CHECK:
@@ -1084,6 +1048,8 @@ print_preconditions(Method *m)
                if(fa->checks)
                        print_checks(m,fa);
        }
+       if(m->line_no>0)
+               out_addline_outfile(out);
 }
 
 /* put in code if it's needed */
@@ -1093,14 +1059,13 @@ 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,"destroy")==0) {
+          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);
-
        }
 }
 
@@ -1110,6 +1075,7 @@ print_method_body(Method *m, int pre)
        out_printf(out,"{\n");
        if(pre)
                print_preconditions(m);
+
        put_in_gen_code(m);
 
        /* Note: the trailing }'s are on one line, this is so
@@ -1119,7 +1085,8 @@ print_method_body(Method *m, int pre)
           human readable anyway. */
        if(m->cbuf) {
                out_printf(out,"{\n");
-               out_addline_infile(out,m->ccode_line);
+               if(m->ccode_line>0)
+                       out_addline_infile(out,m->ccode_line);
                out_printf(out,"\t%s}",m->cbuf);
        }
 
@@ -1138,7 +1105,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);
+               const char *cast = get_cast(ali->data,FALSE);
                /* we should have already proved before that
                   the we know all the types */
                g_assert(cast);
@@ -1148,17 +1115,35 @@ put_signal_args(Method *m)
        }
 }
 
+static char *
+get_arg_names_for_macro(Method *m)
+{
+       char *p;
+       GList *li;
+       GString *gs = g_string_new("");
+       p = "";
+       for(li=m->args;li;li=g_list_next(li)) {
+               FuncArg *arg = li->data;
+               g_string_sprintfa(gs, "%s___%s", p, arg->name);
+               p = ",";
+       }
+       p = gs->str;
+       g_string_free(gs,FALSE);
+       return p;
+}
+
 static void
 put_method(Method *m)
 {
-       char *s;
+       char *s,*args;
        gboolean is_void;
        is_void = (strcmp(m->mtype->name,"void")==0 &&
                   m->mtype->stars == 0);
        out_printf(out,"\n");
        switch(m->method) {
        case REGULAR_METHOD:
-               out_addline_infile(out,m->line_no);
+               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);
                else /* PUBLIC, PROTECTED */
@@ -1167,7 +1152,8 @@ put_method(Method *m)
                break;
        case SIGNAL_FIRST_METHOD:
        case SIGNAL_LAST_METHOD:
-               out_addline_infile(out,m->line_no);
+               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);
                else
@@ -1200,12 +1186,14 @@ put_method(Method *m)
 
                if(!m->cbuf)
                        break;
-               out_addline_infile(out,m->line_no);
-               print_method(out,"static ","\n_real_"," ","\n",m,FALSE);
+               if(m->line_no>0)
+                       out_addline_infile(out,m->line_no);
+               print_method(out,"static ","\n___real_"," ","\n",m,FALSE);
                print_method_body(m,FALSE);
                break;
        case VIRTUAL_METHOD:
-               out_addline_infile(out,m->line_no);
+               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);
                else
@@ -1245,33 +1233,37 @@ put_method(Method *m)
 
                if(!m->cbuf)
                        break;
-               out_addline_infile(out,m->line_no);
-               print_method(out,"static ","\n_real_"," ","\n",m,FALSE);
+               if(m->line_no>0)
+                       out_addline_infile(out,m->line_no);
+               print_method(out,"static ","\n___real_"," ","\n",m,FALSE);
                print_method_body(m,FALSE);
                break;
        case OVERRIDE_METHOD:
                if(!m->cbuf)
                        break;
-               out_addline_infile(out,m->line_no);
+               if(m->line_no>0)
+                       out_addline_infile(out,m->line_no);
                print_method(out,"static ","\n"," ","\n",m,FALSE);
                s = replace_sep(m->otype,'_');
                g_strup(s);
+               args = get_arg_names_for_macro(m);
                if(is_void) {
-                       out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
+                       out_printf(out,"#define PARENT_HANDLER(%s) \\\n"
                                   "\t{ if(%s_CLASS(parent_class)->%s) \\\n"
-                                  "\t\t(* %s_CLASS(parent_class)->%s)(##args); }\n",
-                                  s,m->id,s,m->id);
+                                  "\t\t(* %s_CLASS(parent_class)->%s)(%s); }\n",
+                                  args,s,m->id,s,m->id,args);
                } else {
-                       out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
+                       out_printf(out,"#define PARENT_HANDLER(%s) \\\n"
                                   "\t((%s_CLASS(parent_class)->%s)? \\\n"
-                                  "\t\t(* %s_CLASS(parent_class)->%s)(##args): \\\n"
+                                  "\t\t(* %s_CLASS(parent_class)->%s)(%s): \\\n"
                                   "\t\t(",
-                                  s,m->id,s,m->id);
+                                  args,s,m->id,s,m->id,args);
                        out_printf(out,"(");
                        print_type(out,m->mtype,TRUE);
                        out_printf(out,")%s))\n",
                                   m->onerror?m->onerror:"0");
                }
+               g_free(args);
                g_free(s);
                print_method_body(m,TRUE);
                out_printf(out,"#undef PARENT_HANDLER\n");
@@ -1282,386 +1274,365 @@ put_method(Method *m)
 }
 
 static void
-check_duplicate(Class *c, Node *node, char *id, int line_no)
+open_files(void)
 {
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               char *nid;
-               int nline_no;
-               char *s;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       nid = m->id;
-                       nline_no = m->line_no;
-               } else if(n->type == VARIABLE_NODE) {
-                       Variable *v = (Variable *)n;
-                       nid = v->id;
-                       nline_no = v->line_no;
-               } else
-                       continue;
-               if(n==node ||
-                  line_no>=nline_no ||
-                  strcmp(nid,id)!=0 ||
-                  n->type != node->type)
-                       continue;
-               s = g_strdup_printf("symbol '%s' redefined, "
-                                   "first defined on line %d",
-                                   id,line_no);
-               print_error(FALSE,s,nline_no);
-       }
-}
+       char *outfile,*outfileh,*outfileph;
 
-static void
-check_duplicate_symbols(Class *c)
-{
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       check_duplicate(c,n,m->id,m->line_no);
-               } else if(n->type == VARIABLE_NODE) {
-                       Variable *v = (Variable *)n;
-                       check_duplicate(c,n,v->id,v->line_no);
+       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);
+
+       if((privates>0 || protecteds>0 || always_private_header) &&
+          !no_private_header)
+               outfileph = g_strconcat(filebase,"-private.h",NULL);
+       else
+               outfileph = NULL;
+
+       
+       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);
+       }
+       if(outfileph) {
+               outph = fopen(outfileph,"w");
+               if(!outph) {
+                       g_error("Cannot open outfile: %s",outfileh);
                }
        }
 }
 
 static void
-check_bad_symbols(Class *c)
+put_argument_nongnu_wrappers(Class *c)
 {
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if((m->method == SIGNAL_LAST_METHOD ||
-                           m->method == SIGNAL_FIRST_METHOD ||
-                           m->method == VIRTUAL_METHOD) &&
-                          strcmp(m->id,"__parent__")==0) {
-                               char *s;
-                               s = g_strdup_printf("'%s' not allowed as an "
-                                                   "identifier of signal "
-                                                   "or virtual methods",
-                                                   m->id);
-                               print_error(FALSE,s,m->line_no);
-                               g_free(s);
-                       }
-               } else if(n->type == VARIABLE_NODE) {
-                       Variable *v = (Variable *)n;
-                       if(strcmp(v->id,"_priv")==0 ||
-                          strcmp(v->id,"__parent__")==0) {
-                       char *s;
-                               s = g_strdup_printf("'%s' not allowed as a data "
-                                                   "member name",v->id);
-                               print_error(FALSE,s,v->line_no);
-                               g_free(s);
-                       }
-               }
-       }
-}
+       GList *li;
 
+       if(arguments<0)
+               return;
 
-static void
-check_duplicate_named(Class *c,Node *node,char *id, int line_no)
-{
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               char *nid;
-               int nline_no;
+       for(li=c->nodes;li;li=g_list_next(li)) {
+               Node *n = li->data;
+               Argument *a = (Argument *)n;
                char *s;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD) {
-                               nid = m->id;
-                               nline_no = m->line_no;
-                       } else
-                               continue;
-               } else if(n->type == ARGUMENT_NODE) {
-                       Argument *a = (Argument *)n;
-                       nid = a->name;
-                       nline_no = a->line_no;
-               } else
-                       continue;
-               if(n==node ||
-                  line_no>=nline_no ||
-                  strcmp(nid,id)!=0)
+               char *cast;
+               if(n->type != ARGUMENT_NODE)
                        continue;
-               s = g_strdup_printf("named symbol (argument or signal) '%s' "
-                                   "redefined, first defined on line %d",
-                                   id,line_no);
-               print_error(FALSE,s,nline_no);
+               s = g_strdup(a->name);
+               g_strup(s);
+               if(a->atype)
+                       cast = get_type(a->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, s, 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);
+               } else {
+                       if(a->set)
+                               out_printf(outh, "#define %s_ARG_%s(arg)    \t"
+                                          "\"%s\",(arg)\n",
+                                          macrobase, s, a->name);
+                       if(a->get)
+                               out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+                                          "\"%s\",(arg)\n",
+                                          macrobase, s, a->name);
+               }
+               g_free(cast);
+               g_free(s);
        }
 }
 
 static void
-check_duplicate_signals_args(Class *c)
+put_argument_gnu_wrappers(Class *c)
 {
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD)
-                               check_duplicate_named(c,n,m->id,m->line_no);
-               } else if(n->type == ARGUMENT_NODE) {
-                       Argument *a = (Argument *)n;
-                       check_duplicate_named(c,n,a->name,a->line_no);
+       GList *li;
+
+       if(arguments<0)
+               return;
+
+       for(li=c->nodes;li;li=g_list_next(li)) {
+               Node *n = li->data;
+               Argument *a = (Argument *)n;
+               char *s;
+               char *cast;
+               if(n->type != ARGUMENT_NODE)
+                       continue;
+               s = g_strdup(a->name);
+               g_strup(s);
+               if(a->atype)
+                       cast = get_type(a->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);
+               } else {
+                       if(a->set)
+                               out_printf(outh, "#define %s_ARG_%s(arg)    \t"
+                                          "\"%s\",(arg)\n",
+                                          macrobase, s, a->name);
+                       if(a->get)
+                               out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+                                          "\"%s\",(arg)\n",
+                                          macrobase, s, a->name);
                }
+               g_free(cast);
+               g_free(s);
        }
 }
 
 static void
-check_public_new(Class *c)
+print_ccode_block(CCode *cc)
 {
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if((strcmp(m->id,"new")==0) &&
-                          (m->method != REGULAR_METHOD ||
-                           m->scope != PUBLIC_SCOPE))
-                               print_error(TRUE,
-                                           "'new' should be a regular\n"
-                                           "public method",
-                                           m->line_no);
-               }
+       FILE *fp;
+       switch(cc->cctype) {
+       case HT_CCODE:
+               /* HT code is printed exactly like normal header
+                  code but is printed before */
+       case H_CCODE:
+               fp = outh;
+               out_printf(fp,"\n");
+               break;
+       default:
+       case C_CCODE:
+               fp = out;
+               out_printf(fp,"\n");
+               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);
+               break;
        }
+       out_printf(fp,"%s\n",cc->cbuf);
+       if(cc->cctype == C_CCODE ||
+          cc->cctype == PH_CCODE)
+               out_addline_outfile(fp);
 }
 
 static void
-check_vararg(Class *c)
+print_class_block(Class *c)
 {
        GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(!m->vararg)
-                               continue;
-                       if(m->method == OVERRIDE_METHOD ||
-                          m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD ||
-                          m->method == VIRTUAL_METHOD) {
-                               print_error(FALSE,
-                                           "signals, overrides and virtuals, "
-                                           "can't have variable argument "
-                                           "lists",
-                                           m->line_no);
-                       }
-               }
+       char *s;
+
+       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");
+
+       out_printf(outh,"\n#define %s\t"
+                  "(%s_get_type())\n",
+                  macrotype,funcbase);
+       out_printf(outh,"#define %s(obj)\t"
+                  "GTK_CHECK_CAST((obj),%s_get_type(),%s)\n",
+                  macrobase,funcbase,typebase);
+       out_printf(outh,"#define %s_CLASS(klass)\t"
+                  "GTK_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",
+                  macrois,funcbase);
+
+       /* argument wrapping macros */
+       if(arguments>0 && !no_gnu) {
+               out_printf(outh,"\n#ifdef __GNUC__\n");
+               put_argument_gnu_wrappers(c);
+               out_printf(outh,"#else /* __GNUC__ */\n");
+               put_argument_nongnu_wrappers(c);
+               out_printf(outh,"#endif /* __GNUC__ */\n\n");
+       } else if(arguments>0 && no_gnu) {
+               put_argument_nongnu_wrappers(c);
        }
-}
 
-static void
-check_firstarg(Class *c)
-{
-       GList *l;
+       if(privates>0)
+               out_printf(outh,"\ntypedef struct _%sPrivate %sPrivate;\n",typebase,typebase);
+
+       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)) {
                Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->args)
-                               continue;
-                       if(m->method == OVERRIDE_METHOD ||
-                          m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD ||
-                          m->method == VIRTUAL_METHOD) {
-                               print_error(FALSE,
-                                           "signals, overrides and virtuals, "
-                                           "can't have no arguments",
-                                           m->line_no);
-                       }
-               }
+               Variable *v = (Variable *)n;
+               if(n->type == VARIABLE_NODE &&
+                  v->scope == PUBLIC_SCOPE)
+                       put_variable((Variable *)n,outh);
        }
-}
-
-static void
-check_nonvoidempty(Class *c)
-{
-       GList *l;
+       /* put protecteds always AFTER publics */
        for(l=c->nodes;l;l=g_list_next(l)) {
                Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->method != REGULAR_METHOD)
-                               continue;
-                       if(!(strcmp(m->mtype->name,"void")==0 &&
-                            m->mtype->stars == 0) &&
-                          !m->cbuf) {
-                               print_error(TRUE,
-                                           "non-void empty method found, "
-                                           "regular non-void function should "
-                                           "not be empty.",
-                                           m->line_no);
-                               /* add a body here, so that the user will also
-                                  get a warning from gcc, and so that it will
-                                  at least point him to the prototype of the
-                                  function in the .gob file */
-                               m->cbuf = g_strdup("/*empty*/");
-                               m->ccode_line = m->line_no;
-                       }
-               }
+               Variable *v = (Variable *)n;
+               if(n->type == VARIABLE_NODE &&
+                  v->scope == PROTECTED_SCOPE)
+                       put_variable((Variable *)n,outh);
        }
-}
+       if(privates>0)
+               out_printf(outh,"\t%sPrivate *_priv;\n",typebase);
+       out_printf(outh,"};\n");
 
-static void
-check_signal_args(Class *c)
-{
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       GList *l;
-                       if(m->method != SIGNAL_LAST_METHOD &&
-                          m->method != SIGNAL_FIRST_METHOD)
-                               continue;
+       if(privates>0) {
+               FILE *outfp;
 
-                       for(l=m->gtktypes;l;l=l->next) {
-                               char *s;
-                               if(get_cast(l->data))
-                                       continue;
-                               s = g_strdup_printf("Unknown GTK+ type '%s' "
-                                                   "among signal types",
-                                                   (char *)l->data);
-                               print_error(FALSE, s, m->line_no);
-                               g_free(s);
+               /* if we are to stick this into the private
+                  header, if not stick it directly into the
+                  C file */
+               if(outph) 
+                       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_addline_outfile(outfp);
+               out_printf(outfp,"};\n");
        }
-}
 
-static int
-count_signals(Class *c)
-{
-       int num = 0;
-       GList *l;
+       out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
+                  typebase,typebase);
+       out_printf(outh,
+                  "struct _%sClass {\n\t%sClass __parent__;\n",
+                  typebase,ptypebase);
        for(l=c->nodes;l;l=g_list_next(l)) {
                Node *n = l->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD)
-                               num++;
-               }
+               if(n->type == METHOD_NODE)
+                       put_vs_method((Method *)n);
        }
-       return num;
-}
-
-static int
-count_arguments(Class *c)
-{
-       int num = 0;
-       GList *li;
-
-       for(li=c->nodes;li;li=g_list_next(li)) {
-               Node *n = li->data;
-               if(n->type == ARGUMENT_NODE)
-                       num ++;
+       out_printf(outh,"};\n\n");
+
+       out_printf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
+
+       out_printf(out,"/* here are local prototypes */\n");
+       if(!no_gnu) {
+               out_printf(out,"#ifdef __GNUC__\n"
+                          "#define ___NO_UNUSED_WARNING "
+                          "__attribute__ ((__unused__))\n"
+                          "#else /* __GNUC__ */\n"
+                          "#define ___NO_UNUSED_WARNING\n"
+                          "#endif /* __GNUC__ */\n");
+       }
+       if(arguments>0) {
+               out_printf(out,"static void ___object_set_arg "
+                          "(GtkObject *object, GtkArg *arg, "
+                          "guint arg_id);\n"
+                          "static void ___object_get_arg "
+                          "(GtkObject *object, GtkArg *arg, "
+                          "guint arg_id);\n");
        }
-       return num;
-}
 
-static int
-count_overrides(Class *c)
-{
-       int num = 0;
-       GList *l;
        for(l=c->nodes;l;l=g_list_next(l)) {
                Node *n = l->data;
                if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->method == OVERRIDE_METHOD)
-                               num++;
+                       put_pub_method((Method *)n);
+                       put_prot_method((Method *)n);
+                       put_priv_method_prot((Method *)n);
                }
        }
-       return num;
-}
 
-static int
-count_privates(Class *c)
-{
-       int num = 0;
-       GList *l;
-       for(l=c->nodes;l;l=g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == VARIABLE_NODE) {
-                       Variable *v = (Variable *)n;
-                       if(v->scope == PRIVATE_SCOPE)
-                               num++;
+       if(signals>0) {
+               for(l=c->nodes;l;l=g_list_next(l)) {
+                       Node *n = l->data;
+                       if(n->type == METHOD_NODE)
+                               add_signal_prots((Method *)n);
                }
        }
-       return num;
-}
 
-static int
-count_protecteds(Class *c)
-{
-       int num = 0;
-       GList *l;
+       if(!no_gnu)
+               out_printf(out,"#undef ___NO_UNUSED_WARNING\n");
+
+       add_enums(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");
+       }
+
+       out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
+                  funcbase);
+
+       add_inits(c);
+
+       if(arguments>0) {
+               add_getset_arg(c, TRUE);
+               add_getset_arg(c, FALSE);
+       }
+
        for(l=c->nodes;l;l=g_list_next(l)) {
                Node *n = l->data;
                if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->scope == PROTECTED_SCOPE)
-                               num++;
+                       put_method((Method *)n);
                }
        }
-       return num;
-}
 
+       out_printf(out,"#undef GET_NEW\n");
+
+       add_bad_hack_to_avoid_unused_warnings(c);
+}
 
 static void
-open_files(void)
+print_version_macros(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);
-
-       if((privates>0 || protecteds>0 || always_private_header) &&
-          !no_private_header)
-               outfileph = g_strconcat(filebase,"-private.h",NULL);
-       else
-               outfileph = NULL;
+       int major=0,minor=0,pl=0;
+       sscanf(VERSION,"%d.%d.%d",&major,&minor,&pl);
 
-       
-       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);
-       }
-       if(outfileph) {
-               outph = fopen(outfileph,"w");
-               if(!outph) {
-                       g_error("Cannot open outfile: %s",outfileh);
-               }
-       }
+       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
-generate_outfiles(void)
+print_file_comments(void)
 {
-       char *p;
-       GList *li;
        time_t curtime;
-       gboolean found_header;
-
        time(&curtime);
        out_printf(outh,"/* Generated by GOB (v%s)"
               "   (do not edit directly) */\n\n",VERSION);
@@ -1670,27 +1641,14 @@ generate_outfiles(void)
                           "   (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));
-       
-       p = replace_sep(((Class *)class)->otype,'_');
-       g_strup(p);
-       out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
-               "#include <gtk/gtk.h>\n\n",p,p);
-       if(outph)
-               out_printf(outph,"#ifndef __%s_PRIVATE_H__\n"
-                          "#define __%s_PRIVATE_H__\n\n"
-                          "#include \"%s.h\"\n\n",p,p,filebase);
-       g_free(p);
+}
+
+static void
+print_includes(void)
+{
+       gboolean found_header;
+       char *p;
 
-       if(!for_cpp) {
-               out_printf(outh,"#ifdef __cplusplus\n"
-                          "extern \"C\" {\n"
-                          "#endif /* __cplusplus */\n\n");
-               if(outph)
-                       out_printf(outph,"#ifdef __cplusplus\n"
-                                  "extern \"C\" {\n"
-                                  "#endif /* __cplusplus */\n\n");
-       }
-       
        p = g_strconcat(filebase,".h",NULL);
        found_header = TRUE;
        if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp)) {
@@ -1718,178 +1676,43 @@ generate_outfiles(void)
                }
                g_free(p);
        }
+}
 
-       for(li=nodes;li;li=g_list_next(li)) {
-               Node *node = li->data;
-               if(node->type == CCODE_NODE) {
-                       CCode *cc = (CCode *)node;
-                       FILE *fp;
-                       if(cc->header) {
-                               fp = outh;
-                               out_printf(fp,"\n");
-                       } else {
-                               fp = out;
-                               out_printf(fp,"\n");
-                               out_addline_infile(fp,cc->line_no);
-                       }
-                       out_printf(fp,"%s\n",cc->cbuf);
-                       if(!cc->header)
-                               out_addline_outfile(fp);
-               } else if(node->type == CLASS_NODE) {
-                       Class *c = (Class *)class;
-                       GList *l;
-
-                       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");
-
-                       out_printf(outh,"\n#define %s\t"
-                               "(%s_get_type())\n",
-                               macrotype,funcbase);
-                       out_printf(outh,"#define %s(obj)\t"
-                               "GTK_CHECK_CAST((obj),%s_get_type(),%s)\n",
-                               macrobase,funcbase,typebase);
-                       out_printf(outh,"#define %s_CLASS(klass)\t"
-                               "GTK_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",
-                               macrois,funcbase);
-
-                       if(privates>0)
-                               out_printf(outh,"\ntypedef struct _%sPrivate %sPrivate;\n",typebase,typebase);
-
-                       out_printf(outh,"\ntypedef struct _%s %s;\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)) {
-                               Node *n = l->data;
-                               Variable *v = (Variable *)n;
-                               if(n->type == VARIABLE_NODE &&
-                                  v->scope == PUBLIC_SCOPE)
-                                       put_variable((Variable *)n,outh);
-                       }
-                       /* put protecteds always AFTER publics */
-                       for(l=c->nodes;l;l=g_list_next(l)) {
-                               Node *n = l->data;
-                               Variable *v = (Variable *)n;
-                               if(n->type == VARIABLE_NODE &&
-                                  v->scope == PROTECTED_SCOPE)
-                                       put_variable((Variable *)n,outh);
-                       }
-                       if(privates>0)
-                               out_printf(outh,"\t%sPrivate *_priv;\n",typebase);
-                       out_printf(outh,"};\n");
-
-                       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) 
-                                       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_addline_outfile(outfp);
-                               out_printf(outfp,"};\n");
-                       }
-
-                       out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
-                               typebase,typebase);
-                       out_printf(outh,
-                               "struct _%sClass {\n\t%sClass __parent__;\n",
-                               typebase,ptypebase);
-                       for(l=c->nodes;l;l=g_list_next(l)) {
-                               Node *n = l->data;
-                               if(n->type == METHOD_NODE)
-                                       put_vs_method((Method *)n);
-                       }
-                       out_printf(outh,"};\n\n");
-
-                       out_printf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
-                       
-                       if(arguments>0) {
-                               out_printf(out,"static void __object_set_arg "
-                                          "(GtkObject *object, GtkArg *arg, "
-                                          "guint arg_id);\n"
-                                          "static void __object_get_arg "
-                                          "(GtkObject *object, GtkArg *arg, "
-                                          "guint arg_id);\n");
-                       }
-
-                       out_printf(out,"/* here are local prototypes */\n");
-                       for(l=c->nodes;l;l=g_list_next(l)) {
-                               Node *n = l->data;
-                               if(n->type == METHOD_NODE) {
-                                       put_pub_method((Method *)n);
-                                       put_prot_method((Method *)n);
-                                       put_priv_method_prot((Method *)n);
-                               }
-                       }
-
-                       if(signals>0) {
-                               for(l=c->nodes;l;l=g_list_next(l)) {
-                                       Node *n = l->data;
-                                       if(n->type == METHOD_NODE)
-                                               add_signal_prots((Method *)n);
-                               }
-                       }
-                       
-                       add_enums(c);
-                       
-                       add_get_type();
-
-                       make_method_pointers(c);
-
-                       out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
-                                  funcbase);
-
-                       add_inits(c);
-
-                       if(arguments>0) {
-                               add_getset_arg(c, TRUE);
-                               add_getset_arg(c, FALSE);
-                       }
-
-                       for(l=c->nodes;l;l=g_list_next(l)) {
-                               Node *n = l->data;
-                               if(n->type == METHOD_NODE) {
-                                       put_method((Method *)n);
-                               }
-                       }
+static void
+print_header_prefixes(void)
+{
+       char *p;
 
-                       out_printf(out,"#undef GET_NEW\n");
+       p = replace_sep(((Class *)class)->otype,'_');
+       g_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"
+                          "#define __%s_PRIVATE_H__\n\n"
+                          "#include \"%s.h\"\n\n",p,p,filebase);
+       g_free(p);
 
-                       add_bad_hack_to_avoid_unused_warnings(c);
-               } else
-                       g_assert_not_reached();
+       if(!no_extern_c) {
+               out_printf(outh,"#ifdef __cplusplus\n"
+                          "extern \"C\" {\n"
+                          "#endif /* __cplusplus */\n\n");
+               if(outph)
+                       out_printf(outph,"#ifdef __cplusplus\n"
+                                  "extern \"C\" {\n"
+                                  "#endif /* __cplusplus */\n\n");
        }
+}
 
-       if(!for_cpp)
+static void
+print_header_postfixes(void)
+{
+       if(!no_extern_c)
                out_printf(outh,"\n#ifdef __cplusplus\n"
                           "}\n"
                           "#endif /* __cplusplus */\n");
        out_printf(outh,"\n#endif");
        if(outph) {
-               if(!for_cpp)
+               if(!no_extern_c)
                        out_printf(outph,"\n#ifdef __cplusplus\n"
                                   "}\n"
                                   "#endif /* __cplusplus */\n");
@@ -1897,15 +1720,54 @@ generate_outfiles(void)
        }
 }
 
-#if 0
 static void
-usage(poptContext optCon, int exitcode, char *error, char *addl)
+print_header_top(void)
+{
+       GList *li;
+
+       /* mandatory include */
+       out_printf(outh,"#include <gtk/gtk.h>\n\n");
+
+       /* print the HT_CCODE blocks */
+       for(li=nodes;li;li=g_list_next(li)) {
+               Node *node = li->data;
+               if(node->type == CCODE_NODE) {
+                       CCode *cc = (CCode *)node;
+                       if(cc->cctype==HT_CCODE)
+                               print_ccode_block((CCode *)node);
+               }
+       }
+}
+
+static void
+generate_outfiles(void)
 {
-       poptPrintUsage(optCon, stderr, 0);
-       if (error) fprintf(stderr, "%s: %s", error, addl);
-       exit(exitcode);
+       GList *li;
+
+       print_file_comments();
+
+       print_header_top();
+
+       print_header_prefixes();
+
+       print_version_macros();
+       
+       print_includes();
+
+       for(li=nodes;li;li=g_list_next(li)) {
+               Node *node = li->data;
+               if(node->type == CCODE_NODE) {
+                       CCode *cc = (CCode *)node;
+                       if(cc->cctype!=HT_CCODE)
+                               print_ccode_block((CCode *)node);
+               } else if(node->type == CLASS_NODE) {
+                       print_class_block((Class *)node);
+               } else
+                       g_assert_not_reached();
+       }
+
+       print_header_postfixes();
 }
-#endif
 
 static void
 print_help(void)
@@ -1917,6 +1779,9 @@ print_help(void)
                "\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 "
@@ -1967,6 +1832,10 @@ parse_options(int argc, char *argv[])
                } else if(strcmp(argv[i],"--no-private-header")==0) {
                        always_private_header = FALSE;
                        no_private_header = TRUE;
+               } 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],"--")==0) {
                        /*further arguments are files*/
                        no_opts = TRUE;
@@ -2030,37 +1899,6 @@ compare_and_move_header(void)
 int
 main(int argc, char *argv[])
 {
-#if 0
-       int c;
-       poptContext optCon;
-       
-       struct poptOption optionsTable[] = {
-               { "exit-on-warn", 'w', 0, &exit_on_warn, 0,
-                        "exit on warnings" },
-               POPT_AUTOHELP
-               { NULL, 0, 0, NULL, 0 }
-       };
-       
-       optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
-       poptSetOtherOptionHelp(optCon, "[OPTIONS]* [filename]");
-       
-       while ((c = poptGetNextOpt(optCon)) >= 0)
-               ;
-       
-       filename = poptGetArg(optCon);
-       if(!(poptPeekArg(optCon) == NULL))
-               usage(optCon, 1, "Specify only one file",
-                     ".e.g., filename.gob");
-                       
-       if (c < -1) {
-               /* an error occurred during option processing */
-               fprintf(stderr, "%s: %s\n",
-                       poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
-                       poptStrerror(c));
-               return 1;
-       }
-#endif
-
        parse_options(argc,argv);
        
        if(filename) {
@@ -2091,7 +1929,7 @@ main(int argc, char *argv[])
        make_bases();
        make_inits((Class *)class);
        if(privates>0)
-               make_destroy((Class *)class);
+               make_finalize((Class *)class);
        check_bad_symbols((Class *)class);
        check_duplicate_symbols((Class *)class);
        check_duplicate_signals_args((Class *)class);
@@ -2100,6 +1938,7 @@ main(int argc, char *argv[])
        check_firstarg((Class *)class);
        check_nonvoidempty((Class *)class);
        check_signal_args((Class *)class);
+       check_argument_types((Class *)class);
 
        exit_on_error = TRUE;
        
@@ -2116,8 +1955,5 @@ main(int argc, char *argv[])
        if(no_touch_headers)
                compare_and_move_header();
        
-#if 0
-       poptFreeContext(optCon);
-#endif
        return 0;
 }