]> git.draconx.ca Git - gob-dx.git/blobdiff - src/main.c
Release 0.91.0
[gob-dx.git] / src / main.c
index 02db339d0109ca0c53fdc775c8c119c358020a5d..07158f5b1c14d58c2a04ffbb5fa60a89a4c30f0c 100644 (file)
 
 #include "config.h"
 #include <glib.h>
+#if 0
 #include <popt.h>
+#endif
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 #include "tree.h"
 #include "parse.h"
+#include "out.h"
+#include "main.h"
 
-char *filename = "stdin";
+char *filename = NULL;
 
 int yyparse(void);
 
@@ -38,32 +44,46 @@ extern FILE * yyin;
 extern Node *class;
 extern GList *nodes;
 
-static char *filebase;
+extern GList *include_files;
+
+char *filebase;
 static char *funcbase;
 static char *pfuncbase;
 static char *macrobase;
 static char *macrois;
+static char *macrotype;
 static char *typebase;
 static char *ptypebase;
 
-static FILE *out;
-static FILE *outh;
+static int signals = 0; /* number of signals */
+static int arguments = 0; /* number of named arguments */
+static int overrides = 0; /* number of override functions */
+static int privates = 0; /* number of private data members */
 
-int exit_on_warn = FALSE;
+FILE *out;
+FILE *outh;
 
-static void
+gboolean no_touch_headers = FALSE;
+gboolean for_cpp = FALSE;
+gboolean exit_on_warn = FALSE;
+gboolean exit_on_error = TRUE;
+gboolean got_error = FALSE;
+
+void
 print_error(int is_warn, char *error,int line)
 {
        char *w;
        if(is_warn)
                w = "Warning:";
-       else
+       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)
+       if((!is_warn || exit_on_warn) && exit_on_error)
                exit(1);
 }
 
@@ -116,17 +136,19 @@ separns_replace_sep(char *base, char **ns, char **name, char r)
                *name = s;
 }
 
+/* make a macro with some prefix before the name but after
+   namespace */
 static char *
-make_is_macro(char *base)
+make_pre_macro(char *base, char *pre)
 {
        char *s1,*s2;
        char *s;
 
        separns_replace_sep(base,&s1,&s2,'_');
        if(s1)
-               s = g_strconcat(s1,"_IS_",s2,NULL);
+               s = g_strconcat(s1,"_",pre,"_",s2,NULL);
        else
-               s = g_strconcat("IS_",s2,NULL);
+               s = g_strconcat(pre,"_",s2,NULL);
 
        g_strup(s);
        
@@ -151,7 +173,8 @@ make_bases(void)
        macrobase = replace_sep(((Class *)class)->otype,'_');
        g_strup(macrobase);
        
-       macrois = make_is_macro(((Class *)class)->otype);
+       macrois = make_pre_macro(((Class *)class)->otype,"IS");
+       macrotype = make_pre_macro(((Class *)class)->otype,"TYPE");
 
        typebase = remove_sep(((Class *)class)->otype);
 
@@ -159,11 +182,59 @@ make_bases(void)
 }
 
 static void
-def_methods(Class *c)
+print_type(FILE *fp, Type *t)
+{
+       char *s;
+       int i;
+       s = remove_sep(t->name);
+       out_printf(fp,"%s ",s); 
+       g_free(s);
+       
+       for(i=0;i<t->stars;i++)
+               out_printf(fp,"*"); 
+}
+
+static void
+print_method(FILE *fp, char *typeprefix, char *nameprefix,
+            char *namepostfix,char *postfix, Method *m,
+            gboolean no_funcbase)
 {
        GList *li;
+
+       out_printf(fp,"%s",typeprefix); 
+       print_type(fp,m->mtype);
+       if(no_funcbase)
+               out_printf(fp,"%s%s%s(",
+                          nameprefix,m->id,namepostfix); 
+       else
+               out_printf(fp,"%s%s_%s%s(",
+                          nameprefix,funcbase,m->id,namepostfix); 
        
-       fprintf(out,"\n");
+       if(m->args) {
+               for(li=m->args;li;li=g_list_next(li)) {
+                       FuncArg *arg = li->data;
+                       print_type(fp,arg->atype);
+                       if(li->next)
+                               out_printf(fp,"%s, ",arg->name); 
+                       else
+                               out_printf(fp,"%s",arg->name); 
+
+               }
+               if(m->vararg)
+                       out_printf(fp,", ..."); 
+       } else {
+               out_printf(fp,"void"); 
+       }
+       out_printf(fp,")%s",postfix); 
+}
+
+
+static void
+make_method_pointers(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) {
@@ -173,80 +244,64 @@ def_methods(Class *c)
                           m->scope == CLASS_INIT_METHOD ||
                           m->scope == OVERRIDE_METHOD)
                                continue;
-                       
-                       fprintf(out,"#define %s %s_%s\n",m->id,funcbase,m->id); 
+
+                       /* in C++ mode don't alias new */
+                       if(for_cpp && strcmp(m->id,"new")==0)
+                               continue;
+
+                       print_method(out,"static ","(* ",") ","",m,TRUE);
+                       out_printf(out," = %s_%s;\n",funcbase,m->id);
                }
        }
-       fprintf(out,"\n");
+       out_printf(out,"\n");
 }
 
 static void
-undef_methods(Class *c)
+add_bad_hack_to_avoid_unused_warnings(Class *c)
 {
        GList *li;
        
-       fprintf(out,"\n");
+       out_printf(out,"\n\n/*REALLY BAD HACK\n"
+                  "  This is to avoid unused warnings if you don't call\n"
+                  "  some method, it pollutes the namespace but the call\n"
+                  "  is weird enough.  I need to find a better way to do\n"
+                  "  this */\n");
+       out_printf(out,"void __%s_really_bad_hack_to_avoid_warnings(void);\n",
+                  funcbase);
+       out_printf(out,"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;
                if(node->type == METHOD_NODE) {
                        Method *m = (Method *)node;
-
+                       
                        if(m->scope == INIT_METHOD ||
                           m->scope == CLASS_INIT_METHOD ||
                           m->scope == OVERRIDE_METHOD)
                                continue;
-                       
-                       fprintf(out,"#undef %s\n",m->id); 
-               }
-       }
-       fprintf(out,"\n");
-}
-
-static void
-print_type(FILE *fp, Type *t)
-{
-       char *s;
-       int i;
-       s = remove_sep(t->name);
-       fprintf(fp,"%s ",s); 
-       g_free(s);
-       
-       for(i=0;i<t->stars;i++)
-               fprintf(fp,"*"); 
-}
 
-static void
-put_variable(Variable *v)
-{
-       fprintf(outh,"\t");
-       if(v->scope == PRIVATE_SCOPE)
-               fprintf(outh,"/* private */ "); 
-       print_type(outh,v->vtype);
+                       /* in C++ mode we don't alias new */
+                       if(for_cpp && strcmp(m->id,"new")==0)
+                               continue;
 
-       fprintf(outh,"%s;\n",v->id); 
+                       out_printf(out,"\t((void (*)(void))%s)();\n",m->id);
+               }
+       }
+       out_printf(out,"}\n\n");
 }
 
 static void
