X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6d0fe9d5f8c513045bf064ea256c822beac19037..e10d6e307623d0952f6e1f5d9fee8720ddab4808:/src/main.c

diff --git a/src/main.c b/src/main.c
index 751c064..d86697d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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;
@@ -57,8 +57,9 @@ static char *ptypebase;
 
 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 overrides = 0; /* number of override methods */
 static int privates = 0; /* number of private data members */
+static int protecteds = 0; /* number of protected methods */
 
 static gboolean made_aliases = FALSE;  /* if we made any shorthand aliases
 					  and need the REALLY UGLY HACK to
@@ -70,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)
@@ -188,31 +102,50 @@ 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;
 		/*XXX: this is ugly perhaps we can do this whole postfix thing
-		  in a nicer way, we just count the number of '[' s and from that
-		  we deduce the number of dimensions */
+		  in a nicer way, we just count the number of '[' s and from
+		  that we deduce the number of dimensions, so that we can print
+		  that many stars */
 		for(p=t->postfix; p && *p; p++)
 			if(*p == '[') extra++;
 	}
+	g_string_append_c(gs,' ');
 	
 	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,
@@ -252,19 +185,47 @@ 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) {
 			Method *m = (Method *)node;
 			
-			if(m->scope == INIT_METHOD ||
-			   m->scope == CLASS_INIT_METHOD ||
-			   m->scope == OVERRIDE_METHOD)
+			if(m->method == INIT_METHOD ||
+			   m->method == CLASS_INIT_METHOD ||
+			   m->method == OVERRIDE_METHOD)
 				continue;
 
 			/* in C++ mode don't alias new */
@@ -277,7 +238,6 @@ make_method_pointers(Class *c)
 			made_aliases = TRUE;
 		}
 	}
-	out_printf(out,"\n");
 }
 
 static void
@@ -289,23 +249,25 @@ 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, 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"
+		   "  some method.  I need to find a better way to do\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;
 		if(node->type == METHOD_NODE) {
 			Method *m = (Method *)node;
 			
-			if(m->scope == INIT_METHOD ||
-			   m->scope == CLASS_INIT_METHOD ||
-			   m->scope == OVERRIDE_METHOD)
+			if(m->method == INIT_METHOD ||
+			   m->method == CLASS_INIT_METHOD ||
+			   m->method == OVERRIDE_METHOD)
 				continue;
 
 			/* in C++ mode we don't alias new */
@@ -315,7 +277,12 @@ add_bad_hack_to_avoid_unused_warnings(Class *c)
 			out_printf(out,"\t((void (*)(void))%s)();\n",m->id);
 		}
 	}
-	out_printf(out,"}\n\n");
+	out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n",
+		   funcbase);
+	if(!no_gnu)
+		out_printf(out,"}\n#endif /* __GNUC__ */\n\n");
+	else
+		out_printf(out,"}\n\n");
 }
 
 static void
@@ -323,20 +290,20 @@ put_variable(Variable *v, FILE *fp)
 {
 	out_printf(fp,"\t");
 	print_type(fp,v->vtype,FALSE);
-	out_printf(fp,"%s%s;\n",v->id,
+	out_printf(fp,"%s%s;",v->id,
 		   v->vtype->postfix?
 		   v->vtype->postfix:""); 
+	if(v->scope == PROTECTED_SCOPE)
+		out_printf(fp," /* protected */");
+	out_printf(fp,"\n");
 }
 
 static void
 put_vs_method(Method *m)
 {
-	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)
+	if(m->method != SIGNAL_LAST_METHOD &&
+	   m->method != SIGNAL_FIRST_METHOD &&
+	   m->method != VIRTUAL_METHOD)
 		return;
 
 	print_method(outh,"\t","(* ",") ",";\n",m,TRUE);
@@ -345,39 +312,42 @@ put_vs_method(Method *m)
 static void
 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 == PRIVATE_SIGNAL_LAST_METHOD ||
-	   m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
-	   m->scope == PRIVATE_VIRTUAL_METHOD)
+	if(m->scope != PUBLIC_SCOPE)
 		return;
 
 	print_method(outh,"","\t","\t",";\n",m,FALSE);
 }
 
 static void