-print_method(FILE *fp, char *typeprefix, char *nameprefix,
-            char *namepostfix,char *postfix, Method *m)
+put_variable(Variable *v, FILE *fp, int priv)
 {
-       GList *li;
-
-       fprintf(fp,"%s",typeprefix); 
-       print_type(fp,m->mtype);
-       fprintf(fp,"%s%s_%s%s(",
-               nameprefix,funcbase,m->id,namepostfix); 
-       
-       for(li=m->args;li;li=g_list_next(li)) {
-               FuncArg *arg = li->data;
-               print_type(fp,arg->atype);
-               if(li->next)
-                       fprintf(fp,"%s, ",arg->name); 
-               else
-                       fprintf(fp,"%s",arg->name); 
-
+       if(v->scope == PRIVATE_SCOPE) {
+               if(!priv) return;
+       } else {
+               if(priv) return;
        }
-       fprintf(fp,")%s\n",postfix); 
+
+       out_printf(fp,"\t");
+       print_type(fp,v->vtype);
+       out_printf(fp,"%s;\n",v->id); 
 }
 
 static void
@@ -254,10 +309,13 @@ put_vs_method(Method *m)
 {
        if(m->scope != SIGNAL_LAST_METHOD &&
           m->scope != SIGNAL_FIRST_METHOD &&
-          m->scope != VIRTUAL_METHOD)
+          m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
+          m->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
+          m->scope != VIRTUAL_METHOD &&
+          m->scope != PRIVATE_VIRTUAL_METHOD)
                return;
 
-       print_method(outh,"\t","(* ",") ",";",m);
+       print_method(outh,"\t","(* ",") ",";\n",m,TRUE);
 }
 
 static void
@@ -266,10 +324,13 @@ put_pub_method(Method *m)
        if(m->scope == PRIVATE_SCOPE ||
           m->scope == OVERRIDE_METHOD ||
           m->scope == INIT_METHOD ||
-          m->scope == CLASS_INIT_METHOD)
+          m->scope == CLASS_INIT_METHOD ||
+          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+          m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+          m->scope == PRIVATE_VIRTUAL_METHOD)
                return;
 
-       print_method(outh,"","\t","\t",";",m);
+       print_method(outh,"","\t","\t",";\n",m,FALSE);
 }
 
 static void
@@ -278,28 +339,34 @@ put_priv_method_prot(Method *m)
        if(m->scope == PUBLIC_SCOPE)
                return;
 
-       if(m->scope == SIGNAL_LAST_METHOD ||
-          m->scope == SIGNAL_FIRST_METHOD ||
-          m->scope == VIRTUAL_METHOD) {
+       if(m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+          m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+          m->scope == PRIVATE_VIRTUAL_METHOD) {
+               if(m->cbuf)
+                       print_method(out,"static ","_real_"," ",";\n",m,FALSE);
+               print_method(out,"static ",""," ",";\n",m,FALSE);
+       } else if(m->scope == SIGNAL_LAST_METHOD ||
+                 m->scope == SIGNAL_FIRST_METHOD ||
+                 m->scope == VIRTUAL_METHOD) {
                if(!m->cbuf)
                        return;
-               print_method(out,"static ","_real_"," ",";",m);
+               print_method(out,"static ","_real_"," ",";\n",m,FALSE);
        } else {
-               print_method(out,"static ",""," ",";",m);
+               print_method(out,"static ",""," ",";\n",m,FALSE);
        }
 }
 
 static GList *
-make_init_args(Class *cl, char *name, int is_class)
+make_func_arg(char *typename, int is_class, char *name)
 {
        Node *node;
        Node *type;
        char *tn;
        
        if(is_class)
-               tn = g_strconcat(cl->otype,":Class",NULL);
+               tn = g_strconcat(typename,":Class",NULL);
        else
-               tn = g_strdup(cl->otype);
+               tn = g_strdup(typename);
 
        type = new_type(1,tn);
        node = new_funcarg((Type *)type,name,NULL);
@@ -332,20 +399,58 @@ make_inits(Class *cl)
                node = new_method(CLASS_INIT_METHOD,
                                  (Type *)new_type(0,g_strdup("void")),
                                  NULL,NULL,g_strdup("class_init"),
-                                 make_init_args(cl,g_strdup("c"),TRUE),
-                                 NULL, NULL,0);
+                                 make_func_arg(cl->otype,TRUE,g_strdup("c")),
+                                 NULL, NULL,0,0,FALSE);
                cl->nodes = g_list_prepend(cl->nodes,node);
        }
        if(!got_init) {
                node = new_method(INIT_METHOD,
                                  (Type *)new_type(0,g_strdup("void")),
                                  NULL,NULL,g_strdup("init"),
-                                 make_init_args(cl,g_strdup("o"),FALSE),
-                                 NULL, NULL,0);
+                                 make_func_arg(cl->otype,FALSE,g_strdup("o")),
+                                 NULL, NULL,0,0,FALSE);
                cl->nodes = g_list_prepend(cl->nodes,node);
        }
 }
 
+static void
+make_destroy(Class *cl)
+{
+       int got_destroy = FALSE;
+       GList *li;
+       Node *node;
+       for(li=cl->nodes;li;li=g_list_next(li)) {
+               Node *n = li->data;
+               if(n->type == METHOD_NODE) {
+                       Method *m = (Method *)n;
+                       if(m->scope == OVERRIDE_METHOD &&
+                          strcmp(m->id,"destroy")==0) {
+                               if(strcmp(m->otype,"Gtk:Object")==0) {
+                                       got_destroy = TRUE;
+                                       break;
+                               } else {
+                                       print_error(FALSE,"destroy method override "
+                                                   "of class other then Gtk:Object",
+                                                   m->line_no);
+                               }
+
+                       }
+               }
+       }
+       if(!got_destroy) {
+               node = new_method(OVERRIDE_METHOD,
+                                 (Type *)new_type(0,g_strdup("void")),
+                                 g_strdup("Gtk:Object"),
+                                 NULL,g_strdup("destroy"),
+                                 make_func_arg("Gtk:Object",FALSE,g_strdup("o")),
+                                 NULL,
+                                 g_string_new("PARENT_HANDLER (o);\n"),
+                                 0,0,FALSE);
+               cl->nodes = g_list_append(cl->nodes,node);
+               overrides++;
+       }
+}
+
 static GHashTable *marsh = NULL;
 
 static void
@@ -356,7 +461,9 @@ add_signal_prots(Method *m)
        char *s;
        
        if(m->scope != SIGNAL_LAST_METHOD &&
-          m->scope != SIGNAL_FIRST_METHOD)
+          m->scope != SIGNAL_FIRST_METHOD &&
+          m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
+          m->scope != PRIVATE_SIGNAL_FIRST_METHOD)
                return;
 
        if(!marsh)
@@ -370,19 +477,19 @@ add_signal_prots(Method *m)
        
        g_hash_table_insert(marsh,m,s);
        
-       fprintf(out,"\ntypedef ");
+       out_printf(out,"\ntypedef ");
        print_type(out,m->mtype);
        
-       fprintf(out,"(*%s) (",s);
+       out_printf(out,"(*%s) (",s);
        
        for(li=m->args;li;li=g_list_next(li)) {
                FuncArg *arg = li->data;
                print_type(out,arg->atype);
-               fprintf(out,", "); 
+               out_printf(out,", "); 
        }
-       fprintf(out,"gpointer);\n"); 
+       out_printf(out,"gpointer);\n"); 
        
-       fprintf(out,"\nstatic void\n"
+       out_printf(out,"\nstatic void\n"
                "marshal_%s (GtkObject * object,\n"
                "\tGtkSignalFunc func,\n"
                "\tgpointer func_data,\n"
@@ -391,35 +498,57 @@ add_signal_prots(Method *m)
        
        if(strcmp(m->gtktypes->data,"NONE")==0) {
                int i;
-               fprintf(out, "\t%s rfunc;\n\n"
+               out_printf(out, "\t%s rfunc;\n\n"
                        "\trfunc = (%s)func;\n\n"
                        "\t(*rfunc)((%s *)object",s,s,typebase);
                if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
+                       GList *ali = m->args->next;
                        for(i=0,li=m->gtktypes->next;li;
                            i++,li=g_list_next(li)) {
-                               fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
-                                       (char *)li->data,i);
+                               if(!for_cpp || !ali)
+                                       out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+                                                  (char *)li->data,i);
+                               else {
+                                       FuncArg *fa = ali->data;
+                                       out_printf(out, ",\n\t\t(");
+                                       print_type(out,fa->atype);
+                                       out_printf(out, ")GTK_VALUE_%s(args[%d])",
+                                                  (char *)li->data,i);
+                               }
+
+                               if(ali) ali = ali->next;
                        }
                }
-               fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+               out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
        } else {
                int i;
-               fprintf(out, "\t%s rfunc;\n\t",s);
+               out_printf(out, "\t%s rfunc;\n\t",s);
                print_type(out,m->mtype);
-               fprintf(out, " *retval;\n\n"
+               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);
                if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
+                       GList *ali = m->args->next;
                        for(i=0,li=m->gtktypes->next;li;
                            i++,li=g_list_next(li)) {
-                               fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
-                                       (char *)li->data,i);
+                               if(!for_cpp || !ali)
+                                       out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+                                                  (char *)li->data,i);
+                               else {
+                                       FuncArg *fa = ali->data;
+                                       out_printf(out, ",\n\t\t(");
+                                       print_type(out,fa->atype);
+                                       out_printf(out, ")GTK_VALUE_%s(args[%d])",
+                                                  (char *)li->data,i);
+                               }
+
+                               if(ali) ali = ali->next;
                        }
                }
-               fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+               out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
        }
 
 }