-put_priv_method_prot(Method *m)
+put_prot_method(Method *m)
 {
-	if(m->scope == PUBLIC_SCOPE)
+	if(m->scope != PROTECTED_SCOPE)
 		return;
 
-	if(m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
-	   m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
-	   m->scope == PRIVATE_VIRTUAL_METHOD) {
-		if(m->cbuf && *m->cbuf->str)
-			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 || !*m->cbuf->str)
-			return;
-		print_method(out,"static ","_real_"," ",";\n",m,FALSE);
-	} else {
-		print_method(out,"static ",""," ",";\n",m,FALSE);
+	if(outph)
+		print_method(outph,"","\t","\t",";\n",m,FALSE);
+	else
+		print_method(out,"","\t","\t",";\n",m,FALSE);
+}
+
+static void
+put_priv_method_prot(Method *m)
+{
+	if(m->method == SIGNAL_LAST_METHOD ||
+	   m->method == SIGNAL_FIRST_METHOD ||
+	   m->method == VIRTUAL_METHOD) {
+		if(m->cbuf)
+			print_method(out,"static ","___real_"," ",";\n",m,FALSE);
 	}
+
+	if(m->scope == PRIVATE_SCOPE ||
+	   m->method == INIT_METHOD ||
+	   m->method == CLASS_INIT_METHOD ||
+	   (m->method == OVERRIDE_METHOD &&
+	    m->cbuf))
+		print_method(out,"static ",""," ",
+			     no_gnu?";\n":" ___NO_UNUSED_WARNING;\n"
+			     ,m,FALSE);
 }
 
 static GList *
@@ -408,11 +378,11 @@ make_inits(Class *cl)
 		Node *n = li->data;
 		if(n->type == METHOD_NODE) {
 			Method *m = (Method *)n;
-			if(m->scope == INIT_METHOD) {
+			if(m->method == INIT_METHOD) {
 				if(got_init)
 					print_error(FALSE,"init defined more then once",m->line_no);
 				got_init = TRUE;
-			} else if(m->scope == CLASS_INIT_METHOD) {
+			} else if(m->method == CLASS_INIT_METHOD) {
 				if(got_class_init)
 					print_error(FALSE,"class_init defined more then once",m->line_no);
 				got_class_init = TRUE;
@@ -420,7 +390,7 @@ make_inits(Class *cl)
 		}
 	}
 	if(!got_class_init) {
-		node = new_method(CLASS_INIT_METHOD,
+		node = new_method(NO_SCOPE, CLASS_INIT_METHOD,
 				  (Type *)new_type(0,g_strdup("void"),NULL),
 				  NULL,NULL,g_strdup("class_init"),
 				  make_func_arg(cl->otype,TRUE,g_strdup("c")),
@@ -428,7 +398,7 @@ make_inits(Class *cl)
 		cl->nodes = g_list_prepend(cl->nodes,node);
 	}
 	if(!got_init) {
-		node = new_method(INIT_METHOD,
+		node = new_method(NO_SCOPE, INIT_METHOD,
 				  (Type *)new_type(0,g_strdup("void"),NULL),
 				  NULL,NULL,g_strdup("init"),
 				  make_func_arg(cl->otype,FALSE,g_strdup("o")),
@@ -438,22 +408,22 @@ 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)) {
 		Node *n = li->data;
 		if(n->type == METHOD_NODE) {
 			Method *m = (Method *)n;
-			if(m->scope == OVERRIDE_METHOD &&
-			   strcmp(m->id,"destroy")==0) {
+			if(m->method == OVERRIDE_METHOD &&
+			   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);
 				}
@@ -461,33 +431,89 @@ make_destroy(Class *cl)
 			}
 		}
 	}
-	if(!got_destroy) {
-		node = new_method(OVERRIDE_METHOD,
+	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_string_new("PARENT_HANDLER (o);\n"),
+				  g_strdup("PARENT_HANDLER (o);\n"),
 				  0,0,FALSE);
 		cl->nodes = g_list_append(cl->nodes,node);
 		overrides++;
 	}
 }
 
+
+/* hash of method -> name of signal prototype */
 static GHashTable *marsh = NULL;
 
+/* list of methods with different signal prototypes,
+   we check this list if we can use a signal prototype of a
+   previous signal method, there are only uniques here */
+static GList *eq_signal_methods = NULL;
+
+/* compare a list of strings */
+static gboolean
+is_list_equal(GList *a, GList *b)
+{
+	for(;a && b; a=a->next, b=b->next) {
+		if(strcmp(a->data,b->data)!=0) {
+			return FALSE;
+		}
+	}
+	/* the the lists were different length */
+	if(a || b)
+		return FALSE;
+	return TRUE;
+}
+
+static Method *
+find_same_type_signal(Method *m)
+{
+	GList *li;
+	for(li=eq_signal_methods;li;li=li->next) {
+		Method *mm = li->data;
+		if(is_list_equal(mm->gtktypes,m->gtktypes))
+			return mm;
+	}
+	return NULL;
+}
+
+static void
+print_signal_marsal_args(Method *m)
+{
+	if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
+		GList *li;
+		int i;
+		for(i=0,li=m->gtktypes->next;li;
+		    i++,li=g_list_next(li)) {
+			if(!for_cpp)
+				out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+					   (char *)li->data,i);
+			else {
+				out_printf(out, ",\n\t\t(%s)"
+					   "GTK_VALUE_%s(args[%d])",
+					   get_cast(li->data,FALSE),
+					   (char *)li->data,i);
+			}
+		}
+	}
+	out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
+}
+
+
 static void
 add_signal_prots(Method *m)
 {
 	GList *li;
 	static int sig = 1;
 	char *s;
+	Method *mm;
 	
-	if(m->scope != SIGNAL_LAST_METHOD &&
-	   m->scope != SIGNAL_FIRST_METHOD &&
-	   m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
-	   m->scope != PRIVATE_SIGNAL_FIRST_METHOD)
+	if(m->method != SIGNAL_LAST_METHOD &&
+	   m->method != SIGNAL_FIRST_METHOD)
 		return;
 
 	if(!marsh)
@@ -496,84 +522,50 @@ add_signal_prots(Method *m)
 	if(strcmp(m->gtktypes->data,"NONE")==0 &&
 	   strcmp(m->gtktypes->next->data,"NONE")==0)
 		return;
+
+	/* if we already did a signal prototype just use that */
+	mm = find_same_type_signal(m);
+	if(mm) {
+		s = g_hash_table_lookup(marsh,mm);
+		g_hash_table_insert(marsh,m,s);
+		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);
 	
-	out_printf(out,"\ntypedef ");
-	print_type(out,m->mtype,TRUE);
-	
-	out_printf(out,"(*%s) (",s);
+	/* we know that we'll know all the gtktypes (so get_cast can't fail) */
+	out_printf(out,"\ntypedef %s (*___%s) (%s *, ",
+		   get_cast(m->gtktypes->data,FALSE),s, typebase);
 	
-	for(li=m->args;li;li=g_list_next(li)) {
-		FuncArg *arg = li->data;
-		print_type(out,arg->atype,TRUE);
-		out_printf(out,", ");
-	}
+	for(li=m->gtktypes->next;li;li=g_list_next(li))
+		out_printf(out,"%s, ",get_cast(li->data,FALSE));
 	out_printf(out,"gpointer);\n"); 
 	
 	out_printf(out,"\nstatic void\n"
-		"marshal_%s (GtkObject * object,\n"
+		"___marshal_%s (GtkObject * object,\n"
 		"\tGtkSignalFunc func,\n"
 		"\tgpointer func_data,\n"
 		"\tGtkArg * args)\n"
 		"{\n",s);
 	
 	if(strcmp(m->gtktypes->data,"NONE")==0) {
-		int i;
-		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);
-		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)) {
-				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,TRUE);
-					out_printf(out, ")GTK_VALUE_%s(args[%d])",
-						   (char *)li->data,i);
-				}
-
-				if(ali) ali = ali->next;
-			}
-		}
-		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
 	} else {
-		int i;
-		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,
 			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)) {
-				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,TRUE);
-					out_printf(out, ")GTK_VALUE_%s(args[%d])",
-						   (char *)li->data,i);
-				}
-
-				if(ali) ali = ali->next;
-			}
-		}
-		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
 	}
+	print_signal_marsal_args(m);
 
 }
 
@@ -588,10 +580,8 @@ add_enums(Class *c)
 			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) {
+				if(m->method == SIGNAL_LAST_METHOD ||
+				   m->method == SIGNAL_FIRST_METHOD) {
 					char *s = g_strdup(m->id);
 					g_strup(s);
 					out_printf(out,"\t%s_SIGNAL,\n",s);
@@ -664,11 +654,10 @@ add_overrides(Class *c, char *oname, gboolean did_gtk_obj)
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		char *f;
-		Method *m;
+		Method *m = (Method *)n;
 		if(n->type != METHOD_NODE ||
-		   ((Method *)n)->scope != OVERRIDE_METHOD)
+		   m->method != OVERRIDE_METHOD)
 			continue;
-		m = (Method *)n;
 		
 		s = remove_sep(m->otype);
 		
@@ -698,28 +687,24 @@ add_signals(Class *c)
 	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;
+		Method *m = (Method *)n;
 		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))