@@ -428,43 +557,52 @@ static void
 add_enums(Class *c)
 {
        GList *li;
-       fprintf(out,"\nenum {\n");
-       for(li=c->nodes;li;li=g_list_next(li)) {
-               Node *n = li->data;
-               if(n->type == METHOD_NODE) {
-                       Method *m = (Method *)n;
-                       if(m->scope == SIGNAL_LAST_METHOD ||
-                          m->scope == SIGNAL_FIRST_METHOD) {
-                               char *s = g_strdup(m->id);
-                               g_strup(s);
-                               fprintf(out,"\t%s_SIGNAL,\n",s);
-                               g_free(s);
+       out_printf(out,"\n");
+       if(signals>0) {
+               out_printf(out,"enum {\n");
+               for(li=c->nodes;li;li=g_list_next(li)) {
+                       Node *n = li->data;
+                       if(n->type == METHOD_NODE) {
+                               Method *m = (Method *)n;
+                               if(m->scope == SIGNAL_LAST_METHOD ||
+                                  m->scope == SIGNAL_FIRST_METHOD ||
+                                  m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                                  m->scope == PRIVATE_SIGNAL_FIRST_METHOD) {
+                                       char *s = g_strdup(m->id);
+                                       g_strup(s);
+                                       out_printf(out,"\t%s_SIGNAL,\n",s);
+                                       g_free(s);
+                               }
                        }
                }
+               out_printf(out,"\tLAST_SIGNAL\n};\n\n");
        }
-       fprintf(out,"\tLAST_SIGNAL\n"
-               "};\n\n"
-               "enum {\n"
-               "\tARG_0,\n");
-       for(li=c->nodes;li;li=g_list_next(li)) {
-               Node *n = li->data;
-               if(n->type == ARGUMENT_NODE) {
-                       Argument *a = (Argument *)n;
-                       char *s = g_strdup(a->name);
-                       g_strup(s);
-                       fprintf(out,"\tARG_%s,\n",s);
-                       g_free(s);
+       if(arguments>0) {
+               out_printf(out,"enum {\n\tARG_0,\n");
+               for(li=c->nodes;li;li=g_list_next(li)) {
+                       Node *n = li->data;
+                       if(n->type == ARGUMENT_NODE) {
+                               Argument *a = (Argument *)n;
+                               char *s = g_strdup(a->name);
+                               g_strup(s);
+                               out_printf(out,"\tARG_%s,\n",s);
+                               g_free(s);
+                       }
                }
+               out_printf(out, "};\n\n");
        }
-       fprintf(out, "};\n\n"
-               "static guint object_signals[LAST_SIGNAL] = {0};\n\n"
-               "static %sClass *parent_class = NULL;\n\n",ptypebase);
+
+       if(signals>0)
+               out_printf(out,
+                          "static guint object_signals[LAST_SIGNAL] = {0};\n\n");
+
+       out_printf(out, "static %sClass *parent_class = NULL;\n\n",ptypebase);
 }
 
 static void
 add_get_type(void)
 {
-       fprintf(out, "guint\n"
+       out_printf(out, "guint\n"
                "%s_get_type (void)\n"
                "{\n"
                "\tstatic guint type = 0;\n\n"
@@ -488,15 +626,17 @@ add_get_type(void)
 }
 
 static void
-add_overrides(Class *c, char *oname)
+add_overrides(Class *c, char *oname, gboolean did_gtk_obj)
 {
        GList *li;
        GHashTable *done;
        char *s;
        
        done = g_hash_table_new(g_str_hash,g_str_equal);
-       s = g_strdup("GtkObject"); /* This was already done */
-       g_hash_table_insert(done,s,s);
+       if(did_gtk_obj) {
+               s = g_strdup("GtkObject"); /* This was already done */
+               g_hash_table_insert(done,s,s);
+       }
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *n = li->data;
                char *f;
@@ -517,7 +657,7 @@ add_overrides(Class *c, char *oname)
                f = replace_sep(m->otype,'_');
                g_strdown(f);
 
-               fprintf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
+               out_printf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
                        s,f,s,oname);
                
                g_free(f);
@@ -531,19 +671,28 @@ add_signals(Class *c)
 {
        GList *li;
 
-       fprintf(out,"\n");
+       out_printf(out,"\n");
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *n = li->data;
                Method *m;
                char *mar;
                char *sig;
                int is_none;
+               int last = FALSE;
                if(n->type != METHOD_NODE ||
                   (((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
-                   ((Method *)n)->scope != SIGNAL_LAST_METHOD))
+                   ((Method *)n)->scope != SIGNAL_LAST_METHOD &&
+                   ((Method *)n)->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
+                   ((Method *)n)->scope != PRIVATE_SIGNAL_LAST_METHOD))
                        continue;
 
                m = (Method *)n;
+               
+               if(m->scope == SIGNAL_FIRST_METHOD ||
+                  m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+                       last = FALSE;
+               else
+                       last = TRUE;
 
                if(g_hash_table_lookup(marsh,m))
                        mar = g_strconcat("marshal_",
@@ -556,7 +705,7 @@ add_signals(Class *c)
                
                sig = g_strdup(m->id);
                g_strup(sig);
-               fprintf(out,"\tobject_signals[%s_SIGNAL] =\n"
+               out_printf(out,"\tobject_signals[%s_SIGNAL] =\n"
                        "\t\tgtk_signal_new (\"%s\",\n"
                        "\t\t\tGTK_RUN_%s,\n"
                        "\t\t\tgtk_object_class->type,\n"
@@ -564,7 +713,7 @@ add_signals(Class *c)
                        "\t\t\t%s,\n"
                        "\t\t\tGTK_TYPE_%s, %d",
                        sig,m->id,
-                       m->scope==SIGNAL_LAST_METHOD?"LAST":"FIRST",
+                       last?"LAST":"FIRST",
                        typebase,m->id,mar,(char *)m->gtktypes->data,
                        is_none?0:g_list_length(m->gtktypes->next));
                g_free(mar);
@@ -573,13 +722,13 @@ add_signals(Class *c)
                if(!is_none) {
                        GList *l;
                        for(l=m->gtktypes->next;l;l=g_list_next(l))
-                               fprintf(out,",\n\t\t\tGTK_TYPE_%s",
+                               out_printf(out,",\n\t\t\tGTK_TYPE_%s",
                                        (char *)l->data);
                }
 
-               fprintf(out,");\n");
+               out_printf(out,");\n");
        }
-       fprintf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
+       out_printf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
                "\t\tobject_signals, LAST_SIGNAL);\n\n");
 }
 
@@ -588,14 +737,17 @@ set_def_handlers(Class *c, char *oname)
 {
        GList *li;
 
-       fprintf(out,"\n");
+       out_printf(out,"\n");
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *n = li->data;
                Method *m;
                if(n->type != METHOD_NODE ||
                   (((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
                    ((Method *)n)->scope != SIGNAL_LAST_METHOD &&
+                   ((Method *)n)->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
+                   ((Method *)n)->scope != PRIVATE_SIGNAL_LAST_METHOD &&
                    ((Method *)n)->scope != VIRTUAL_METHOD &&
+                   ((Method *)n)->scope != PRIVATE_VIRTUAL_METHOD &&
                    ((Method *)n)->scope != OVERRIDE_METHOD))
                        continue;
 
@@ -605,39 +757,25 @@ set_def_handlers(Class *c, char *oname)
                        char *s;
                        s = replace_sep(m->otype,'_');
                        g_strdown(s);
-                       fprintf(out,"\t%s_class->%s = %s_%s;\n",
+                       out_printf(out,"\t%s_class->%s = %s_%s;\n",
                                s,m->id,funcbase,m->id);
                } else {
                        if(m->cbuf)
-                               fprintf(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
-                               fprintf(out,"\t%s->%s = NULL;\n",
+                               out_printf(out,"\t%s->%s = NULL;\n",
                                        oname,m->id);
                }
        }
 }
 
-static int
-is_arguments(Class *c)
-{
-       GList *li;
-
-       for(li=c->nodes;li;li=g_list_next(li)) {
-               Node *n = li->data;
-               if(n->type == ARGUMENT_NODE)
-                       return TRUE;
-       }
-       return FALSE;
-}
-
-
 static void
 make_arguments(Class *c)
 {
        GList *li;
 
-       fprintf(out,"\n");
+       out_printf(out,"\n");
        for(li=c->nodes;li;li=g_list_next(li)) {
                Node *n = li->data;
                Argument *a;
@@ -661,7 +799,7 @@ make_arguments(Class *c)
 
                s = g_strdup(a->name);
                g_strup(s);
-               fprintf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
+               out_printf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
                        "\t\tGTK_TYPE_%s,\n"
                        "\t\t%s,\n"
                        "\t\tARG_%s);\n",
@@ -670,11 +808,9 @@ make_arguments(Class *c)
                g_string_free(flags,TRUE);
        }
        
-       if(is_arguments(c)) {
-               fprintf(out,
-                       "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
-                       "\tgtk_object_class->get_arg = __object_get_arg;\n");
-       }
+       out_printf(out,
+                  "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
+                  "\tgtk_object_class->get_arg = __object_get_arg;\n");
 }
 
 static void
@@ -688,34 +824,65 @@ add_inits(Class *c)
                        continue;
                m = (Method *)n;
                if(m->scope == INIT_METHOD) {
-                       print_method(out,"static ","\n"," ","",m);
-                       if(m->cbuf)
-                               fprintf(out,"{\n%s\n}\n\n",m->cbuf->str);
-                       else
-                               fprintf(out,"{\n\treturn;\n}\n\n");
+                       if(m->line_no>0)
+                               out_addline_infile(out,m->line_no);
+                       print_method(out,"static ","\n"," ","\n",m,FALSE);
+                       if(m->line_no>0)
+                               out_addline_outfile(out);
+                       out_printf(out,"{\n");
+                       if(privates>0) {
+                               out_printf(out,"\t%s->_priv = "
+                                          "g_new0 (%sPrivate,1);\n",
+                                          ((FuncArg *)m->args->data)->name,
+                                          typebase);
+                       }
                } else if(m->scope == CLASS_INIT_METHOD) {
-                       print_method(out,"static ","\n"," ","",m);
-                       fprintf(out,"{\n"
-                               "\tGtkObjectClass *gtk_object_class = "
-                               "(GtkObjectClass*) %s;\n",
-                               ((FuncArg *)m->args->data)->name);
-                       
-                       add_overrides(c, ((FuncArg *)m->args->data)->name);
+                       if(m->line_no>0)
+                               out_addline_infile(out,m->line_no);
+                       print_method(out,"static ","\n"," ","\n",m,FALSE);
+                       if(m->line_no>0)
+                               out_addline_outfile(out);
+                       out_printf(out,"{\n");
+                       if(signals>0 ||
+                          arguments>0)
+                               out_printf(out,
+                                          "\tGtkObjectClass *"
+                                          "gtk_object_class = "
+                                          "(GtkObjectClass*) %s;\n",
+                                          ((FuncArg *)m->args->data)->name);
+
+                       if(overrides>0)
+                               add_overrides(c,
+                                             ((FuncArg *)m->args->data)->name,
+                                             (signals>0 || arguments>0));
                        
-                       fprintf(out,"\n\tparent_class = "
-                               "gtk_type_class (%s_get_type ());\n",
-                               pfuncbase);
+                       out_printf(out,"\n\tparent_class = ");
+                       if(for_cpp)
+                               out_printf(out,"(%sClass *)",ptypebase);
+                       out_printf(out,"gtk_type_class (%s_get_type ());\n",
+                                  pfuncbase);
 
-                       add_signals(c);
+                       if(signals>0)
+                               add_signals(c);
 
                        set_def_handlers(c, ((FuncArg *)m->args->data)->name);
                        
-                       make_arguments(c);
-                       
-                       if(m->cbuf)
-                               fprintf(out," {\n%s\n }\n",m->cbuf->str);
-                       fprintf(out,"}\n");
+                       if(arguments>0)
+                               make_arguments(c);
+
+               } else
+                       continue;
+
+               if(m->cbuf) {
+                       out_printf(out," {\n");
+                       out_addline_infile(out,m->ccode_line);
+                       out_printf(out,"%s\n",m->cbuf->str);
+                       out_addline_outfile(out);
+                       out_printf(out," }\n",m->cbuf->str);
+               } else {
+                       out_printf(out,"return;\n");
                }
+               out_printf(out,"}\n");
        }
 }
 
@@ -723,13 +890,13 @@ static void
 add_getset_arg(Class *c, int is_set)
 {
        GList *li;
-       fprintf(out,"\nstatic void\n"
+       out_printf(out,"\nstatic void\n"
                "__object_%s_arg (GtkObject *object,\n"
                "\tGtkArg *arg,\n"
                "\tguint arg_id)\n"
                "{\n"
-               "\t%s *this;\n\n"
-               "\tthis = %s (object);\n\n"
+               "\t%s *self;\n\n"
+               "\tself = %s (object);\n\n"
                "\tswitch (arg_id) {\n",
                is_set?"set":"get",typebase,macrobase);
 
@@ -737,22 +904,34 @@ add_getset_arg(Class *c, int is_set)
                Node *n = li->data;
                Argument *a;
                char *s;
+               GString *cbuf;
+               int line_no;
                if(n->type != ARGUMENT_NODE)
                        continue;
                a = (Argument *)n;
-               if((is_set && !a->set) ||
-                  (!is_set && !a->get))
+               if(is_set) {
+                       cbuf = a->set;
+                       line_no = a->set_line;
+               } else {
+                       cbuf = a->get;
+                       line_no = a->get_line;
+               }
+               if(!cbuf)
                        continue;
                s = g_strdup(a->name);
                g_strup(s);
-               fprintf(out,"\tcase ARG_%s:\n"
+               out_printf(out,"\tcase ARG_%s:\n"
                        "#define ARG (GTK_VALUE_%s(*arg))\n"
-                       "\t\t{\n%s\n\t\t}\n\t\tbreak;\n"
-                       "#undef ARG\n",
-                       s,a->gtktype,a->set->str);
+                       "\t\t{\n",
+                       s,a->gtktype);
                g_free(s);
+               out_addline_infile(out,line_no);
+               out_printf(out,"%s\n",cbuf->str);
+               out_addline_outfile(out);
+               out_printf(out,"\t\t}\n\t\tbreak;\n"
+                       "#undef ARG\n");
        }
-       fprintf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
+       out_printf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
 }
 
 static void
@@ -767,43 +946,43 @@ print_checks(Method *m, FuncArg *fa)
                Check *ch = li->data;
                char *s;
                if(is_void)
-                       fprintf(out,"\tg_return_if_fail (");
+                       out_printf(out,"\tg_return_if_fail (");
                else
-                       fprintf(out,"\tg_return_val_if_fail (");
+                       out_printf(out,"\tg_return_val_if_fail (");
                switch(ch->chtype) {
                case NULL_CHECK:
-                       fprintf(out,"%s != NULL",fa->name);
+                       out_printf(out,"%s != NULL",fa->name);
                        break;
                case TYPE_CHECK:
-                       s = make_is_macro(fa->atype->name);
-                       fprintf(out,"%s (%s)",s,fa->name);
+                       s = make_pre_macro(fa->atype->name,"IS");
+                       out_printf(out,"%s (%s)",s,fa->name);
                        g_free(s);
                        break;
                case LT_CHECK:
-                       fprintf(out,"%s < %s",fa->name,ch->number);
+                       out_printf(out,"%s < %s",fa->name,ch->number);
                        break;
                case GT_CHECK:
-                       fprintf(out,"%s > %s",fa->name,ch->number);
+                       out_printf(out,"%s > %s",fa->name,ch->number);
                        break;
                case LE_CHECK:
-                       fprintf(out,"%s <= %s",fa->name,ch->number);
+                       out_printf(out,"%s <= %s",fa->name,ch->number);
                        break;
                case GE_CHECK:
-                       fprintf(out,"%s >= %s",fa->name,ch->number);
+                       out_printf(out,"%s >= %s",fa->name,ch->number);
                        break;
                case EQ_CHECK:
-                       fprintf(out,"%s == %s",fa->name,ch->number);
+                       out_printf(out,"%s == %s",fa->name,ch->number);
                        break;
                case NE_CHECK:
-                       fprintf(out,"%s != %s",fa->name,ch->number);
+                       out_printf(out,"%s != %s",fa->name,ch->number);
                        break;
                }
                if(is_void)
-                       fprintf(out,");\n");
+                       out_printf(out,");\n");
                else {
-                       fprintf(out,", (");
+                       out_printf(out,", (");
                        print_type(out,m->mtype);
-                       fprintf(out,")%s);\n",
+                       out_printf(out,")%s);\n",
                                m->onerror?m->onerror:"0");
                }
        }
@@ -821,133 +1000,458 @@ print_preconditions(Method *m)
        }
 }
 
+/* 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->scope == OVERRIDE_METHOD &&
+          strcmp(m->id,"destroy")==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);
+
+       }
+}
+
 static void
 print_method_body(Method *m, int pre)
 {
-       fprintf(out,"{\n");
-       if(pre) {
+       out_printf(out,"{\n");
+       if(pre)
                print_preconditions(m);
-               fprintf(out,"\t{\n");
-       }
+       put_in_gen_code(m);
 
-       fprintf(out,"\t\t%s\n",m->cbuf->str);
+       out_printf(out,"\t{\n");
 
-       if(pre)
-               fprintf(out,"\t}\n");
-       fprintf(out,"}\n");
+       out_addline_infile(out,m->ccode_line);
+       out_printf(out,"\t\t%s\n",m->cbuf->str);
+       out_addline_outfile(out);
+
+       out_printf(out,"\t}\n");
+       out_printf(out,"}\n");
 }
 
 static void
 put_method(Method *m)
 {
        char *s;
-       fprintf(out,"\n");
-       if(strcmp(m->id,"new")==0) {
-               fprintf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
-                       funcbase);
-       }
+       int private = FALSE;
+       out_printf(out,"\n");
        switch(m->scope) {
        case PUBLIC_SCOPE:
-               print_method(out,"","\n"," ","",m);
+               out_addline_infile(out,m->line_no);
+               print_method(out,"","\n"," ","\n",m,FALSE);
                print_method_body(m,TRUE);
                break;
        case PRIVATE_SCOPE:
-               print_method(out,"static ","\n"," ","",m);
+               out_addline_infile(out,m->line_no);
+               print_method(out,"static ","\n"," ","\n",m,FALSE);
                print_method_body(m,TRUE);
                break;
+       case PRIVATE_SIGNAL_FIRST_METHOD:
+       case PRIVATE_SIGNAL_LAST_METHOD:
+               private = TRUE;
        case SIGNAL_FIRST_METHOD:
        case SIGNAL_LAST_METHOD:
-               print_method(out,"","\n"," ","",m);
-               fprintf(out,"{\n");
+               out_addline_infile(out,m->line_no);
+               print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+               out_addline_outfile(out);
+               out_printf(out,"{\n");
                s = g_strdup(m->id);
                g_strup(s);
                if(strcmp(m->mtype->name,"void")==0 &&
                   m->mtype->stars==0) {
                        GList *li;
                        print_preconditions(m);
-                       fprintf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
-                               "\t\tobject_signals[%s_SIGNAL]",s);
+                       if(((FuncArg *)m->args->data)->name)
+                       out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (%s),\n"
+                               "\t\tobject_signals[%s_SIGNAL]",
+                               ((FuncArg *)m->args->data)->name,s);
                        for(li=m->args->next;li;li=g_list_next(li)) {
                                FuncArg *fa = li->data;
-                               fprintf(out,",\n\t\t%s",fa->name);
+                               out_printf(out,",\n\t\t%s",fa->name);
                        }
-                       fprintf(out,");\n}\n");
+                       out_printf(out,");\n}\n");
                } else {
                        GList *li;
-                       fprintf(out,"\t");
+                       out_printf(out,"\t");
                        print_type(out,m->mtype);
-                       fprintf(out,"return_val;\n");
+                       out_printf(out,"return_val;\n");
                        print_preconditions(m);
-                       fprintf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
-                               "\t\tobject_signals[%s_SIGNAL]",s);
+                       out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (%s),\n"
+                               "\t\tobject_signals[%s_SIGNAL]",
+                               ((FuncArg *)m->args->data)->name,s);
                        for(li=m->args->next;li;li=g_list_next(li)) {
                                FuncArg *fa = li->data;
-                               fprintf(out,",\n\t\t%s",fa->name);
+                               out_printf(out,",\n\t\t%s",fa->name);
                        }
-                       fprintf(out,",\n\t\t&return_val);\n"
+                       out_printf(out,",\n\t\t&return_val);\n"
                                "\treturn return_val;\n}\n");
                }
 
                if(!m->cbuf)
                        break;
-               print_method(out,"static ","\n_real_"," ","",m);
+               out_addline_infile(out,m->line_no);
+               print_method(out,"static ","\n_real_"," ","\n",m,FALSE);
                print_method_body(m,FALSE);
                break;
+       case PRIVATE_VIRTUAL_METHOD:
+               private = TRUE;
        case VIRTUAL_METHOD:
-               print_method(out,"","\n"," ","",m);
-               fprintf(out,"{\n"
-                       "\t%sClass *class;\n",typebase);
+               out_addline_infile(out,m->line_no);
+               print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+               out_addline_outfile(out);
+               out_printf(out,"{\n"
+                       "\t%sClass *klass;\n",typebase);
                print_preconditions(m);
-               fprintf(out,"\tclass = %s_CLASS(GTK_OBJECT(this)->klass);\n\n"
-                       "\tif(class->%s)\n",
-                       macrobase,m->id);
+               out_printf(out,"\tklass = %s_CLASS(GTK_OBJECT(%s)->klass);\n\n"
+                       "\tif(klass->%s)\n",
+                       macrobase, ((FuncArg *)m->args->data)->name, m->id);
                if(strcmp(m->mtype->name,"void")==0 &&
                   m->mtype->stars==0) {
                        GList *li;
-                       fprintf(out,"\t\t(*class->%s)(this",m->id);
+                       out_printf(out,"\t\t(*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;
-                               fprintf(out,",%s",fa->name);
+                               out_printf(out,",%s",fa->name);
                        }
-                       fprintf(out,");\n}\n");
+                       out_printf(out,");\n}\n");
                } else {
                        GList *li;
-                       fprintf(out,"\t\treturn (*class->%s)(this",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;
-                               fprintf(out,",%s",fa->name);
+                               out_printf(out,",%s",fa->name);
                        }
-                       fprintf(out,");\n"
+                       out_printf(out,");\n"
                                "\telse\n"
                                "\t\treturn (");
                        print_type(out,m->mtype);
-                       fprintf(out,")(%s);\n}\n",
+                       out_printf(out,")(%s);\n}\n",
                                m->onerror?m->onerror:"0");
                }
 
                if(!m->cbuf)
                        break;
-               print_method(out,"static ","\n_real_"," ","",m);
+               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:
-               print_method(out,"static ","\n"," ","",m);
+               out_addline_infile(out,m->line_no);
+               print_method(out,"static ","\n"," ","\n",m,FALSE);
+               s = replace_sep(m->otype,'_');
+               g_strup(s);
+               out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
+                          "\t{ if(%s_CLASS(parent_class)->%s) \\\n"
+                          "\t\t(* %s_CLASS(parent_class)->%s)(##args); }\n",
+                          s,m->id,s,m->id);
+               g_free(s);
                print_method_body(m,TRUE);
+               out_printf(out,"#undef PARENT_HANDLER\n");
                break;
        default:
                break;
        }
-       if(strcmp(m->id,"new")==0)
-               fprintf(out,"#undef GET_NEW\n");
 }
 
+static void
+check_duplicate(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;
+               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);
+       }
+}
+
+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);
+               }
+       }
+}
+
+static void
+check_bad_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;
+                       if((m->scope == SIGNAL_LAST_METHOD ||
+                           m->scope == SIGNAL_FIRST_METHOD ||
+                           m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                           m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+                           m->scope == VIRTUAL_METHOD ||
+                           m->scope == PRIVATE_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);
+                       }
+               }
+       }
+}
+
+
+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;
+               char *s;
+               if(n->type == METHOD_NODE) {
+                       Method *m = (Method *)n;
+                       if(m->scope == SIGNAL_LAST_METHOD ||
+                          m->scope == SIGNAL_FIRST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                          m->scope == PRIVATE_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)
+                       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);
+       }
+}
+
+static void
+check_duplicate_signals_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;
+                       if(m->scope == SIGNAL_LAST_METHOD ||
+                          m->scope == SIGNAL_FIRST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                          m->scope == PRIVATE_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);
+               }
+       }
+}
+
+static void
+check_public_new(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->scope!=PUBLIC_SCOPE &&
+                          strcmp(m->id,"new")==0)
+                               print_error(TRUE,
+                                           "'new' should be a public method",
+                                           m->line_no);
+               }
+       }
+}
+
+static void
+check_vararg(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->scope == OVERRIDE_METHOD ||
+                          m->scope == SIGNAL_LAST_METHOD ||
+                          m->scope == SIGNAL_FIRST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+                          m->scope == VIRTUAL_METHOD ||
+                          m->scope == PRIVATE_VIRTUAL_METHOD) {
+                               print_error(FALSE,
+                                           "signals, overrides and virtuals, "
+                                           "can't have variable argument "
+                                           "lists",
+                                           m->line_no);
+                       }
+               }
+       }
+}
+
+static void
+check_firstarg(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->args)
+                               continue;
+                       if(m->scope == OVERRIDE_METHOD ||
+                          m->scope == SIGNAL_LAST_METHOD ||
+                          m->scope == SIGNAL_FIRST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+                          m->scope == VIRTUAL_METHOD ||
+                          m->scope == PRIVATE_VIRTUAL_METHOD) {
+                               print_error(FALSE,
+                                           "signals, overrides and virtuals, "
+                                           "can't have no arguments",
+                                           m->line_no);
+                       }
+               }
+       }
+}
+
+static int
+count_signals(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->scope == SIGNAL_LAST_METHOD ||
+                          m->scope == SIGNAL_FIRST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+                          m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+                               num++;
+               }
+       }
+       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 ++;
+       }
+       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->scope == OVERRIDE_METHOD)
+                               num++;
+               }
+       }
+       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++;
+               }
+       }
+       return num;
+}
+
+
 static void
 open_files(void)
 {
        char *outfile,*outfileh;
 
-       outfile = g_strconcat(filebase,".c",NULL);
-       outfileh = g_strconcat(filebase,".h",NULL);
+       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);
        
        out = fopen(outfile,"w");
        if(!out) {
@@ -967,81 +1471,111 @@ generate_outfiles(void)
        time_t curtime;
 
        time(&curtime);
-       fprintf(outh,"/* Generated by GOB (v%s) on %s"
-              "   (do not edit directly) */\n\n",VERSION,ctime(&curtime));
-       fprintf(out,"/* Generated by GOB (v%s) on %s"
+       out_printf(outh,"/* 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));
        
        p = replace_sep(((Class *)class)->otype,'_');
        g_strup(p);
-       fprintf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
+       out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
                "#include <gtk/gtk.h>\n\n",p,p);
        g_free(p);
 
-       fprintf(outh,"#ifdef __cplusplus\n"
-               "extern \"C\" {\n"
-               "#endif /* __cplusplus */\n\n");
-       
-       fprintf(out,"#include \"%s.h\"\n\n",filebase);
+       if(!for_cpp)
+               out_printf(outh,"#ifdef __cplusplus\n"
+                          "extern \"C\" {\n"
+                          "#endif /* __cplusplus */\n\n");
        
+       p = g_strconcat(filebase,".h",NULL);
+       if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp))
+               out_printf(out,"#include \"%s.h\"\n\n",filebase);
+       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)
+                       if(cc->header) {
                                fp = outh;
-                       else
+                               out_printf(fp,"\n");
+                       } else {
                                fp = out;
-                       fprintf(fp,"\n%s\n",cc->cbuf->str);
+                               out_printf(fp,"\n");
+                               out_addline_infile(fp,cc->line_no);
+                       }
+                       out_printf(fp,"%s\n",cc->cbuf->str);
+                       if(!cc->header)
+                               out_addline_outfile(fp);
                } else if(node->type == CLASS_NODE) {
-                       GList *l;
                        Class *c = (Class *)class;
-                       char *otype,*ptype;
-                       
-                       fprintf(outh,"\n#define %s(obj)\t"
+                       GList *l;
+
+                       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);
-                       fprintf(outh,"#define %s_CLASS(klass)\t"
+                       out_printf(outh,"#define %s_CLASS(klass)\t"
                                "GTK_CHECK_CLASS_CAST((klass),%s_get_type(),%sClass)\n",
                                macrobase,funcbase,typebase);
-                       fprintf(outh,"#define %s(obj)\t"
+                       out_printf(outh,"#define %s(obj)\t"
                                "GTK_CHECK_TYPE((obj), %s_get_type ())\n\n",
                                macrois,funcbase);
 
-                       otype = remove_sep(c->otype);
-                       ptype = remove_sep(c->ptype);
-                       fprintf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
-                       fprintf(outh,"struct _%s {\n\t%s __parent__;\n",
-                               otype,ptype);
+                       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;
                                if(n->type == VARIABLE_NODE)
-                                       put_variable((Variable *)n);
+                                       put_variable((Variable *)n,outh,FALSE);
+                       }
+                       if(privates>0)
+                               out_printf(outh,"\t%sPrivate *_priv;\n",typebase);
+                       out_printf(outh,"};\n");
+
+                       if(privates>0) {
+                               out_printf(out,"struct _%sPrivate {\n",
+                                          typebase);
+                               for(l=c->nodes;l;l=l->next) {
+                                       Node *n = l->data;
+                                       if(n->type == VARIABLE_NODE) {
+                                               Variable *v = (Variable *)n;
+                                               out_addline_infile(out,v->line_no);
+                                               put_variable(v,out,TRUE);
+                                       }
+                               }
+                               out_addline_outfile(out);
+                               out_printf(out,"};\n");
                        }
-                       fprintf(outh,"};\n");
 
-                       fprintf(outh,"\ntypedef struct _%sClass %sClass;\n",
-                               otype,otype);
-                       fprintf(outh,
+                       out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
+                               typebase,typebase);
+                       out_printf(outh,
                                "struct _%sClass {\n\t%sClass __parent__;\n",
-                               otype,ptype);
+                               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);
                        }
-                       fprintf(outh,"};\n\n");
+                       out_printf(outh,"};\n\n");
 
-                       fprintf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
+                       out_printf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
                        
-                       if(is_arguments(c)) {
-                               fprintf(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");
+                       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");
                        }
 
                        for(l=c->nodes;l;l=g_list_next(l)) {
@@ -1052,10 +1586,12 @@ generate_outfiles(void)
                                }
                        }
 
-                       for(l=c->nodes;l;l=g_list_next(l)) {
-                               Node *n = l->data;
-                               if(n->type == METHOD_NODE) {
-                                       add_signal_prots((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);
+                                       }
                                }
                        }
                        
@@ -1063,11 +1599,14 @@ generate_outfiles(void)
                        
                        add_get_type();
 
-                       def_methods(c);
-                       
+                       make_method_pointers(c);
+
+                       out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
+                                  funcbase);
+
                        add_inits(c);
 
-                       if(is_arguments(c)) {
+                       if(arguments>0) {
                                add_getset_arg(c, TRUE);
                                add_getset_arg(c, FALSE);
                        }
@@ -1079,20 +1618,21 @@ generate_outfiles(void)
                                }
                        }
 
-                       undef_methods(c);
+                       out_printf(out,"#undef GET_NEW\n");
 
-                       g_free(otype);
-                       g_free(ptype);
+                       add_bad_hack_to_avoid_unused_warnings(c);
                } else
                        g_assert_not_reached();
        }
 
-       fprintf(outh,"\n#ifdef __cplusplus\n"
-               "}\n"
-               "#endif /* __cplusplus */\n\n"
-               "#endif");
+       if(!for_cpp)
+               out_printf(outh,"\n#ifdef __cplusplus\n"
+                          "}\n"
+                          "#endif /* __cplusplus */\n");
+       out_printf(outh,"\n#endif");
 }
 
+#if 0
 static void
 usage(poptContext optCon, int exitcode, char *error, char *addl)
 {
@@ -1100,11 +1640,114 @@ usage(poptContext optCon, int exitcode, char *error, char *addl)
        if (error) fprintf(stderr, "%s: %s", error, addl);
        exit(exitcode);
 }
+#endif
+
+static void
+print_help(void)
+{
+       fprintf(stderr,"Gob version %s\n\n",VERSION);
+       fprintf(stderr,"Options:\n"
+               "\t--help,-h,-?         Display this help\n"
+               "\t--exit-on-warn,-w    Exit with an error on warnings\n"
+               "\t--no-exit-on-warn    Don't exit on warnings [default]\n"
+               "\t--for-cpp            Create C++ files\n"
+               "\t--no-touch-headers   Don't touch headers unless they "
+                                      "really changed\n");
+}
+
+static void
+parse_options(int argc, char *argv[])
+{
+       int i;
+       int got_file = FALSE;
+       int no_opts = FALSE;
+
+       filename = NULL;
+
+       for(i=1;i<argc;i++) {
+               if(no_opts || argv[i][0]!='-') {
+                       /*must be a file*/
+                       if(got_file) {
+                               fprintf(stderr,"Specify only one file!\n");
+                               print_help();
+                               exit(1);
+                       }
+                       filename = argv[i];
+                       got_file = TRUE;
+               } else if(strcmp(argv[i],"--help")==0) {
+                       print_help();
+                       exit(0);
+               } else if(strcmp(argv[i],"--exit-on-warn")==0) {
+                       exit_on_warn = TRUE;
+               } else if(strcmp(argv[i],"--no-exit-on-warn")==0) {
+                       exit_on_warn = FALSE;
+               } else if(strcmp(argv[i],"--for-cpp")==0) {
+                       for_cpp = TRUE;
+               } else if(strcmp(argv[i],"--no-touch-headers")==0) {
+                       no_touch_headers = TRUE;
+               } else if(strcmp(argv[i],"--")==0) {
+                       /*further arguments are files*/
+                       no_opts = TRUE;
+               } else if(strncmp(argv[i],"--",2)==0) {
+                       /*unknown long option*/
+                       fprintf(stderr,"Unknown option '%s'!\n",argv[i]);
+                       print_help();
+                       exit(1);
+               } else {
+                       /*by now we know we have a string starting with
+                         - which is a short option string*/
+                       char *p = argv[i]+1;
+                       for(p=argv[i]+1;*p;p++) {
+                               switch(*p) {
+                               case 'w':
+                                       exit_on_warn=TRUE;
+                                       break;
+                               case 'h':
+                               case '?':
+                                       print_help();
+                                       exit(0);
+                               default:
+                                       fprintf(stderr,
+                                               "Unknown option '%c'!\n",*p);
+                                       print_help();
+                                       exit(1);
+                               }
+                       }
+               }
+       }
+}
 