+		   (m->method != SIGNAL_FIRST_METHOD &&
+		    m->method != SIGNAL_LAST_METHOD))
 			continue;
 
-		m = (Method *)n;
 		
-		if(m->scope == SIGNAL_FIRST_METHOD ||
-		   m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+		if(m->method == SIGNAL_FIRST_METHOD)
 			last = FALSE;
 		else
 			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
@@ -764,28 +749,28 @@ set_def_handlers(Class *c, char *oname)
 	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
-		Method *m;
+		Method *m = (Method *)n;
 		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))
+		   (m->method != SIGNAL_FIRST_METHOD &&
+		    m->method != SIGNAL_LAST_METHOD &&
+		    m->method != VIRTUAL_METHOD &&
+		    m->method != OVERRIDE_METHOD))
 			continue;
 
-		m = (Method *)n;
 
-		if(m->scope == OVERRIDE_METHOD) {
+		if(m->method == OVERRIDE_METHOD) {
 			char *s;
 			s = replace_sep(m->otype,'_');
 			g_strdown(s);
-			out_printf(out,"\t%s_class->%s = %s_%s;\n",
-				s,m->id,funcbase,m->id);
+			if(m->cbuf)
+				out_printf(out,"\t%s_class->%s = %s_%s;\n",
+					   s,m->id,funcbase,m->id);
+			else
+				out_printf(out,"\t%s_class->%s = NULL;\n",
+					   s,m->id);
 		} else {
-			if(m->cbuf && *m->cbuf->str)
-				out_printf(out,"\t%s->%s = _real_%s_%s;\n",
+			if(m->cbuf)
+				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",
@@ -798,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)) {
@@ -818,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);
@@ -833,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
@@ -847,7 +863,7 @@ add_inits(Class *c)
 		if(n->type != METHOD_NODE)
 			continue;
 		m = (Method *)n;
-		if(m->scope == INIT_METHOD) {
+		if(m->method == INIT_METHOD) {
 			if(m->line_no>0)
 				out_addline_infile(out,m->line_no);
 			print_method(out,"static ","\n"," ","\n",m,FALSE);
@@ -860,7 +876,7 @@ add_inits(Class *c)
 					   ((FuncArg *)m->args->data)->name,
 					   typebase);
 			}
-		} else if(m->scope == CLASS_INIT_METHOD) {
+		} else if(m->method == CLASS_INIT_METHOD) {
 			if(m->line_no>0)
 				out_addline_infile(out,m->line_no);
 			print_method(out,"static ","\n"," ","\n",m,FALSE);
@@ -897,12 +913,12 @@ add_inits(Class *c)
 		} else
 			continue;
 
-		if(m->cbuf && *m->cbuf->str) {
+		if(m->cbuf) {
 			out_printf(out," {\n");
 			out_addline_infile(out,m->ccode_line);
-			out_printf(out,"%s\n",m->cbuf->str);
+			out_printf(out,"%s\n",m->cbuf);
 			out_addline_outfile(out);
-			out_printf(out," }\n",m->cbuf->str);
+			out_printf(out," }\n");
 		} else {
 			out_printf(out,"return;\n");
 		}
@@ -915,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"
@@ -928,7 +944,7 @@ add_getset_arg(Class *c, int is_set)
 		Node *n = li->data;
 		Argument *a;
 		char *s;
-		GString *cbuf;
+		char *cbuf;
 		int line_no;
 		if(n->type != ARGUMENT_NODE)
 			continue;
@@ -950,7 +966,7 @@ add_getset_arg(Class *c, int is_set)
 			s,a->gtktype);
 		g_free(s);
 		out_addline_infile(out,line_no);
-		out_printf(out,"%s\n",cbuf->str);
+		out_printf(out,"%s\n",cbuf);
 		out_addline_outfile(out);
 		out_printf(out,"\t\t}\n\t\tbreak;\n"
 			"#undef ARG\n");
@@ -962,13 +978,17 @@ static void
 print_checks(Method *m, FuncArg *fa)
 {
 	GList *li;
-	int is_void;
+	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
@@ -976,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:
@@ -1022,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 */
@@ -1030,15 +1058,14 @@ 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) {
+	   m->method == OVERRIDE_METHOD &&
+	   strcmp(m->id,"finalize")==0) {
 		out_printf(out,"\tg_free (%s (%s)->_priv);\n"
 			   "\t%s (%s)->_priv = NULL;\n",
 			   macrobase,
 			   ((FuncArg *)m->args->data)->name,
 			   macrobase,
 			   ((FuncArg *)m->args->data)->name);
-
 	}
 }
 
@@ -1048,64 +1075,103 @@ print_method_body(Method *m, int pre)
 	out_printf(out,"{\n");
 	if(pre)
 		print_preconditions(m);
-	put_in_gen_code(m);
 
-	out_printf(out,"\t{\n");
+	put_in_gen_code(m);
 
-	out_addline_infile(out,m->ccode_line);
-	out_printf(out,"\t\t%s\n",m->cbuf->str);
-	out_addline_outfile(out);
+	/* Note: the trailing }'s are on one line, this is so
+	   that we get the no return warning correctly and point to
+	   the correct line in the .gob file, yes this is slightly
+	   ugly in the .c file, but that is not supposed to be
+	   human readable anyway. */
+	if(m->cbuf) {
+		out_printf(out,"{\n");
+		if(m->ccode_line>0)
+			out_addline_infile(out,m->ccode_line);
+		out_printf(out,"\t%s}",m->cbuf);
+	}
 
-	out_printf(out,"\t}\n");
 	out_printf(out,"}\n");
+
+	if(m->cbuf)
+		out_addline_outfile(out);
+}
+
+static void
+put_signal_args(Method *m)
+{
+	GList *li;
+	GList *ali;
+	for(ali = m->gtktypes->next,li=m->args->next;
+	    li && ali;
+	    li=li->next, ali=ali->next) {
+		FuncArg *fa = li->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);
+
+		out_printf(out,",\n\t\t(%s)%s",cast,
+			   fa->name);
+	}
+}
+
+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;
-	int private = FALSE;
-	int is_void;
+	char *s,*args;
+	gboolean is_void;
 	is_void = (strcmp(m->mtype->name,"void")==0 &&
 		   m->mtype->stars == 0);
 	out_printf(out,"\n");
-	switch(m->scope) {
-	case PUBLIC_SCOPE:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"","\n"," ","\n",m,FALSE);
-		print_method_body(m,TRUE);
-		break;
-	case PRIVATE_SCOPE:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"static ","\n"," ","\n",m,FALSE);
+	switch(m->method) {
+	case REGULAR_METHOD:
+		if(m->line_no>0)
+			out_addline_infile(out,m->line_no);
+		if(m->scope == PRIVATE_SCOPE)
+			print_method(out,"static ","\n"," ","\n",m,FALSE);
+		else /* PUBLIC, PROTECTED */
+			print_method(out,"","\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:
-		out_addline_infile(out,m->line_no);
-		print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+		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
+			print_method(out,"","\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);
 			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;
-				out_printf(out,",\n\t\t%s",fa->name);
-			}
+			put_signal_args(m);
 			out_printf(out,");\n}\n");
 		} else {
-			GList *li;
 			out_printf(out,"\t");
 			print_type(out,m->mtype,TRUE);
 			out_printf(out,"return_val;\n");
@@ -1113,25 +1179,25 @@ put_method(Method *m)
 			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;
-				out_printf(out,",\n\t\t%s",fa->name);
-			}
+			put_signal_args(m);
 			out_printf(out,",\n\t\t&return_val);\n"
 				"\treturn return_val;\n}\n");
 		}
 
-		if(!m->cbuf || !*m->cbuf->str)
+		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 PRIVATE_VIRTUAL_METHOD:
-		private = TRUE;
 	case VIRTUAL_METHOD:
-		out_addline_infile(out,m->line_no);
-		print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+		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
+			print_method(out,"","\n"," ","\n",m,FALSE);
 		out_addline_outfile(out);
 		out_printf(out,"{\n"
 			"\t%sClass *klass;\n",typebase);
@@ -1165,33 +1231,39 @@ put_method(Method *m)
 				m->onerror?m->onerror:"0");
 		}
 
-		if(!m->cbuf || !*m->cbuf->str)
+		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:
-		out_addline_infile(out,m->line_no);
+		if(!m->cbuf)
+			break;
+		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");
@@ -1202,327 +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;
+
+	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_duplicate_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;
-			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);
+	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\",(%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_bad_symbols(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->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);
-			}
-		}
-	}
-}
+	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->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)
+		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\",({%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_duplicate_signals_args(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(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);
-		}
+	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_public_new(Class *c)
+print_class_block(Class *c)
 {
 	GList *l;
+	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);
+	}
+
+	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->scope!=PUBLIC_SCOPE &&
-			   strcmp(m->id,"new")==0)
-				print_error(TRUE,
-					    "'new' should be a public method",
-					    m->line_no);
-		}
+		Variable *v = (Variable *)n;
+		if(n->type == VARIABLE_NODE &&
+		   v->scope == PUBLIC_SCOPE)
+			put_variable((Variable *)n,outh);
 	}