+static void
+compare_and_move_header(void)
+{
+       char *hfnew = g_strconcat("#gob#",filebase,".h#gob#",NULL);
+       char *hf = g_strconcat(filebase,".h",NULL);
+       struct stat s;
+       if(stat(hf,&s)==0) {
+               char *s;
+               s = g_strdup_printf("cmp '%s' '%s' > /dev/null",hf,hfnew);
+               if(system(s)==0) {
+                       if(unlink(hfnew)!=0)
+                               print_error(FALSE,"Can't remove new header file",0);
+                       g_free(hfnew);
+                       g_free(hf);
+                       g_free(s);
+                       return;
+               }
+               g_free(s);
+               if(unlink(hf)!=0)
+                       print_error(FALSE,"Can't remove old header file",0);
+       }
+       if(rename(hfnew,hf)!=0)
+               print_error(FALSE,"Can't rename new header file",0);
+       g_free(hfnew);
+       g_free(hf);
+}
 
 int
 main(int argc, char *argv[])
 {
+#if 0
        int c;
        poptContext optCon;
        
@@ -1133,6 +1776,9 @@ main(int argc, char *argv[])
                        poptStrerror(c));
                return 1;
        }
+#endif
+
+       parse_options(argc,argv);
        
        if(filename) {
                yyin = fopen(filename,"r");
@@ -1150,17 +1796,42 @@ main(int argc, char *argv[])
        if(!class)
                print_error(FALSE," no class defined",0);
        
+
+       exit_on_error = FALSE;
+
+       signals = count_signals((Class *)class);
+       arguments = count_arguments((Class *)class);
+       overrides = count_overrides((Class *)class);
+       privates = count_privates((Class *)class);
+
        make_bases();
-       
        make_inits((Class *)class);
+       if(privates>0)
+               make_destroy((Class *)class);
+       check_bad_symbols((Class *)class);
+       check_duplicate_symbols((Class *)class);
+       check_duplicate_signals_args((Class *)class);
+       check_public_new((Class *)class);
+       check_vararg((Class *)class);
+       check_firstarg((Class *)class);
+
+       exit_on_error = TRUE;
        
+       if(got_error)
+               exit(1);
+
        open_files();
        
        generate_outfiles();
 
        fclose(out);
        fclose(outh);
+
+       if(no_touch_headers)
+               compare_and_move_header();
        
+#if 0
        poptFreeContext(optCon);
+#endif
        return 0;
 }