-}
-
-static void
-check_vararg(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->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);
+		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");
 	}
-}
 
-static void
-check_firstarg(Class *c)
-{
-	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->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);
-			}
-		}
+		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);
+
+	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");
 	}
-}
 
-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++;
+			put_pub_method((Method *)n);
+			put_prot_method((Method *)n);
+			put_priv_method_prot((Method *)n);
 		}
 	}
-	return num;
-}
 
-static int
-count_arguments(Class *c)
-{
-	int num = 0;
-	GList *li;
+	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);
+		}
+	}
 
-	for(li=c->nodes;li;li=g_list_next(li)) {
-		Node *n = li->data;
-		if(n->type == ARGUMENT_NODE)
-			num ++;
+	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");
 	}
-	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++;
-		}
+	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);
 	}
-	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(n->type == METHOD_NODE) {
+			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;
+	int major=0,minor=0,pl=0;
+	sscanf(VERSION,"%d.%d.%d",&major,&minor,&pl);
 
-	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 || 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);
-		}
-	}
+	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);
@@ -1531,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)) {
@@ -1579,160 +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->str);
-			if(!cc->header)
-				out_addline_outfile(fp);
-		} else if(node->type == CLASS_NODE) {
-			Class *c = (Class *)class;
-			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);
-			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);
-			}
-			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, otherwise 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");
-			}
-
-			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_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");
@@ -1740,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)
@@ -1756,16 +1775,22 @@ print_help(void)
 	fprintf(stderr,"Gob version %s\n\n",VERSION);
 	fprintf(stderr,"Options:\n"
 		"\t--help,-h,-?            Display this help\n"
+		"\t--version               Display version\n"
 		"\t--exit-on-warn,-w       Exit with an error on warnings\n"
 		"\t--no-exit-on-warn       Don't exit on warnings [default]\n"
 		"\t--for-cpp               Create C++ files\n"
+		"\t--no-extern-c           Never print extern \"C\" into the "
+	       				  "header\n"
+		"\t--no-gnu                Never use GNU extentions\n"
 		"\t--no-touch-headers      Don't touch headers unless they "
 		                          "really changed\n"
 		"\t--always-private-header Always create a private header "
-					  "file, even if it would be empty\n"
+					  "file,\n"
+		"\t                        even if it would be empty\n"
 		"\t--no-private-header     Don't create a private header, "
-					  "put private structure inside c "
-					  "file\n");
+					  "put private\n"
+	  	"\t                        structure and protected "
+					  "prototypes inside c file\n");
 }
 
 static void
@@ -1790,6 +1815,9 @@ parse_options(int argc, char *argv[])
 		} else if(strcmp(argv[i],"--help")==0) {
 			print_help();
 			exit(0);
+		} else if(strcmp(argv[i],"--version")==0) {
+			fprintf(stderr,"Gob version %s\n",VERSION);
+			exit(0);
 		} else if(strcmp(argv[i],"--exit-on-warn")==0) {
 			exit_on_warn = TRUE;
 		} else if(strcmp(argv[i],"--no-exit-on-warn")==0) {
@@ -1804,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;
@@ -1836,6 +1868,7 @@ parse_options(int argc, char *argv[])
 	}
 }
 
+/* this is a somewhat ugly hack, but it appears to work */
 static void
 compare_and_move_header(void)
 {
@@ -1866,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) {
@@ -1922,17 +1924,21 @@ main(int argc, char *argv[])
 	arguments = count_arguments((Class *)class);
 	overrides = count_overrides((Class *)class);
 	privates = count_privates((Class *)class);
+	protecteds = count_protecteds((Class *)class);
 
 	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);
 	check_public_new((Class *)class);
 	check_vararg((Class *)class);
 	check_firstarg((Class *)class);
+	check_nonvoidempty((Class *)class);
+	check_signal_args((Class *)class);
+	check_argument_types((Class *)class);
 
 	exit_on_error = TRUE;
 	
@@ -1949,8 +1955,5 @@ main(int argc, char *argv[])
 	if(no_touch_headers)
 		compare_and_move_header();
 	
-#if 0
-	poptFreeContext(optCon);
-#endif
 	return 0;
 }