X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/f319f19a8ef9c6d076359ed4bbbc42cdecefc0f0..c9d96fcfcf9b74099775a3a260eccdfdc31474c7:/src/main.c

diff --git a/src/main.c b/src/main.c
index e418b4e..bf205ac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* GOB C Preprocessor
- * Copyright (C) 1999 the Free Software Foundation.
+ * Copyright (C) 1999,2000 the Free Software Foundation.
+ * Copyright (C) 2000 Eazel, Inc.
  *
  * Author: George Lebl
  *
@@ -21,16 +22,22 @@
 
 #include "config.h"
 #include <glib.h>
-#include <popt.h>
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 
-#include "tree.h"
+#include "treefuncs.h"
 #include "parse.h"
 #include "out.h"
+#include "util.h"
+#include "checks.h"
 
-char *filename = "stdin";
+#include "main.h"
+
+char *filename = NULL;
 
 int yyparse(void);
 
@@ -39,279 +46,474 @@ extern FILE * yyin;
 extern Node *class;
 extern GList *nodes;
 
+extern GList *include_files;
+
+extern GHashTable *gtk_doc_hash;
+
 char *filebase;
 static char *funcbase;
 static char *pfuncbase;
 static char *macrobase;
 static char *macrois;
+static char *macrotype;
 static char *typebase;
 static char *ptypebase;
 
-static int signals = 0;
-static int arguments = 0;
-static int overrides = 0;
-
-FILE *out;
-FILE *outh;
-
-int exit_on_warn = FALSE;
+static int signals = 0; /* number of signals */
+static int set_arguments = 0; /* number of named (set) arguments */
+static int get_arguments = 0; /* number of named (get) arguments */
+static int overrides = 0; /* number of override methods */
+static int privates = 0; /* number of private data members */
+static int protecteds = 0; /* number of protected methods */
+static int destructors = 0; /* number of variable destructors */
+static int initializers = 0; /* number of variable initializers */
+
+static gboolean made_aliases = FALSE;  /* if we made any shorthand aliases
+					  and need the REALLY UGLY HACK to
+					  avoid warnings */
+
+/* the special variable types we need to define */
+static gboolean special_array[SPECIAL_LAST] = {0};
+static gboolean any_special = FALSE;
+
+static gboolean need_destroy = FALSE;
+static Method * destroy_handler = NULL;
+
+static gboolean need_finalize = FALSE;
+static Method * finalize_handler = NULL;
+
+FILE *out = NULL;
+FILE *outh = NULL;
+FILE *outph = NULL;
+FILE *devnull = 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;
+gint private_header = PRIVATE_HEADER_ALWAYS;
+gboolean no_extern_c = FALSE;
+gboolean no_write = FALSE;
+gboolean no_lines = FALSE;
+gboolean no_self_alias = FALSE;
+gboolean no_kill_underscores = FALSE;
+gboolean always_private_struct = FALSE;
+
+int method_unique_id = 1;
 
 static void
-print_error(int is_warn, char *error,int line)
+make_bases(void)
 {
-	char *w;
-	if(is_warn)
-		w = "Warning:";
-	else
-		w = "Error:";
-	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(1);
+	filebase = replace_sep(((Class *)class)->otype, '-');
+	g_strdown(filebase);
+
+	funcbase = replace_sep(((Class *)class)->otype, '_');
+	g_strdown(funcbase);
+
+	pfuncbase = replace_sep(((Class *)class)->ptype, '_');
+	g_strdown(pfuncbase);
+
+	macrobase = replace_sep(((Class *)class)->otype, '_');
+	g_strup(macrobase);
+	
+	macrois = make_pre_macro(((Class *)class)->otype, "IS");
+	macrotype = make_pre_macro(((Class *)class)->otype, "TYPE");
+
+	typebase = remove_sep(((Class *)class)->otype);
+
+	ptypebase = remove_sep(((Class *)class)->ptype);
 }
 
 static char *
-remove_sep(char *base)
+get_type(const Type *t, gboolean postfix_to_stars)
 {
-	char *p;
-	char *s = g_strdup(base);
-	while((p=strchr(s,':')))
-		strcpy(p,p+1);
+	char *s;
+	int i;
+	int extra;
+	GString *gs;
+
+	s = remove_sep(t->name);
+	gs = g_string_new(s);
+	g_free(s);
+
+	extra = 0;
+	if(postfix_to_stars) {
+		const 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, so that we can print
+		  that many stars */
+		for(p=t->postfix; p && *p; p++)
+			if(*p == '[') extra++;
+	}
+	g_string_append_c(gs, ' ');
+
+	if(t->pointer) {
+		g_string_append(gs, t->pointer);
+		for(i=0; i < extra; i++)
+			g_string_append_c(gs, '*');
+		g_string_append_c(gs, ' ');
+	}
+	
+	s = gs->str;
+	g_string_free(gs, FALSE);
 	return s;
 }
 
 static char *
-replace_sep(char *base, char r)
+get_gtk_doc(const char *id)
 {
-	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;
+	char *val;
+
+	if(!gtk_doc_hash)
+		return NULL;
+
+	val = g_hash_table_lookup(gtk_doc_hash, id);
+	if(val)
+		return g_strdup_printf("/**\n * %s_%s:\n%s **/\n",
+				       funcbase, get_real_id(id), val);
+	val = g_hash_table_lookup(gtk_doc_hash, get_real_id(id));
+	if(val)
+		return g_strdup_printf("/**\n * %s_%s:\n%s **/\n",
+				       funcbase, get_real_id(id), val);
+	return NULL;
 }
 
-/*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)
+print_type(FILE *fp, const Type *t, gboolean postfix_to_stars)
 {
-	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;
+	char *s;
+
+	s = get_type(t, postfix_to_stars);
+	out_printf(fp, "%s", s); 
+	g_free(s);
 }
 
-static char *
-make_is_macro(char *base)
+
+static void
+print_method(FILE *fp, const char *typeprefix, const char *nameprefix,
+	     const char *subnameprefix,
+	     const char *namepostfix, const char *postfix, const Method *m,
+	     gboolean one_arg_per_line,
+	     gboolean no_funcbase,
+	     gboolean kill_underscore)
 {
-	char *s1,*s2;
-	char *s;
+	GList *li;
+	const char *id;
+
+	out_printf(fp, "%s", typeprefix); 
+	print_type(fp, m->mtype, TRUE);
 
-	separns_replace_sep(base,&s1,&s2,'_');
-	if(s1)
-		s = g_strconcat(s1,"_IS_",s2,NULL);
+	if(kill_underscore)
+		id = get_real_id(m->id);
 	else
-		s = g_strconcat("IS_",s2,NULL);
+		id = m->id;
 
-	g_strup(s);
+	if(no_funcbase)
+		out_printf(fp, "%s%s%s%s(",
+			   nameprefix, subnameprefix, id, namepostfix); 
+	else
+		out_printf(fp, "%s%s_%s%s%s(",
+			   nameprefix, funcbase, subnameprefix, id,
+			   namepostfix); 
 	
-	g_free(s1);
-	g_free(s2);
-
-	return s;
+	if(m->args) {
+		for(li=m->args; li; li=g_list_next(li)) {
+			FuncArg *arg = li->data;
+			print_type(fp, arg->atype, FALSE);
+			if(li->next)
+				out_printf(fp, "%s%s,%s", arg->name,
+					   arg->atype->postfix ?
+					   arg->atype->postfix : "",
+					   one_arg_per_line ? "\n\t\t\t\t\t" : " ");
+			else
+				out_printf(fp, "%s%s", arg->name,
+					   arg->atype->postfix ?
+					   arg->atype->postfix : ""); 
+		}
+		if(m->vararg)
+			out_printf(fp, ",%s...",
+				   one_arg_per_line ? "\n\t\t\t\t\t" : " "); 
+	} else {
+		out_printf(fp, "void"); 
+	}
+	out_printf(fp, ")%s", postfix); 
 }
 
-static void
-make_bases(void)
+static gboolean
+any_method_to_alias(Class *c)
 {
-	filebase = replace_sep(((Class *)class)->otype,'-');
-	g_strdown(filebase);
+	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;
 
-	funcbase = replace_sep(((Class *)class)->otype,'_');
-	g_strdown(funcbase);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
 
-	pfuncbase = replace_sep(((Class *)class)->ptype,'_');
-	g_strdown(pfuncbase);
 
-	macrobase = replace_sep(((Class *)class)->otype,'_');
-	g_strup(macrobase);
+/* just the vararg macros, we use the same func pointers for these as in non-gnu */
+static void
+make_method_gnu_aliases(Class *c)
+{
+	GList *li;
 	
-	macrois = make_is_macro(((Class *)class)->otype);
+	for(li = c->nodes; li != NULL; li = li->next) {
+		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;
 
-	typebase = remove_sep(((Class *)class)->otype);
+			/* in C++ mode don't alias new */
+			if(for_cpp && strcmp(m->id, "new")==0)
+				continue;
 
-	ptypebase = remove_sep(((Class *)class)->ptype);
+			if(m->args != NULL)
+				out_printf(out, "#define %s(args...) "
+					   "%s_%s(##args)\n", m->id,
+					   funcbase, get_real_id(m->id));
+			else
+				out_printf(out, "#define %s() "
+					   "%s_%s()\n", m->id,
+					   funcbase, get_real_id(m->id));
+		}
+	}
 }
 
 static void
-def_methods(Class *c)
+make_method_nongnu_aliases(Class *c)
 {
 	GList *li;
+
+	gboolean local_made_aliases = FALSE;
 	
-	out_printf(out,"\n");
-	for(li=c->nodes;li;li=g_list_next(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->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;
-			
-			out_printf(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;
+
+			if( ! local_made_aliases)
+				out_printf(out, "\n/* Short form pointers */\n");
+
+			print_method(out, "static ", "(* const ", "", ") ", "",
+				     m, FALSE, TRUE, FALSE);
+			out_printf(out, " = %s_%s;\n", funcbase,
+				   get_real_id(m->id));
+
+			local_made_aliases = TRUE;
 		}
 	}
-	out_printf(out,"\n");
+	if(local_made_aliases) {
+		out_printf(out, "\n");
+		made_aliases = TRUE;
+	}
 }
 
 static void
-undef_methods(Class *c)
+add_bad_hack_to_avoid_unused_warnings(Class *c)
 {
 	GList *li;
+
+	/* if we haven't had any methods, just return */
+	if( ! made_aliases)
+		return;
 	
-	out_printf(out,"\n");
+	if( ! no_gnu)
+		out_printf(out, "\n\n#if (!defined __GNUC__) || (defined __GNUC__ && defined __STRICT_ANSI__)\n");
+	out_printf(out,
+		   "/*REALLY BAD HACK\n"
+		   "  This is to avoid unused warnings if you don't call\n"
+		   "  some method.  I need to find a better way to do\n"
+		   "  this, 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->method == INIT_METHOD ||
+			   m->method == CLASS_INIT_METHOD ||
+			   m->method == OVERRIDE_METHOD)
+				continue;
 
-			if(m->scope == INIT_METHOD ||
-			   m->scope == CLASS_INIT_METHOD ||
-			   m->scope == OVERRIDE_METHOD)
+			/* in C++ mode we don't alias new */
+			if(for_cpp && strcmp(m->id, "new")==0)
 				continue;
-			
-			out_printf(out,"#undef %s\n",m->id); 
+
+			out_printf(out, "\t((void (*)(void))%s)();\n", m->id);
 		}
 	}
-	out_printf(out,"\n");
+	out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n",
+		   funcbase);
+	if(!no_gnu)
+		out_printf(out, "}\n#endif /* !__GNUC__ || (__GNUC__ && __STRICT_ANSI__) */\n\n");
+	else
+		out_printf(out, "}\n\n");
 }
 
 static void
-print_type(FILE *fp, Type *t)
+put_variable(Variable *v, FILE *fp)
 {
-	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,"*"); 
+	out_printf(fp, "\t");
+	print_type(fp, v->vtype, FALSE);
+	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_variable(Variable *v)
+put_vs_method(const Method *m)
 {
-	out_printf(outh,"\t");
-	if(v->scope == PRIVATE_SCOPE)
-		out_printf(outh,"/* private */ "); 
-	print_type(outh,v->vtype);
+	if(m->method != SIGNAL_LAST_METHOD &&
+	   m->method != SIGNAL_FIRST_METHOD &&
+	   m->method != VIRTUAL_METHOD)
+		return;
 
-	out_printf(outh,"%s;\n",v->id); 
+	/* if a signal mark it as such */
+	if(m->method != VIRTUAL_METHOD)
+		print_method(outh, "\t/*signal*/", "(* ", "", ") ", ";\n",
+			     m, FALSE, TRUE, TRUE);
+	else
+		print_method(outh, "\t", "(* ", "", ") ", ";\n",
+			     m, FALSE, TRUE, TRUE);
 }
 
 static void
-print_method(FILE *fp, char *typeprefix, char *nameprefix,
-	     char *namepostfix,char *postfix, Method *m)
+put_pub_method(const Method *m)
 {
-	GList *li;
-
-	out_printf(fp,"%s",typeprefix); 
-	print_type(fp,m->mtype);
-	out_printf(fp,"%s%s_%s%s(",
-		nameprefix,funcbase,m->id,namepostfix); 
-	
-	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->scope != PUBLIC_SCOPE)
+		return;
 
-		}
-	} else {
-		out_printf(fp,"void"); 
-	}
-	out_printf(fp,")%s\n",postfix); 
+	print_method(outh, "", "\t", "", "\t", ";\n", m, TRUE, FALSE, TRUE);
 }
 
+/* I'm starting not to like this idea */
+#if 0
 static void
-put_vs_method(Method *m)
+put_signal_connect(Method *m)
 {
-	if(m->scope != SIGNAL_LAST_METHOD &&
-	   m->scope != SIGNAL_FIRST_METHOD &&
-	   m->scope != VIRTUAL_METHOD)
+	if(m->method != SIGNAL_LAST_METHOD &&
+	   m->method != SIGNAL_FIRST_METHOD)
 		return;
 
-	print_method(outh,"\t","(* ",") ",";",m);
+	out_printf(outh, "guint \t%s_%s__connect_full\t(%s *object,\n"
+		   "\t\t\t\t\tconst char *name,\n"
+		   "\t\t\t\t\tGtkSignalFunc func,\n"
+		   "\t\t\t\t\tGtkCallbackMarshal marshal,\n"
+		   "\t\t\t\t\tgpointer data,\n"
+		   "\t\t\t\t\tGtkDestroyNotify destroy_func,\n"
+		   "\t\t\t\t\tgboolean object_signal,\n"
+		   "\t\t\t\t\tgboolean after);\n",
+		   funcbase, m->id, typebase);
+
+	out_printf(outh, "#define %s_%s__connect(object,name,func,data) "
+		   "%s_%s__connect_full((object),(name),(func),NULL,"
+		   "(data),NULL,FALSE,FALSE)\n",
+		   funcbase, m->id, funcbase, m->id);
+	out_printf(outh, "#define %s_%s__connect_after(object,name,func,data) "
+		   "%s__connect_%s_full((object),(name),(func),NULL,"
+		   "(data),NULL,FALSE,TRUE)\n",
+		   funcbase, m->id, funcbase, m->id);
+
+	out_printf(outh, "guint \t%s_%s__connect_while_alive\t(%s *object,\n"
+		   "\t\t\t\t\tconst char *name,\n"
+		   "\t\t\t\t\tGtkSignalFunc func,\n"
+		   "\t\t\t\t\tgpointer data,\n"
+		   "\t\t\t\t\tGtkObject *alive_object);\n\n",
+		   funcbase, m->id, typebase);
 }
+#endif
+
 
 static void
-put_pub_method(Method *m)
+put_prot_method(const Method *m)
 {
-	if(m->scope == PRIVATE_SCOPE ||
-	   m->scope == OVERRIDE_METHOD ||
-	   m->scope == INIT_METHOD ||
-	   m->scope == CLASS_INIT_METHOD)
+	if(m->scope != PROTECTED_SCOPE)
 		return;
 
-	print_method(outh,"","\t","\t",";",m);
+	if(outph)
+		print_method(outph, "", "\t", "", "\t", ";\n",
+			     m, FALSE, FALSE, TRUE);
+	else
+		print_method(out, "", "\t", "", "\t", ";\n",
+			     m, FALSE, FALSE, TRUE);
 }
 
 static void
 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->cbuf)
-			return;
-		print_method(out,"static ","_real_"," ",";",m);
-	} else {
-		print_method(out,"static ",""," ",";",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, FALSE, TRUE);
 	}
+	/* no else, here, it might still have a private prototype, it's not
+	 * exclusive */
+
+	if((m->method == OVERRIDE_METHOD &&
+	    m->cbuf)) {
+		/* add unique ID */
+		char *s = g_strdup_printf("___%x_", (guint)m->unique_id);
+		print_method(out, "static ", s, "", " ",
+			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
+			     m, FALSE, FALSE, FALSE);
+		g_free(s);
+	} else if(m->scope == PRIVATE_SCOPE ||
+		  m->method == INIT_METHOD ||
+		  m->method == CLASS_INIT_METHOD)
+		print_method(out, "static ", "", "", " ",
+			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
+			     m, FALSE, FALSE, TRUE);
 }
 
 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);
+	type = new_type(tn, g_strdup("*"), NULL);
+	node = new_funcarg((Type *)type, name, NULL);
 	return g_list_prepend(NULL, node);
 }
 
@@ -326,110 +528,227 @@ 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);
+					error_print(GOB_ERROR, m->line_no, "init defined more then once");
 				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);
+					error_print(GOB_ERROR, m->line_no, "class_init defined more then once");
 				got_class_init = TRUE;
 			}
 		}
 	}
 	if(!got_class_init) {
-		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,0);
-		cl->nodes = g_list_prepend(cl->nodes,node);
+		node = new_method(NO_SCOPE, CLASS_INIT_METHOD,
+				  (Type *)new_type(g_strdup("void"),
+						   NULL, NULL),
+				  NULL, NULL, NULL, g_strdup("class_init"),
+				  make_func_arg(cl->otype, TRUE, g_strdup("c")),
+				  NULL, NULL, NULL, 0, 0, FALSE,
+				  method_unique_id++);
+		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,0);
-		cl->nodes = g_list_prepend(cl->nodes,node);
+		node = new_method(NO_SCOPE, INIT_METHOD,
+				  (Type *)new_type(g_strdup("void"),
+						   NULL, NULL),
+				  NULL, NULL, NULL, g_strdup("init"),
+				  make_func_arg(cl->otype, FALSE, g_strdup("o")),
+				  NULL, NULL, NULL, 0, 0, FALSE,
+				  method_unique_id++);
+		cl->nodes = g_list_prepend(cl->nodes, node);
+	}
+}
+
+static void
+find_destroy(Class *cl)
+{
+	GList *li;
+
+	destroy_handler = NULL;
+	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->method == OVERRIDE_METHOD &&
+			   strcmp(m->id, "destroy")==0) {
+				if(strcmp(m->otype, "Gtk:Object") != 0) {
+					error_print(GOB_ERROR, m->line_no,
+						    "destroy method override "
+						    "of class other then "
+						    "Gtk:Object");
+				}
+				if(g_list_length(m->args) != 1) {
+					error_print(GOB_ERROR, m->line_no,
+						    "destroy method override "
+						    "with more then one "
+						    "parameter");
+				}
+				destroy_handler = m;
+				break;
+			}
+		}
+	}
+}
+
+static void
+find_finalize(Class *cl)
+{
+	GList *li;
+
+	finalize_handler = NULL;
+	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->method == OVERRIDE_METHOD &&
+			   strcmp(m->id, "finalize")==0) {
+				if(strcmp(m->otype, "Gtk:Object") != 0 &&
+				   strcmp(m->otype, "G:Object") != 0) {
+					error_print(GOB_ERROR, m->line_no,
+						    "finalize method override "
+						    "of class other then "
+						    "Gtk:Object (or G:Object"
+						    "for GTK+ 2.0)");
+				}
+				if(g_list_length(m->args) != 1) {
+					error_print(GOB_ERROR, m->line_no,
+						    "finalize method override "
+						    "with more then one "
+						    "parameter");
+				}
+				finalize_handler = m;
+				break;
+			}
+		}
 	}
 }
 
+
+/* 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)
+	if(m->method != SIGNAL_LAST_METHOD &&
+	   m->method != SIGNAL_FIRST_METHOD)
 		return;
 
 	if(!marsh)
-		marsh = g_hash_table_new(NULL,NULL);
+		marsh = g_hash_table_new(NULL, NULL);
 	
-	if(strcmp(m->gtktypes->data,"NONE")==0 &&
-	   strcmp(m->gtktypes->next->data,"NONE")==0)
+	if(strcmp(m->gtktypes->data, "NONE")==0 &&
+	   strcmp(m->gtktypes->next->data, "NONE")==0)
 		return;
+
+	/* if we already did a signal prototype just use that */
+	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++);
-	
-	g_hash_table_insert(marsh,m,s);
+	s = g_strdup_printf("Sig%d", sig++);
 	
-	out_printf(out,"\ntypedef ");
-	print_type(out,m->mtype);
+	g_hash_table_insert(marsh, m, s);
+	eq_signal_methods = g_list_prepend(eq_signal_methods, m);
 	
-	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);
-		out_printf(out,", "); 
+	if(strcmp(m->gtktypes->next->data, "NONE")!=0) {
+		for(li=m->gtktypes->next; li; li=g_list_next(li))
+			out_printf(out, "%s, ", get_cast(li->data, FALSE));
 	}
-	out_printf(out,"gpointer);\n"); 
+	out_printf(out, "gpointer);\n"); 
 	
-	out_printf(out,"\nstatic void\n"
-		"marshal_%s (GtkObject * object,\n"
+	out_printf(out, "\nstatic void\n"
+		"___marshal_%s (GtkObject * object,\n"
 		"\tGtkSignalFunc func,\n"
 		"\tgpointer func_data,\n"
 		"\tGtkArg * args)\n"
-		"{\n",s);
+		"{\n", s);
 	
-	if(strcmp(m->gtktypes->data,"NONE")==0) {
-		int i;
-		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) {
-			for(i=0,li=m->gtktypes->next;li;
-			    i++,li=g_list_next(li)) {
-				out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
-					(char *)li->data,i);
-			}
-		}
-		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
+	if(strcmp(m->gtktypes->data, "NONE")==0) {
+		out_printf(out, "\t___%s rfunc;\n\n"
+			"\trfunc = (___%s)func;\n\n"
+			"\t(*rfunc)((%s *)object", s, s, typebase);
 	} else {
-		int i;
-		out_printf(out, "\t%s rfunc;\n\t",s);
-		print_type(out,m->mtype);
-		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) {
-			for(i=0,li=m->gtktypes->next;li;
-			    i++,li=g_list_next(li)) {
-				out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
-					(char *)li->data,i);
-			}
-		}
-		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
+		const char *retcast = get_cast(m->gtktypes->data, FALSE);
+		out_printf(out,
+			   "\t___%s rfunc;\n\t"
+			   "%s *retval;\n\n"
+			   "\trfunc = (___%s)func;\n\n"
+			   "\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
+			   "\t*retval = (*rfunc)((%s *)object",
+			   s, retcast, s, (char *)m->gtktypes->data,
+			   g_list_length(m->gtktypes)-1, typebase);
 	}
+	print_signal_marsal_args(m);
 
 }
 
@@ -437,209 +756,361 @@ static void
 add_enums(Class *c)
 {
 	GList *li;
-	out_printf(out,"\n");
+	out_printf(out, "\n");
 	if(signals>0) {
-		out_printf(out,"enum {\n");
+		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) {
-					char *s = g_strdup(m->id);
+				if(m->method == SIGNAL_LAST_METHOD ||
+				   m->method == SIGNAL_FIRST_METHOD) {
+					char *s = g_strdup(get_real_id(m->id));
 					g_strup(s);
-					out_printf(out,"\t%s_SIGNAL,\n",s);
+					out_printf(out, "\t%s_SIGNAL,\n", s);
 					g_free(s);
 				}
 			}
 		}
-		out_printf(out,"\tLAST_SIGNAL\n};\n\n");
+		out_printf(out, "\tLAST_SIGNAL\n};\n\n");
 	}
-	if(arguments>0) {
-		out_printf(out,"enum {\n\tARG_0,\n");
+	if(set_arguments > 0 || get_arguments > 0) {
+		out_printf(out, "enum {\n\tARG_0");
 		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);
+				out_printf(out, ",\n\tARG_%s", s);
 				g_free(s);
 			}
 		}
-		out_printf(out, "};\n\n");
+		out_printf(out, "\n};\n\n");
 	}
 
 	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);
+	out_printf(out, "/* pointer to the class of our parent */\n");
+	out_printf(out, "static %sClass *parent_class = NULL;\n\n", ptypebase);
 }
 
 static void
 add_get_type(void)
 {
-	out_printf(out, "guint\n"
-		"%s_get_type (void)\n"
-		"{\n"
-		"\tstatic guint type = 0;\n\n"
-		"\tif (!type) {\n"
-		"\t\tstatic const GtkTypeInfo info = {\n"
-		"\t\t\t\"%s\",\n"
-		"\t\t\tsizeof (%s),\n"
-		"\t\t\tsizeof (%sClass),\n"
-		"\t\t\t(GtkClassInitFunc) %s_class_init,\n"
-		"\t\t\t(GtkObjectInitFunc) %s_init,\n"
-		"\t\t\t/* reserved_1 */ NULL,\n"
-		"\t\t\t/* reserved_2 */ NULL,\n"
-		"\t\t\t(GtkClassInitFunc) NULL,\n"
-		"\t\t};\n\n"
-		"\t\ttype = gtk_type_unique (%s_get_type(), &info);\n"
-		"\t}\n\n"
-		"\treturn type;\n"
-		"}\n\n",
-		funcbase,typebase,typebase,typebase,
-		funcbase,funcbase,pfuncbase);
+	char *chunk_size = ((Class*)class)->chunk_size;
+	
+	out_printf(out,
+		   "GtkType\n"
+		   "%s_get_type (void)\n"
+		   "{\n"
+		   "\tstatic guint type = 0;\n\n"
+		   "\tif ( ! type) {\n"
+		   "\t\tstatic const GtkTypeInfo info = {\n"
+		   "\t\t\t\"%s\",\n"
+		   "\t\t\tsizeof (%s),\n"
+		   "\t\t\tsizeof (%sClass),\n"
+		   "\t\t\t(GtkClassInitFunc) %s_class_init,\n"
+		   "\t\t\t(GtkObjectInitFunc) %s_init,\n"
+		   "\t\t\t/* reserved_1 */ NULL,\n"
+		   "\t\t\t/* reserved_2 */ NULL,\n"
+		   "\t\t\t(GtkClassInitFunc) NULL\n"
+		   "\t\t};\n\n"
+		   "\t\ttype = gtk_type_unique (%s_get_type(), &info);\n",
+		   funcbase, typebase, typebase, typebase,
+		   funcbase, funcbase, pfuncbase);
+	if(chunk_size)  {
+		out_printf(out,
+			   "#if %s > 0\n"
+			   "\t\tgtk_type_set_chunk_alloc(type, %s);\n"
+			   "#endif\n", 
+			   chunk_size, chunk_size);
+	}
+	out_printf(out,
+		   "\t}\n\n"
+		   "\treturn type;\n"
+		   "}\n\n");
 }
 
 static void
-add_overrides(Class *c, char *oname)
+add_overrides(Class *c, const char *oname, gboolean did_base_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);
-	for(li=c->nodes;li;li=g_list_next(li)) {
+	done = g_hash_table_new(g_str_hash, g_str_equal);
+	if(did_base_obj) {
+		s = g_strdup("GtkObject"); /* This was already done */
+		g_hash_table_insert(done, s, s);
+		s = g_strdup("GObject"); /* This was probably already done as well (if using Gtk/Glib 1.3/2.0) */
+		g_hash_table_insert(done, s, s);
+	}
+	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);
 		
-		if(g_hash_table_lookup(done,s)) {
+		if(g_hash_table_lookup(done, s)) {
 			g_free(s);
 			continue;
 		}
-		g_hash_table_insert(done,s,s);
+		g_hash_table_insert(done, s, s);
 
-		f = replace_sep(m->otype,'_');
+		f = replace_sep(m->otype, '_');
 		g_strdown(f);
 
-		out_printf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
-			s,f,s,oname);
+		out_printf(out, "\t%sClass *%s_class = (%sClass *)%s;\n",
+			   s, f, s, oname);
 		
 		g_free(f);
 	}
-	g_hash_table_foreach(done,(GHFunc)g_free,NULL);
+	g_hash_table_foreach(done, (GHFunc)g_free, NULL);
 	g_hash_table_destroy(done);
 }
 
+static char *
+make_run_signal_flags(Method *m, gboolean last)
+{
+	GList *li;
+	GString *gs;
+	char *flags[] = {
+		"FIRST",
+		"LAST",
+		"BOTH",
+		"NO_RECURSE",
+		"ACTION",
+		"NO_HOOKS",
+		NULL
+	};
+
+	gs = g_string_new(NULL);
+
+	if(last)
+		g_string_assign(gs, "GTK_RUN_LAST");
+	else
+		g_string_assign(gs, "GTK_RUN_FIRST");
+
+	if(m->scope == PUBLIC_SCOPE)
+		g_string_append(gs, " | GTK_RUN_ACTION");
+
+	for(li = m->flags; li; li = li->next) {
+		char *flag = li->data;
+		int i;
+		for(i=0;flags[i];i++) {
+			if(strcmp(flags[i], flag)==0)
+				break;
+		}
+		/* if we haven't found it in our list */
+		if( ! flags[i]) {
+			error_printf(GOB_WARN, m->line_no,
+				     "Unknown flag '%s' used, "
+				     "perhaps it was misspelled",
+				     flag);
+		}
+		g_string_sprintfa(gs, " | GTK_RUN_%s", flag);
+	}
+
+	{
+		char *ret = gs->str;
+		g_string_free(gs, FALSE);
+		return ret;
+	}
+}
+		
+
 static void
 add_signals(Class *c)
 {
 	GList *li;
 
-	out_printf(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;
+		char *mar, *sig, *flags;
+		gboolean is_none, last = FALSE;
+		Method *m = (Method *)n;
+
 		if(n->type != METHOD_NODE ||
-		   (((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
-		    ((Method *)n)->scope != SIGNAL_LAST_METHOD))
+		   (m->method != SIGNAL_FIRST_METHOD &&
+		    m->method != SIGNAL_LAST_METHOD))
 			continue;
 
-		m = (Method *)n;
+		if(m->method == SIGNAL_FIRST_METHOD)
+			last = FALSE;
+		else
+			last = TRUE;
 
-		if(g_hash_table_lookup(marsh,m))
-			mar = g_strconcat("marshal_",
-					  (char *)g_hash_table_lookup(marsh,m),
+		if(g_hash_table_lookup(marsh, m))
+			mar = g_strconcat("___marshal_",
+					  (char *)g_hash_table_lookup(marsh, m),
 					  NULL);
 		else
 			mar = g_strdup("gtk_signal_default_marshaller");
 		
-		is_none = (strcmp(m->gtktypes->next->data,"NONE")==0);
-		
-		sig = g_strdup(m->id);
+		is_none = (strcmp(m->gtktypes->next->data, "NONE")==0);
+
+		sig = g_strdup(get_real_id(m->id));
 		g_strup(sig);
-		out_printf(out,"\tobject_signals[%s_SIGNAL] =\n"
+		flags = make_run_signal_flags(m, last);
+		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"
+			"\t\t\t(GtkSignalRunType)(%s),\n"
+			"\t\t\tGTK_CLASS_TYPE(gtk_object_class),\n"
                     	"\t\t\tGTK_SIGNAL_OFFSET (%sClass, %s),\n"
                     	"\t\t\t%s,\n"
 		    	"\t\t\tGTK_TYPE_%s, %d",
-			sig,m->id,
-			m->scope==SIGNAL_LAST_METHOD?"LAST":"FIRST",
-			typebase,m->id,mar,(char *)m->gtktypes->data,
-			is_none?0:g_list_length(m->gtktypes->next));
+			sig, get_real_id(m->id),
+			flags,
+			typebase, get_real_id(m->id), mar,
+			(char *)m->gtktypes->data,
+			is_none ? 0 : g_list_length(m->gtktypes->next));
 		g_free(mar);
 		g_free(sig);
+		g_free(flags);
 		
-		if(!is_none) {
+		if( ! is_none) {
 			GList *l;
-			for(l=m->gtktypes->next;l;l=g_list_next(l))
-				out_printf(out,",\n\t\t\tGTK_TYPE_%s",
+			for(l = m->gtktypes->next; l != NULL; l = l->next)
+				out_printf(out, ",\n\t\t\tGTK_TYPE_%s",
 					(char *)l->data);
 		}
 
-		out_printf(out,");\n");
+		out_printf(out, ");\n");
+
+		if(strcmp(m->gtktypes->data, "NONE") != 0 ||
+		   ! is_none) {
+			GList *gl, *al;
+			char *sep = "";
+			out_printf(out, "\tif(");
+			if(strcmp(m->gtktypes->data, "NONE") != 0) {
+				out_printf(out, "%s sizeof(", sep);
+				print_type(out, m->mtype, FALSE);
+				out_printf(out, "%s",
+					   m->mtype->postfix ?
+					   m->mtype->postfix : ""); 
+				out_printf(out, ") != sizeof(%s)",
+					   get_cast(m->gtktypes->data, FALSE));
+
+				sep = " || ";
+			}
+
+			for(al = m->args->next, gl = m->gtktypes->next;
+			    al != NULL && gl != NULL;
+			    al = al->next, gl = gl->next) {
+				FuncArg *arg = al->data;
+				char *gtkarg = gl->data;
+
+				out_printf(out, "%ssizeof(", sep);
+				print_type(out, arg->atype, FALSE);
+				out_printf(out, "%s",
+					   arg->atype->postfix ?
+					   arg->atype->postfix : ""); 
+				out_printf(out, ") != sizeof(%s)",
+					   get_cast(gtkarg, FALSE));
+
+				sep = " || ";
+			}
+			out_printf(out, ") {\n"
+				   "\t\tg_error(\"%s line %d: Type mismatch "
+				   "of \\\"%s\\\" signal signature\");\n"
+				   "\t}\n",
+				   filename, m->line_no, get_real_id(m->id));
+
+		}
 	}
-	out_printf(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");
 }
 
 static void
-set_def_handlers(Class *c, char *oname)
+set_def_handlers(Class *c, const char *oname)
 {
 	GList *li;
+	gboolean set_line = FALSE;
 
-	out_printf(out,"\n");
-	for(li=c->nodes;li;li=g_list_next(li)) {
+	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 != 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->line_no > 0 && m->cbuf) {
+			out_addline_infile(out, m->line_no);
+			set_line = TRUE;
+		} else if(set_line) {
+			out_addline_outfile(out);
+			set_line = FALSE;
+		}
 
-		if(m->scope == OVERRIDE_METHOD) {
+
+		if(m->method == OVERRIDE_METHOD) {
 			char *s;
-			s = replace_sep(m->otype,'_');
+			s = replace_sep(m->otype, '_');
 			g_strdown(s);
-			out_printf(out,"\t%s_class->%s = %s_%s;\n",
-				s,m->id,funcbase,m->id);
-		} else {
-			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",
-					oname,m->id);
+
+			if(need_destroy &&
+			   destroy_handler &&
+			   strcmp(get_real_id(m->id), "destroy") == 0)
+				out_printf(out, "\tgtk_object_class->destroy "
+					   "= ___destroy;\n");
+			else if(need_finalize &&
+				finalize_handler &&
+				strcmp(get_real_id(m->id), "finalize") == 0)
+				out_printf(out,
+					   "#ifdef G_OBJECT_CLASS\n"
+					   "\tg_object_class->finalize = ___finalize;\n"
+					   "#else /* !G_OBJECT_CLASS */\n"
+					   "\tgtk_object_class->finalize = ___finalize;\n"
+					   "#endif /* G_OBJECT_CLASS */\n");
+			else if(m->cbuf)
+				out_printf(out,
+					   "\t%s_class->%s = ___%x_%s_%s;\n",
+					   s, get_real_id(m->id), (guint)m->unique_id,
+					   funcbase, get_real_id(m->id));
+			else
+				out_printf(out, "\t%s_class->%s = NULL;\n",
+					   s, get_real_id(m->id));
+		} else {
+			if(m->cbuf)
+				out_printf(out, "\t%s->%s = ___real_%s_%s;\n",
+					   oname, get_real_id(m->id),
+					   funcbase, get_real_id(m->id));
+			else
+				out_printf(out, "\t%s->%s = NULL;\n",
+					   oname, get_real_id(m->id));
 		}
 	}
+	if(set_line)
+		out_addline_outfile(out);
 }
 
 static void
 make_arguments(Class *c)
 {
 	GList *li;
+	char *argflags[] = {
+		"CONSTRUCT",
+		"CONSTRUCT_ONLY",
+		"CHILD_ARG",
+		"MASK",
+		NULL
+	};
 
-	out_printf(out,"\n");
+	out_printf(out, "\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Argument *a;
@@ -657,24 +1128,216 @@ make_arguments(Class *c)
 			flags = g_string_new("GTK_ARG_READABLE");
 		else
 			flags = g_string_new("GTK_ARG_WRITABLE");
+
+		g_assert(a->get || a->set);
 		
-		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) {
+				error_print(GOB_WARN, a->line_no,
+					    "READWRITE, READABLE and "
+					    "WRITABLE argument flags are "
+					    "set automatically");
+				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]) {
+				error_printf(GOB_WARN, a->line_no,
+					     "Unknown flag '%s' used, "
+					     "perhaps it was misspelled", flag);
+			}
+			g_string_sprintfa(flags, " | GTK_ARG_%s", flag);
+		}
 
 		s = g_strdup(a->name);
 		g_strup(s);
-		out_printf(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",
-			typebase,a->name,a->gtktype,flags->str,s);
+			typebase, a->name, a->gtktype, flags->str, s);
 		g_free(s);
-		g_string_free(flags,TRUE);
+		g_string_free(flags, TRUE);
 	}
 	
+	out_printf(out, "\n");
+	if(get_arguments > 0)
+		out_printf(out, "\tgtk_object_class->get_arg = ___object_get_arg;\n");
+	if(set_arguments > 0)
+		out_printf(out, "\tgtk_object_class->set_arg = ___object_set_arg;\n");
+}
+
+static void
+print_initializer(Method *m, Variable *v)
+{
+	char *root;
+
+	if(v->initializer == NULL)
+		return;
+
+	if(v->scope == PRIVATE_SCOPE)
+		root = g_strconcat(((FuncArg *)m->args->data)->name,
+				   "->_priv", NULL);
+	else
+		root = g_strdup(((FuncArg *)m->args->data)->name);
+
+	if(v->initializer_line > 0)
+		out_addline_infile(out, v->initializer_line);
+
+	out_printf(out, "\t%s->%s = %s;\n",
+		   root, v->id, v->initializer);
+
+	if(v->initializer_line > 0)
+		out_addline_outfile(out);
+
+	g_free(root);
+}
+
+static void
+print_destructor(Variable *v)
+{
+	char *root;
+
+	if(v->destructor == NULL)
+		return;
+
+	if(v->scope == PRIVATE_SCOPE)
+		root = "self->_priv";
+	else
+		root = "self";
+
+	if(v->destructor_simple) {
+		if(v->destructor_line > 0)
+			out_addline_infile(out, v->destructor_line);
+
+		out_printf(out, "\tif(%s->%s) { "
+			   "((*(void (*)(void *))%s)) (%s->%s); "
+			   "%s->%s = NULL; }\n",
+			   root, v->id, v->destructor, root, v->id,
+			   root, v->id);
+
+		if(v->destructor_line > 0)
+			out_addline_outfile(out);
+	} else {
+		out_printf(out, "#define VAR (%s->%s)\n", root, v->id);
+		out_printf(out, "\t{\n");
+		if(v->destructor_line > 0)
+			out_addline_infile(out, v->destructor_line);
+
+		out_printf(out, "\t%s}\n", v->destructor);
+
+		if(v->destructor_line > 0)
+			out_addline_outfile(out);
+		out_printf(out, "\tmemset(&VAR, 0, sizeof(VAR));\n");
+		out_printf(out, "#undef VAR\n");
+	}
+}
+
+static void
+add_destroy(Class *c)
+{
+	out_printf(out, "\nstatic void\n"
+		   "___destroy(GtkObject *obj_self)\n"
+		   "{\n");
 	out_printf(out,
-		   "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
-		   "\tgtk_object_class->get_arg = __object_get_arg;\n");
+		   "#define __GOB_FUNCTION__ \"%s::destroy\"\n",
+		   c->otype);
+
+	if(destructors > 0) {
+		out_printf(out, "\t%s *self = %s (obj_self);\n",
+			   typebase, macrobase);
+	}
+
+	if(destroy_handler) {
+		/* so we get possible bad argument warning */
+		if(destroy_handler->line_no > 0)
+			out_addline_infile(out, destroy_handler->line_no);
+		out_printf(out, "\t___%x_%s_destroy(obj_self);\n",
+			   (guint)destroy_handler->unique_id, funcbase);
+		if(destroy_handler->line_no > 0)
+			out_addline_outfile(out);
+	} else {
+		out_printf(out,
+			   "\tif(GTK_OBJECT_CLASS(parent_class)->destroy) \\\n"
+			   "\t\t(* GTK_OBJECT_CLASS(parent_class)->destroy)(obj_self);\n");
+	}
+
+	if(destructors > 0) {
+		GList *li;
+		for(li = ((Class *)class)->nodes;
+		    li != NULL;
+		    li = li->next) {
+			Node *n = li->data;
+			Variable *v = (Variable *)n;
+			if(n->type == VARIABLE_NODE &&
+			   v->scope != CLASS_SCOPE)
+				print_destructor(v);
+		}
+	}
+
+	out_printf(out, "\treturn;\n");
+	if(destructors > 0)
+		out_printf(out, "\tself = NULL;\n");
+	out_printf(out, "}\n"
+		   "#undef __GOB_FUNCTION__\n\n");
+}
+
+static void
+add_finalize(Class *c)
+{
+	/* Sort of a hack to make it work with gtk+ 1.3/2.0 */
+	out_printf(out,
+		   "\n#ifdef G_OBJECT_CLASS\n"
+		   "static void\n"
+		   "___finalize(GObject *obj_self)\n"
+		   "#else /* !G_OBJECT_CLASS */\n"
+		   "static void\n"
+		   "___finalize(GtkObject *obj_self)\n"
+		   "#endif /* G_OBJECT_CLASS */\n"
+		   "{\n");
+	out_printf(out,
+		   "#define __GOB_FUNCTION__ \"%s::finalize\"\n",
+		   c->otype);
+
+	if(privates > 0) {
+		out_printf(out, "\t%s *self = %s (obj_self);\n",
+			   typebase, macrobase);
+		out_printf(out, "\tgpointer priv = self->_priv;\n");
+	}
+
+	if(finalize_handler) {
+		/* so we get possible bad argument warning */
+		if(finalize_handler->line_no > 0)
+			out_addline_infile(out, finalize_handler->line_no);
+		out_printf(out, "\t___%x_%s_finalize(obj_self);\n",
+			   (guint)finalize_handler->unique_id, funcbase);
+		if(finalize_handler->line_no > 0)
+			out_addline_outfile(out);
+	} else {
+		/* Sort of a hack to make it work with gtk+ 1.3/2.0 */
+		out_printf(out,
+			   "#ifdef G_OBJECT_CLASS\n"
+			   "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n"
+			   "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"
+			   "#else /* !G_OBJECT_CLASS */\n"
+			   "\tif(GTK_OBJECT_CLASS(parent_class)->finalize) \\\n"
+			   "\t\t(* GTK_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"
+			   "#endif /* G_OBJECT_CLASS */\n");
+	}
+
+	if(privates > 0) {
+		out_printf(out, "\tg_free(priv);\n");
+	}
+
+	out_printf(out, "}\n"
+		   "#undef __GOB_FUNCTION__\n\n");
 }
 
 static void
@@ -684,82 +1347,170 @@ add_inits(Class *c)
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Method *m;
+
+		gboolean add_unused_class = FALSE;
+
 		if(n->type != METHOD_NODE)
 			continue;
 		m = (Method *)n;
-		if(m->scope == INIT_METHOD) {
-			if(m->line_no>0)
-				out_addline_infile(out,m->line_no);
-			print_method(out,"static ","\n"," ","",m);
-			if(m->line_no>0)
+		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, FALSE, TRUE);
+			if(m->line_no > 0)
 				out_addline_outfile(out);
-			out_printf(out,"{\n");
-		} else if(m->scope == CLASS_INIT_METHOD) {
-			if(m->line_no>0)
-				out_addline_infile(out,m->line_no);
-			print_method(out,"static ","\n"," ","",m);
-			if(m->line_no>0)
+			out_printf(out, "{\n"
+				   "#define __GOB_FUNCTION__ \"%s::init\"\n",
+				   c->otype);
+			if(privates > 0) {
+				out_printf(out, "\t%s->_priv = "
+					   "g_new0 (%sPrivate, 1);\n",
+					   ((FuncArg *)m->args->data)->name,
+					   typebase);
+			} else if(always_private_struct) {
+				out_printf(out, "\t%s->_priv = NULL;\n",
+					   ((FuncArg *)m->args->data)->name);
+			}
+			if(initializers > 0) {
+				GList *li;
+				for(li = ((Class *)class)->nodes;
+				    li != NULL;
+				    li = li->next) {
+					Node *n = li->data;
+					Variable *v = (Variable *)n;
+					if(n->type != VARIABLE_NODE ||
+					   v->scope == CLASS_SCOPE)
+						continue;
+					print_initializer(m, v);
+				}
+			}
+		} else if(m->method == CLASS_INIT_METHOD) {
+			gboolean did_base_obj = FALSE;
+
+			if(m->line_no > 0)
+				out_addline_infile(out, m->line_no);
+			print_method(out, "static ", "\n", "", " ", "\n",
+				     m, FALSE, FALSE, TRUE);
+			if(m->line_no > 0)
 				out_addline_outfile(out);
-			out_printf(out,"{\n");
-			if(signals>0 ||
-			   arguments>0 ||
-			   overrides>0)
+			out_printf(out, "{\n"
+				   "#define __GOB_FUNCTION__ \"%s::class_init\"\n",
+				   c->otype);
+			if(signals > 0 ||
+			   set_arguments > 0 ||
+			   get_arguments > 0 ||
+			   need_destroy ||
+			   need_finalize) {
+				add_unused_class = TRUE;
 				out_printf(out,
 					   "\tGtkObjectClass *"
 					   "gtk_object_class = "
 					   "(GtkObjectClass*) %s;\n",
 					   ((FuncArg *)m->args->data)->name);
-			
-			if(overrides>0)
+				out_printf(out,
+					   "#ifdef G_OBJECT_CLASS\n"
+					   "\tGObjectClass *"
+					   "g_object_class = "
+					   "(GObjectClass*) %s;\n"
+					   "#endif /* G_OBJECT_CLASS */\n",
+					   ((FuncArg *)m->args->data)->name);
+				did_base_obj = TRUE;
+			}
+
+			if(overrides > 0)
 				add_overrides(c,
-					      ((FuncArg *)m->args->data)->name);
+					      ((FuncArg *)m->args->data)->name,
+					      did_base_obj);
+
+			if(initializers > 0) {
+				GList *li;
+				for(li = ((Class *)class)->nodes;
+				    li != NULL;
+				    li = li->next) {
+					Node *n = li->data;
+					Variable *v = (Variable *)n;
+					if(n->type == VARIABLE_NODE &&
+					   v->scope == CLASS_SCOPE)
+						print_initializer(m, v);
+				}
+			}
 			
-			out_printf(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);
 
-			if(signals>0)
+			if(signals > 0)
 				add_signals(c);
 
 			set_def_handlers(c, ((FuncArg *)m->args->data)->name);
+
+			/* if there are no handlers for these things, we
+			 * need to set them up here */
+			if(need_destroy && !destroy_handler)
+				out_printf(out, "\tgtk_object_class->destroy "
+					   "= ___destroy;\n");
+			if(need_finalize && !finalize_handler)
+				out_printf(out,
+					   "#ifdef G_OBJECT_CLASS\n"
+					   "\tg_object_class->finalize = ___finalize;\n"
+					   "#else /* !G_OBJECT_CLASS */\n"
+					   "\tgtk_object_class->finalize = ___finalize;\n"
+					   "#endif /* G_OBJECT_CLASS */\n");
 			
-			if(arguments>0)
+			if(get_arguments > 0 || set_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_printf(out, " {\n");
+			out_addline_infile(out, m->ccode_line);
+			out_printf(out, "%s\n", m->cbuf);
 			out_addline_outfile(out);
-			out_printf(out," }\n",m->cbuf->str);
-		} else {
-			out_printf(out,"return;\n");
+			out_printf(out, " }\n");
 		}
-		out_printf(out,"}\n");
+		out_printf(out, "\treturn;\n");
+		out_printf(out,
+			   "\t%s = NULL;\n",
+			   ((FuncArg *)m->args->data)->name);
+		if(add_unused_class) {
+			out_printf(out,
+				   "\tgtk_object_class = NULL;\n"
+				   "#ifdef G_OBJECT_CLASS\n"
+				   "\tg_object_class = NULL;\n"
+				   "#endif /* G_OBJECT_CLASS */\n");
+		}
+		out_printf(out, "}\n"
+			   "#undef __GOB_FUNCTION__\n");
 	}
 }
 
 static void
-add_getset_arg(Class *c, int is_set)
+add_getset_arg(Class *c, gboolean is_set)
 {
 	GList *li;
-	out_printf(out,"\nstatic void\n"
-		"__object_%s_arg (GtkObject *object,\n"
-		"\tGtkArg *arg,\n"
-		"\tguint arg_id)\n"
-		"{\n"
-		"\t%s *this;\n\n"
-		"\tthis = %s (object);\n\n"
-		"\tswitch (arg_id) {\n",
-		is_set?"set":"get",typebase,macrobase);
+	out_printf(out, "\nstatic void\n"
+		   "___object_%s_arg (GtkObject *object,\n"
+		   "\tGtkArg *arg,\n"
+		   "\tguint arg_id)\n"
+		   "#define __GOB_FUNCTION__ \"%s::%s_arg\"\n"
+		   "{\n"
+		   "\t%s *self;\n\n"
+		   "\tself = %s (object);\n\n"
+		   "\tswitch (arg_id) {\n",
+		   is_set ? "set" : "get",
+		   c->otype, is_set ? "set" : "get",
+		   typebase, macrobase);
 
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Argument *a;
 		char *s;
-		GString *cbuf;
+		char *cbuf;
 		int line_no;
 		if(n->type != ARGUMENT_NODE)
 			continue;
@@ -775,69 +1526,119 @@ add_getset_arg(Class *c, int is_set)
 			continue;
 		s = g_strdup(a->name);
 		g_strup(s);
-		out_printf(out,"\tcase ARG_%s:\n"
-			"#define ARG (GTK_VALUE_%s(*arg))\n"
-			"\t\t{\n",
-			s,a->gtktype);
+		out_printf(out, "\tcase ARG_%s:\n", s);
+		if(is_set && a->atype) {
+			char *cast = get_type(a->atype, TRUE);
+			if(no_gnu || for_cpp) {
+				out_printf(out, "#define ARG "
+					   "((%s)GTK_VALUE_%s(*arg))\n",
+					   cast, a->gtktype);
+			} else {
+				out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
+				if(strcmp(a->gtktype, "OBJECT")==0) {
+					out_printf(out, "#define ARG "
+						   "({%s foo = "
+						   "GTK_VALUE_POINTER(*arg); "
+						   "foo; })\n",
+						   cast);
+				} else {
+					out_printf(out, "#define ARG "
+						   "({%s foo = "
+						   "GTK_VALUE_%s(*arg); "
+						   "foo; })\n",
+						   cast, a->gtktype);
+				}
+				out_printf(out, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n");
+				out_printf(out, "#define ARG "
+					   "((%s)GTK_VALUE_%s(*arg))\n",
+					   cast, a->gtktype);
+				out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n");
+			}
+			out_printf(out, "\t\t{\n");
+			g_free(cast);
+		} else if(!is_set && strcmp(a->gtktype, "OBJECT")==0) {
+			out_printf(out,
+				   "#define ARG (GTK_VALUE_POINTER(*arg))\n"
+				   "\t\t{\n");
+		} else {
+			out_printf(out,
+				   "#define ARG (GTK_VALUE_%s(*arg))\n"
+				   "\t\t{\n",
+				   a->gtktype);
+		}
 		g_free(s);
-		out_addline_infile(out,line_no);
-		out_printf(out,"%s\n",cbuf->str);
-		out_addline_outfile(out);
-		out_printf(out,"\t\t}\n\t\tbreak;\n"
+		if(line_no > 0)
+			out_addline_infile(out, line_no);
+		out_printf(out, "%s\n", cbuf);
+		if(line_no > 0)
+			out_addline_outfile(out);
+		out_printf(out, "\t\t}\n\t\tbreak;\n"
 			"#undef ARG\n");
 	}
-	out_printf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
+	out_printf(out, "\tdefault:\n\t\tbreak;\n\t}\n"
+		   "\treturn;\n\tself = NULL;\n\targ = NULL;\n}\n"
+		   "#undef __GOB_FUNCTION__\n");
 }
 
 static void
 print_checks(Method *m, FuncArg *fa)
 {
 	GList *li;
-	int is_void;
-	is_void = (strcmp(m->mtype->name,"void")==0 &&
-		   m->mtype->stars == 0);
+	gboolean is_void;
+	gboolean checked_null = FALSE;
+	is_void = (strcmp(m->mtype->name, "void")==0 &&
+		   m->mtype->pointer == NULL);
 	
-	for(li=fa->checks;li;li=g_list_next(li)) {
+	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 (");
+			out_printf(out, "\tg_return_if_fail (");
 		else
-			out_printf(out,"\tg_return_val_if_fail (");
+			out_printf(out, "\tg_return_val_if_fail (");
 		switch(ch->chtype) {
 		case NULL_CHECK:
-			out_printf(out,"%s != NULL",fa->name);
+			out_printf(out, "%s != NULL", fa->name);
+			checked_null = TRUE;
 			break;
 		case TYPE_CHECK:
-			s = make_is_macro(fa->atype->name);
-			out_printf(out,"%s (%s)",s,fa->name);
+			s = make_pre_macro(fa->atype->name, "IS");
+			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:
-			out_printf(out,"%s < %s",fa->name,ch->number);
+			out_printf(out, "%s < %s", fa->name, ch->number);
 			break;
 		case GT_CHECK:
-			out_printf(out,"%s > %s",fa->name,ch->number);
+			out_printf(out, "%s > %s", fa->name, ch->number);
 			break;
 		case LE_CHECK:
-			out_printf(out,"%s <= %s",fa->name,ch->number);
+			out_printf(out, "%s <= %s", fa->name, ch->number);
 			break;
 		case GE_CHECK:
-			out_printf(out,"%s >= %s",fa->name,ch->number);
+			out_printf(out, "%s >= %s", fa->name, ch->number);
 			break;
 		case EQ_CHECK:
-			out_printf(out,"%s == %s",fa->name,ch->number);
+			out_printf(out, "%s == %s", fa->name, ch->number);
 			break;
 		case NE_CHECK:
-			out_printf(out,"%s != %s",fa->name,ch->number);
+			out_printf(out, "%s != %s", fa->name, ch->number);
 			break;
 		}
 		if(is_void)
-			out_printf(out,");\n");
+			out_printf(out, ");\n");
 		else {
-			out_printf(out,", (");
-			print_type(out,m->mtype);
-			out_printf(out,")%s);\n",
+			out_printf(out, ", (");
+			print_type(out, m->mtype, TRUE);
+			out_printf(out, ")%s);\n",
 				m->onerror?m->onerror:"0");
 		}
 	}
@@ -851,418 +1652,1166 @@ print_preconditions(Method *m)
 	for(li=m->args;li;li=g_list_next(li)) {
 		FuncArg *fa = li->data;
 		if(fa->checks)
-			print_checks(m,fa);
+			print_checks(m, fa);
 	}
+	if(m->line_no>0)
+		out_addline_outfile(out);
 }
 
 static void
 print_method_body(Method *m, int pre)
 {
-	out_printf(out,"{\n");
-	if(pre) {
+	out_printf(out, "{\n"
+		   "#define __GOB_FUNCTION__ \"%s::%s\"\n",
+		   ((Class *)class)->otype,
+		   get_real_id(m->id));
+	if(pre)
 		print_preconditions(m);
-		out_printf(out,"\t{\n");
+
+	/* 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_addline_infile(out,m->ccode_line);
-	out_printf(out,"\t\t%s\n",m->cbuf->str);
-	out_addline_outfile(out);
+	/* Note, there is no \n between the last } and this } so that
+	 * errors/warnings reported on the end of the body get pointed to the
+	 * right line in the .gob source */
+	out_printf(out, "}\n");
 
-	if(pre)
-		out_printf(out,"\t}\n");
-	out_printf(out,"}\n");
+	if(m->cbuf)
+		out_addline_outfile(out);
+	out_printf(out, "#undef __GOB_FUNCTION__\n");
+}
+
+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(NULL);
+	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;
-	out_printf(out,"\n");
-	switch(m->scope) {
-	case PUBLIC_SCOPE:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"","\n"," ","",m);
-		print_method_body(m,TRUE);
-		break;
-	case PRIVATE_SCOPE:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"static ","\n"," ","",m);
-		print_method_body(m,TRUE);
+	char *s, *args, *doc;
+	gboolean is_void;
+	is_void = (strcmp(m->mtype->name, "void")==0 &&
+		   m->mtype->pointer == NULL);
+	out_printf(out, "\n");
+	if(m->method != OVERRIDE_METHOD) {
+		doc = get_gtk_doc(m->id);
+		if(doc) {
+			out_printf(out, "%s", doc);
+			g_free(doc);
+		}
+	}
+	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, FALSE, TRUE);
+		else /* PUBLIC, PROTECTED */
+			print_method(out, "", "\n", "", " ", "\n",
+				     m, FALSE, FALSE, TRUE);
+		print_method_body(m, TRUE);
+		/* the outfile line was added above */
 		break;
 	case SIGNAL_FIRST_METHOD:
 	case SIGNAL_LAST_METHOD:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"","\n"," ","",m);
+		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, FALSE, TRUE);
+		else /* PUBLIC, PROTECTED */
+			print_method(out, "", "\n", "", " ", "\n",
+				     m, FALSE, FALSE, TRUE);
 		out_addline_outfile(out);
-		out_printf(out,"{\n");
-		s = g_strdup(m->id);
+		out_printf(out, "{\n");
+		s = g_strdup(get_real_id(m->id));
 		g_strup(s);
-		if(strcmp(m->mtype->name,"void")==0 &&
-		   m->mtype->stars==0) {
-			GList *li;
+		if(strcmp(m->mtype->name, "void") == 0 &&
+		   m->mtype->pointer == NULL) {
 			print_preconditions(m);
-			out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
-				"\t\tobject_signals[%s_SIGNAL]",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);
-			}
-			out_printf(out,");\n}\n");
+			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);
+			put_signal_args(m);
+			out_printf(out, ");\n}\n");
 		} else {
-			GList *li;
-			out_printf(out,"\t");
-			print_type(out,m->mtype);
-			out_printf(out,"return_val;\n");
+			out_printf(out, "\t");
+			print_type(out, m->mtype, TRUE);
+			out_printf(out, "return_val = (");
+			print_type(out, m->mtype, TRUE);
+			if(m->defreturn)
+				out_printf(out, ")(%s);\n", m->defreturn);
+			else if(m->onerror)
+				out_printf(out, ")(%s);\n", m->onerror);
+			else
+				out_printf(out, ")(0);\n");
 			print_preconditions(m);
-			out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
-				"\t\tobject_signals[%s_SIGNAL]",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);
-			}
-			out_printf(out,",\n\t\t&return_val);\n"
+			out_printf(out, "\tgtk_signal_emit (GTK_OBJECT (%s),\n"
+				"\t\tobject_signals[%s_SIGNAL]",
+				((FuncArg *)m->args->data)->name, s);
+			put_signal_args(m);
+			out_printf(out, ",\n\t\t&return_val);\n"
 				"\treturn return_val;\n}\n");
 		}
 
 		if(!m->cbuf)
 			break;
-		out_addline_infile(out,m->line_no);
-		print_method(out,"static ","\n_real_"," ","",m);
-		print_method_body(m,FALSE);
+		if(m->line_no > 0)
+			out_addline_infile(out, m->line_no);
+		print_method(out, "static ", "\n___real_", "", " ", "\n",
+			     m, FALSE, FALSE, TRUE);
+		print_method_body(m, FALSE);
+		/* the outfile line was added above */
 		break;
 	case VIRTUAL_METHOD:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"","\n"," ","",m);
+		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, FALSE, TRUE);
+		else /* PUBLIC, PROTECTED */
+			print_method(out, "", "\n", "", " ", "\n",
+				     m, FALSE, FALSE, TRUE);
 		out_addline_outfile(out);
-		out_printf(out,"{\n"
-			"\t%sClass *class;\n",typebase);
+		out_printf(out, "{\n"
+			"\t%sClass *klass;\n", typebase);
 		print_preconditions(m);
-		out_printf(out,"\tclass = %s_CLASS(GTK_OBJECT(this)->klass);\n\n"
-			"\tif(class->%s)\n",
-			macrobase,m->id);
-		if(strcmp(m->mtype->name,"void")==0 &&
-		   m->mtype->stars==0) {
+		out_printf(out, "\tklass = %s_GET_CLASS(%s);\n\n"
+			"\tif(klass->%s)\n",
+			macrobase, ((FuncArg *)m->args->data)->name,
+			get_real_id(m->id));
+		if(strcmp(m->mtype->name, "void") == 0 &&
+		   m->mtype->pointer == NULL) {
 			GList *li;
-			out_printf(out,"\t\t(*class->%s)(this",m->id);
+			out_printf(out, "\t\t(*klass->%s)(%s",
+				   get_real_id(m->id),
+				   ((FuncArg *)m->args->data)->name);
 			for(li=m->args->next;li;li=g_list_next(li)) {
 				FuncArg *fa = li->data;
-				out_printf(out,",%s",fa->name);
+				out_printf(out, ",%s", fa->name);
 			}
-			out_printf(out,");\n}\n");
+			out_printf(out, ");\n}\n");
 		} else {
 			GList *li;
-			out_printf(out,"\t\treturn (*class->%s)(this",m->id);
+			out_printf(out, "\t\treturn (*klass->%s)(%s",
+				   get_real_id(m->id),
+				   ((FuncArg *)m->args->data)->name);
 			for(li=m->args->next;li;li=g_list_next(li)) {
 				FuncArg *fa = li->data;
-				out_printf(out,",%s",fa->name);
+				out_printf(out, ",%s", fa->name);
 			}
-			out_printf(out,");\n"
+			out_printf(out, ");\n"
 				"\telse\n"
 				"\t\treturn (");
-			print_type(out,m->mtype);
-			out_printf(out,")(%s);\n}\n",
-				m->onerror?m->onerror:"0");
+			print_type(out, m->mtype, TRUE);
+			if(m->defreturn)
+				out_printf(out, ")(%s);\n}\n", m->defreturn);
+			else if(m->onerror)
+				out_printf(out, ")(%s);\n}\n", m->onerror);
+			else
+				out_printf(out, ")(0);\n}\n");
 		}
 
 		if(!m->cbuf)
 			break;
-		out_addline_infile(out,m->line_no);
-		print_method(out,"static ","\n_real_"," ","",m);
-		print_method_body(m,FALSE);
+		if(m->line_no > 0)
+			out_addline_infile(out, m->line_no);
+		print_method(out, "static ", "\n___real_", "", " ", "\n",
+			     m, FALSE, FALSE, TRUE);
+		print_method_body(m, FALSE);
+		/* the outfile line was added above */
 		break;
 	case OVERRIDE_METHOD:
-		out_addline_infile(out,m->line_no);
-		print_method(out,"static ","\n"," ","",m);
-		print_method_body(m,TRUE);
+		if(!m->cbuf)
+			break;
+		if(m->line_no > 0)
+			out_addline_infile(out, m->line_no);
+		s = g_strdup_printf("\n___%x_", (guint)m->unique_id);
+		print_method(out, "static ", s, "", " ", "\n",
+			     m, FALSE, FALSE, FALSE);
+		g_free(s);
+		out_addline_outfile(out);
+		s = replace_sep(m->otype, '_');
+		g_strup(s);
+		args = get_arg_names_for_macro(m);
+		if(is_void) {
+			out_printf(out, "#define PARENT_HANDLER(%s) \\\n"
+				   "\t{ if(%s_CLASS(parent_class)->%s) \\\n"
+				   "\t\t(* %s_CLASS(parent_class)->%s)(%s); }\n",
+				   args, s, get_real_id(m->id), s, get_real_id(m->id), args);
+		} else {
+			out_printf(out, "#define PARENT_HANDLER(%s) \\\n"
+				   "\t((%s_CLASS(parent_class)->%s)? \\\n"
+				   "\t\t(* %s_CLASS(parent_class)->%s)(%s): \\\n"
+				   "\t\t(",
+				   args, s, get_real_id(m->id), s, get_real_id(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);
+		/* the outfile line was added above */
+		out_printf(out, "#undef PARENT_HANDLER\n");
 		break;
 	default:
 		break;
 	}
 }
 
-static int
-count_signals(Class *c)
+static void
+open_files(void)
 {
-	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)
-				num++;
+	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 ||
+	    private_header == PRIVATE_HEADER_ALWAYS) &&
+	   private_header != PRIVATE_HEADER_NEVER)
+		outfileph = g_strconcat(filebase, "-private.h", NULL);
+	else
+		outfileph = NULL;
+
+	
+	if(no_write) {
+		devnull = fopen("/dev/null", "w");
+		if(!devnull)
+			g_error("Cannot open null device");
+		out = devnull;
+		outh = devnull;
+		if(outfileph)
+			outph = devnull;
+	} else {
+		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);
 		}
 	}
-	return num;
 }
 
-static int
-count_arguments(Class *c)
+static void
+put_argument_nongnu_wrappers(Class *c)
 {
-	int num = 0;
 	GList *li;
 
+	if(get_arguments < 0 && set_arguments < 0)
+		return;
+
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
-		if(n->type == ARGUMENT_NODE)
-			num ++;
+		Argument *a = (Argument *)n;
+		char *aname;
+		char *cast;
+
+		if(n->type != ARGUMENT_NODE)
+			continue;
+
+		aname = g_strdup(a->name);
+		g_strup(aname);
+
+		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, aname, a->name, cast);
+			if(a->get)
+				out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+					   "\"%s\",(%s*)(arg)\n",
+					   macrobase, aname, a->name, cast);
+		} else {
+			if(a->set)
+				out_printf(outh, "#define %s_ARG_%s(arg)    \t"
+					   "\"%s\",(arg)\n",
+					   macrobase, aname, a->name);
+			if(a->get)
+				out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+					   "\"%s\",(arg)\n",
+					   macrobase, aname, a->name);
+		}
+		g_free(cast);
+		g_free(aname);
+	}
+}
+
+static void
+put_argument_gnu_wrappers(Class *c)
+{
+	GList *li;
+
+	if(get_arguments < 0 && set_arguments < 0)
+		return;
+
+	for(li=c->nodes;li;li=g_list_next(li)) {
+		Node *n = li->data;
+		Argument *a = (Argument *)n;
+		char *s;
+		char *cast;
+		if(n->type != ARGUMENT_NODE)
+			continue;
+		s = g_strdup(a->name);
+		g_strup(s);
+		if(a->atype)
+			cast = get_type(a->atype, TRUE);
+		else
+			cast = g_strdup(get_cast(a->gtktype, TRUE));
+		if(cast) {
+			if(a->set)
+				out_printf(outh, "#define %s_ARG_%s(arg)    \t"
+					   "\"%s\",({%sz = (arg); z;})\n",
+					   macrobase, s, a->name, cast);
+			if(a->get)
+				out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+					   "\"%s\",({%s*z = (arg); z;})\n",
+					   macrobase, s, a->name, cast);
+		} else {
+			if(a->set)
+				out_printf(outh, "#define %s_ARG_%s(arg)    \t"
+					   "\"%s\",(arg)\n",
+					   macrobase, s, a->name);
+			if(a->get)
+				out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+					   "\"%s\",(arg)\n",
+					   macrobase, s, a->name);
+		}
+		g_free(cast);
+		g_free(s);
+	}
+}
+
+static void
+print_ccode_block(CCode *cc)
+{
+	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;
+	case AT_CCODE:
+		/* AT code is printed exactly like normal 'all'
+		   code but is printed before */
+	case A_CCODE:
+		if(outph) {
+			out_printf(outph, "\n");
+			out_printf(outph, "%s\n", cc->cbuf);
+			out_addline_infile(outph, cc->line_no);
+			out_addline_outfile(outph);
+		}
+		out_printf(outh, "\n");
+		out_printf(outh, "%s\n", cc->cbuf);
+		fp = out;
+		out_printf(fp, "\n");
+		out_addline_infile(fp, cc->line_no);
+		break;
+	default:
+	case C_CCODE:
+		fp = out;
+		out_printf(fp, "\n");
+		out_addline_infile(fp, cc->line_no);
+		break;
+	case PH_CCODE:
+		if(outph)
+			fp = outph;
+		else
+			fp = out;
+		out_printf(fp, "\n");
+		out_addline_infile(fp, cc->line_no);
+		break;
 	}
-	return num;
+	out_printf(fp, "%s\n", cc->cbuf);
+	if(cc->cctype == C_CCODE ||
+	   cc->cctype == A_CCODE ||
+	   cc->cctype == AT_CCODE ||
+	   cc->cctype == PH_CCODE)
+		out_addline_outfile(fp);
 }
 
-static int
-count_overrides(Class *c)
+static void
+print_class_block(Class *c)
 {
-	int num = 0;
 	GList *l;
-	for(l=c->nodes;l;l=g_list_next(l)) {
+	char *s;
+	gboolean printed_private = FALSE;
+
+	if(any_special) {
+		out_printf(out, "/* utility types we may need */\n");
+		if(special_array[SPECIAL_2POINTER])
+			out_printf(out, "typedef struct { "
+				   "gpointer a; gpointer b; "
+				   "} ___twopointertype;\n");
+		if(special_array[SPECIAL_3POINTER])
+			out_printf(out, "typedef struct { "
+				   "gpointer a; gpointer b; "
+				   "gpointer c; "
+				   "} ___threepointertype;\n");
+		if(special_array[SPECIAL_INT_POINTER])
+			out_printf(out, "typedef struct { "
+				   "gint a; gpointer b; "
+				   "} ___intpointertype;\n");
+		out_printf(out, "\n");
+	}
+
+	out_printf(outh, "\n/*\n"
+		   " * Type checking and casting macros\n"
+		   " */\n");
+	out_printf(outh, "#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_CONST(obj)\t"
+		   "GTK_CHECK_CAST((obj), %s_get_type(), %s const)\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);
+	out_printf(outh, "#ifdef GTK_CHECK_GET_CLASS\n"
+		   "#define %s_GET_CLASS(obj)\t"
+		   "GTK_CHECK_GET_CLASS((obj), %s_get_type(), %sClass)\n",
+		   macrobase, funcbase, typebase);
+	out_printf(outh, "#else /* !GTK_CHECK_GET_CLASS */\n"
+		   "#define %s_GET_CLASS(obj)\t"
+		   "((%sClass *)GTK_OBJECT(obj)->klass)\n"
+		   "#endif /* GTK_CHECK_GET_CLASS */\n",
+		   macrobase, typebase);
+
+	if( ! no_self_alias) {
+		out_printf(out, "/* self casting macros */\n");
+		out_printf(out, "#define SELF(x) %s(x)\n", macrobase);
+		out_printf(out, "#define SELF_CONST(x) %s_CONST(x)\n", macrobase);
+		out_printf(out, "#define IS_SELF(x) %s(x)\n", macrois);
+		out_printf(out, "#define SELF_CLASS(x) %s_CLASS(x)\n\n",
+			   macrobase);
+		out_printf(out, "#define SELF_GET_CLASS(x) %s_GET_CLASS(x)\n\n",
+			   macrobase);
+
+		out_printf(out, "/* self typedefs */\n");
+		out_printf(out, "typedef %s Self;\n", typebase);
+		out_printf(out, "typedef %sClass SelfClass;\n\n", typebase);
+	}
+
+	out_printf(out, "/* GTK_CLASS_TYPE for 1.2<->1.3/2.0 GTK+ compatibility */\n");
+	out_printf(out,
+		   "#ifndef GTK_CLASS_TYPE\n"
+		   "#define GTK_CLASS_TYPE(x) (GTK_OBJECT_CLASS(x)->type)\n"
+		   "#endif /* GTK_CLASS_TYPE */\n\n");
+
+	if(privates > 0 || always_private_struct) {
+		out_printf(outh, "\n/* Private structure type */\n");
+		out_printf(outh, "typedef struct _%sPrivate %sPrivate;\n",
+			   typebase, typebase);
+		if(privates == 0)
+			out_printf(outh, "/* There are no privates, this "
+				   "structure is thus never defined */\n");
+	}
+
+	out_printf(outh, "\n/*\n"
+		   " * Main object structure\n"
+		   " */\n");
+	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)) {
+		static gboolean printed_public = FALSE;
+		Node *n = l->data;
+		Variable *v = (Variable *)n;
+		if(n->type == VARIABLE_NODE &&
+		   v->scope == PUBLIC_SCOPE) {
+			if( ! printed_public) {
+				out_printf(outh, "\t/*< public >*/\n");
+				printed_public = TRUE;
+			}
+			put_variable((Variable *)n, outh);
+		}
+	}
+	/* put protecteds always AFTER publics */
+	for(l=c->nodes; l; l=g_list_next(l)) {
+		Node *n = l->data;
+		Variable *v = (Variable *)n;
+		if(n->type == VARIABLE_NODE &&
+		   v->scope == PROTECTED_SCOPE) {
+			if( ! printed_private) {
+				out_printf(outh, "\t/*< private >*/\n");
+				printed_private = TRUE;
+			}
+			put_variable((Variable *)n, outh);
+		}
+	}
+	if(privates > 0 || always_private_struct) {
+		if( ! printed_private)
+			out_printf(outh, "\t/*< private >*/\n");
+		out_printf(outh, "\t%sPrivate *_priv;\n", typebase);
+	}
+	out_printf(outh, "};\n");
+
+	if(privates > 0) {
+		FILE *outfp;
+
+		/* if we are to stick this into the private
+		   header, if not stick it directly into the
+		   C file */
+		if(outph) 
+			outfp = outph;
+		else
+			outfp = out;
+
+		out_printf(outfp, "struct _%sPrivate {\n",
+			   typebase);
+		for(l=c->nodes; l; l=l->next) {
+			Node *n = l->data;
+			Variable *v = (Variable *)n;
+			if(n->type == VARIABLE_NODE &&
+			   v->scope == PRIVATE_SCOPE) {
+				out_addline_infile(outfp, v->line_no);
+				put_variable(v, outfp);
+			}
+		}
+		out_addline_outfile(outfp);
+		out_printf(outfp, "};\n");
+	}
+
+	out_printf(outh, "\n/*\n"
+		   " * Class definition\n"
+		   " */\n");
+	out_printf(outh, "typedef struct _%sClass %sClass;\n",
+		   typebase, typebase);
+	out_printf(outh,
+		   "struct _%sClass {\n\t%sClass __parent__;\n",
+		   typebase, ptypebase);
+	for(l = c->nodes; l != NULL; l = l->next) {
+		Node *n = l->data;
+		if(n->type == METHOD_NODE)
+			put_vs_method((Method *)n);
+	}
+	/* put class scope variables */
+	for(l = c->nodes; l != NULL; l = l->next) {
+		Node *n = l->data;
+		Variable *v = (Variable *)n;
+		if(n->type == VARIABLE_NODE &&
+		   v->scope == CLASS_SCOPE)
+			put_variable((Variable *)n, outh);
+	}
+	out_printf(outh, "};\n\n");
+
+	out_printf(out, "/* here are local prototypes */\n");
+	if(set_arguments > 0) {
+		out_printf(out, "static void ___object_set_arg "
+			   "(GtkObject *object, GtkArg *arg, "
+			   "guint arg_id);\n");
+	}
+	if(get_arguments > 0) {
+		out_printf(out, "static void ___object_get_arg "
+			   "(GtkObject *object, GtkArg *arg, "
+			   "guint arg_id);\n");
+	}
+
+	out_printf(outh, "\n/*\n"
+		   " * Public methods\n"
+		   " */\n");
+
+	out_printf(outh, "GtkType\t%s_get_type\t(void)", funcbase);
+	if ( ! no_gnu) {
+		out_printf(outh, " G_GNUC_CONST;\n");
+	} else {
+		out_printf(outh, ";\n");
+	}
+
+	for(l = c->nodes; l != NULL; l = l->next) {
 		Node *n = l->data;
 		if(n->type == METHOD_NODE) {
-			Method *m = (Method *)n;
-			if(m->scope == OVERRIDE_METHOD)
-				num++;
+			put_pub_method((Method *)n);
+			put_prot_method((Method *)n);
+			put_priv_method_prot((Method *)n);
 		}
 	}
-	return num;
+
+/* this idea is less and less apealing to me */
+#if 0
+	if(!no_signal_connect) {
+		if(signals>0) {
+			out_printf(outh, "\n/*\n"
+				   " * Signal connection methods\n"
+				   " */\n");
+		}
+
+		for(l=c->nodes;l;l=g_list_next(l)) {
+			Node *n = l->data;
+			if(n->type == METHOD_NODE)
+				put_signal_connect((Method *)n);
+		}
+	}
+#endif
+
+
+	/* argument wrapping macros */
+	if(get_arguments > 0 || set_arguments > 0) {
+		if( ! no_gnu) {
+			out_printf(outh, "\n/*\n"
+				   " * Argument wrapping macros\n"
+				   " */\n");
+			out_printf(outh, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
+			put_argument_gnu_wrappers(c);
+			out_printf(outh, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n");
+			put_argument_nongnu_wrappers(c);
+			out_printf(outh, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n");
+		} else {
+			out_printf(outh, "\n/*\n"
+				   " * Argument wrapping macros\n"
+				   " */\n");
+			put_argument_nongnu_wrappers(c);
+		}
+	}
+
+	if(signals > 0) {
+		for(l = c->nodes; l != NULL; l = l->next) {
+			Node *n = l->data;
+			if(n->type == METHOD_NODE)
+				add_signal_prots((Method *)n);
+		}
+	}
+
+	add_enums(c);
+
+	add_get_type();
+
+	if(any_method_to_alias(c)) {
+		if( ! no_gnu) {
+			out_printf(out, "/* Short form macros */\n");
+			out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
+			make_method_gnu_aliases(c);
+			out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n");
+		}
+		make_method_nongnu_aliases(c);
+	}
+
+	out_printf(out, "/* a macro for creating a new object of our type */\n");
+	out_printf(out,
+		   "#define GET_NEW ((%s *)gtk_type_new(%s_get_type()))\n\n",
+		   typebase, funcbase);
+
+	if(need_destroy)
+		add_destroy(c);
+
+	if(need_finalize)
+		add_finalize(c);
+
+	add_inits(c);
+
+	if(set_arguments > 0) {
+		add_getset_arg(c, TRUE);
+	}
+
+	if(get_arguments > 0) {
+		add_getset_arg(c, FALSE);
+	}
+
+	for(l = c->nodes; l != NULL; l = l->next) {
+		Node *n = l->data;
+		if(n->type == METHOD_NODE)
+			put_method((Method *)n);
+	}
+
+	add_bad_hack_to_avoid_unused_warnings(c);
 }
 
+static void
+print_version_macros(void)
+{
+	int major=0, minor=0, pl=0;
+	sscanf(VERSION, "%d.%d.%d", &major, &minor, &pl);
+
+	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
-open_files(void)
+print_file_comments(void)
+{
+	time_t curtime;
+	time(&curtime);
+	out_printf(outh, "/* Generated by GOB (v%s)"
+		   "   (do not edit directly) */\n\n", VERSION);
+	if(outph)
+		out_printf(outph, "/* Generated by GOB (v%s)"
+			   "   (do not edit directly) */\n\n", VERSION);
+	out_printf(out, "/* Generated by GOB (v%s) on %s"
+		   "   (do not edit directly) */\n\n",
+		   VERSION, ctime(&curtime));
+
+	out_printf(out, "/* End world hunger, donate to the World Food Programme, http://www.wfp.org */\n\n");
+}
+
+static void
+print_includes(void)
 {
-	char *outfile,*outfileh;
+	gboolean found_header;
+	char *p;
 
-	outfile = g_strconcat(filebase,".c",NULL);
-	outfileh = g_strconcat(filebase,".h",NULL);
-	
-	out = fopen(outfile,"w");
-	if(!out) {
-		g_error("Cannot open outfile: %s",outfile);
+	/* We may need string.h for memset */
+	if(destructors > 0 &&
+	   ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
+		out_printf(out, "#include <string.h> /* memset() */\n\n");
+	}
+
+	p = g_strconcat(filebase, ".h", NULL);
+	found_header = TRUE;
+	if( ! g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) {
+		out_printf(out, "#include \"%s.h\"\n\n", filebase);
+		found_header = FALSE;
 	}
-	outh = fopen(outfileh,"w");
-	if(!outh) {
-		g_error("Cannot open outfile: %s",outfileh);
+	g_free(p);
+
+	/* if we are creating a private header see if it was included */
+	if(outph) {
+		p = g_strconcat(filebase, "-private.h", NULL);
+		if( ! g_list_find_custom(include_files, p,
+					 (GCompareFunc)strcmp)) {
+			out_printf(out, "#include \"%s-private.h\"\n\n",
+				   filebase);
+			if(found_header)
+				error_printf(GOB_WARN, 0,
+					    "Implicit private header include "
+					    "added to top of\n"
+					    "\tsource file, while public "
+					    "header is at a custom location, "
+					    "you should\n"
+					    "\texplicitly include "
+					    "the private header below the "
+					    "public one.");
+		}
+		g_free(p);
 	}
 }
 
 static void
-generate_outfiles(void)
+print_header_prefixes(void)
 {
 	char *p;
-	GList *li;
-	time_t curtime;
 
-	time(&curtime);
-	out_printf(outh,"/* Generated by GOB (v%s) on %s"
-	       "   (do not edit directly) */\n\n",VERSION,ctime(&curtime));
-	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,'_');
+	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);
+	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);
 
-	out_printf(outh,"#ifdef __cplusplus\n"
-		"extern \"C\" {\n"
-		"#endif /* __cplusplus */\n\n");
-	
-	out_printf(out,"#include \"%s.h\"\n\n",filebase);
-	
-	for(li=nodes;li;li=g_list_next(li)) {
+	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");
+	}
+}
+
+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\n");
+	if(outph) {
+		if( ! no_extern_c)
+			out_printf(outph, "\n#ifdef __cplusplus\n"
+				   "}\n"
+				   "#endif /* __cplusplus */\n");
+		out_printf(outph, "\n#endif\n");
+	}
+}
+
+static void
+print_all_top(void)
+{
+	GList *li;
+
+	/* print the AT_CCODE blocks */
+	for(li = nodes; li != NULL; li = li->next) {
 		Node *node = li->data;
 		if(node->type == CCODE_NODE) {
 			CCode *cc = (CCode *)node;
-			FILE *fp;
-			if(cc->header)
-				fp = outh;
-			else {
-				fp = out;
-				out_addline_infile(fp,cc->line_no);
-			}
-			out_printf(fp,"\n%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;
+			if(cc->cctype == AT_CCODE)
+				print_ccode_block((CCode *)node);
+		}
+	}
+}
 
-			signals = count_signals(c);
-			arguments = count_arguments(c);
-			overrides = count_overrides(c);
-			
-			out_printf(outh,"\n#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);
-
-			otype = remove_sep(c->otype);
-			ptype = remove_sep(c->ptype);
-			out_printf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
-			out_printf(outh,"struct _%s {\n\t%s __parent__;\n",
-				   otype,ptype);
-			for(l=c->nodes;l;l=g_list_next(l)) {
-				Node *n = l->data;
-				if(n->type == VARIABLE_NODE)
-					put_variable((Variable *)n);
-			}
-			out_printf(outh,"};\n");
-
-			out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
-				otype,otype);
-			out_printf(outh,
-				"struct _%sClass {\n\t%sClass __parent__;\n",
-				otype,ptype);
-			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");
+static void
+print_header_top(void)
+{
+	GList *li;
 
-			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");
-			}
+	/* mandatory include */
+	out_printf(outh, "#include <gtk/gtk.h>\n\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);
-				}
-			}
+	/* 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);
+		}
+	}
+}
 
-			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();
+static void
+generate_outfiles(void)
+{
+	GList *li;
 
-			def_methods(c);
+	print_file_comments();
 
-			out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
-				funcbase);
-			
-			add_inits(c);
+	print_all_top();
 
-			if(arguments>0) {
-				add_getset_arg(c, TRUE);
-				add_getset_arg(c, FALSE);
-			}
+	print_header_top();
 
-			for(l=c->nodes;l;l=g_list_next(l)) {
-				Node *n = l->data;
-				if(n->type == METHOD_NODE) {
-					put_method((Method *)n);
-				}
-			}
+	print_header_prefixes();
 
-			out_printf(out,"#undef GET_NEW\n");
+	print_version_macros();
 
-			undef_methods(c);
+	print_includes();
 
-			g_free(otype);
-			g_free(ptype);
+	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 &&
+			   cc->cctype != AT_CCODE)
+				print_ccode_block((CCode *)node);
+		} else if(node->type == CLASS_NODE) {
+			print_class_block((Class *)node);
 		} else
 			g_assert_not_reached();
 	}
 
-	out_printf(outh,"\n#ifdef __cplusplus\n"
-		"}\n"
-		"#endif /* __cplusplus */\n\n"
-		"#endif");
+	print_header_postfixes();
 }
 
 static void
-usage(poptContext optCon, int exitcode, char *error, char *addl)
+print_help(void)
 {
-	poptPrintUsage(optCon, stderr, 0);
-	if (error) fprintf(stderr, "%s: %s", error, addl);
-	exit(exitcode);
+	fprintf(stderr, "Gob version %s\n\n", VERSION);
+	fprintf(stderr, "gob [options] file.gob\n\n");
+	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,\n"
+		"\t                        even if it would be empty "
+		                          "[default]\n"
+		"\t--ondemand-private-header Create private header only when "
+					  "needed\n"
+		"\t--no-private-header     Don't create a private header, "
+					  "put private\n"
+	  	"\t                        structure and protected "
+					  "prototypes inside c file\n"
+		"\t--always-private-struct Always create a private pointer "
+					  "in\n"
+		"\t                        the object structure\n"
+		"\t--no-write,-n           Don't write output files, just "
+					  "check syntax\n"
+		"\t--no-lines              Don't print '#line' to output\n"
+		"\t--no-self-alias         Don't create self type and macro "
+		                          "aliases\n"
+		"\t--no-kill-underscores   Don't remove the leading underscore "
+		                          "from\n"
+		"\t                        short id names\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], "--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) {
+			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], "--ondemand-private-header")==0) {
+			private_header = PRIVATE_HEADER_ONDEMAND;
+		} else if(strcmp(argv[i], "--always-private-header")==0) {
+			private_header = PRIVATE_HEADER_ALWAYS;
+		} else if(strcmp(argv[i], "--no-private-header")==0) {
+			private_header = PRIVATE_HEADER_NEVER;
+		} 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], "--no-write")==0) {
+			no_write = TRUE;
+		} else if(strcmp(argv[i], "--no-lines")==0) {
+			no_lines = TRUE;
+		} else if(strcmp(argv[i], "--no-self-alias")==0) {
+			no_self_alias = TRUE;
+		} else if(strcmp(argv[i], "--no-kill-underscores")==0) {
+			no_kill_underscores = TRUE;
+		} else if(strcmp(argv[i], "--always-private-struct")==0) {
+			always_private_struct = 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;
+			for(p = argv[i] + 1; *p; p++) {
+				switch(*p) {
+				case 'w':
+					exit_on_warn=TRUE;
+					break;
+				case 'n':
+					no_write = TRUE;
+					break;
+				case 'h':
+				case '?':
+					print_help();
+					exit(0);
+				default:
+					fprintf(stderr,
+						"Unknown option '%c'!\n", *p);
+					print_help();
+					exit(1);
+				}
+			}
+		}
+	}
+}
+
+/* this is a somewhat ugly hack, but it appears to work */
+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)
+				error_printf(GOB_ERROR, 0,
+					     "Can't remove new header file");
+			g_free(hfnew);
+			g_free(hf);
+			g_free(s);
+			return;
+		}
+		g_free(s);
+		if(unlink(hf) != 0)
+			error_printf(GOB_ERROR, 0,
+				     "Can't remove old header file");
+	}
+	if(rename(hfnew, hf) != 0)
+		error_printf(GOB_ERROR, 0,
+			     "Can't rename new header file");
+	g_free(hfnew);
+	g_free(hf);
+}
 
 int
 main(int argc, char *argv[])
 {
-	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;
-	}
+	parse_options(argc, argv);
 	
 	if(filename) {
-		yyin = fopen(filename,"r");
+		yyin = fopen(filename, "r");
 		if(!yyin) {
-			fprintf(stderr,"Error: can't open file '%s'\n",
+			fprintf(stderr, "Error: can't open file '%s'\n",
 				filename);
 			exit(1);
 		}
 	} else
 		filename = "stdin";
 
+	/* This is where parsing is done */
 	/*yydebug = 1;*/
-	if(yyparse()!=0)
+	if(yyparse() != 0)
 		g_error("Parsing errors, quitting");
-	if(!class)
-		print_error(FALSE," no class defined",0);
+
+	if( ! class)
+		error_print(GOB_ERROR, 0, " no class defined");
 	
+
+	exit_on_error = FALSE;
+
+	signals = count_signals((Class *)class);
+	set_arguments = count_set_arguments((Class *)class);
+	get_arguments = count_get_arguments((Class *)class);
+	overrides = count_overrides((Class *)class);
+	privates = count_privates((Class *)class);
+	protecteds = count_protecteds((Class *)class);
+	destructors = count_destructors((Class *)class);
+	initializers = count_initializers((Class *)class);
+
 	make_bases();
-	
 	make_inits((Class *)class);
+	if(destructors > 0) {
+		need_destroy = TRUE;
+		find_destroy((Class *)class);
+	}
+	if(privates > 0) {
+		need_finalize = TRUE;
+		find_finalize((Class *)class);
+	}
+	check_bad_symbols((Class *)class);
+	check_duplicate_symbols((Class *)class);
+	check_duplicate_overrides((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);
+	check_func_arg_checks((Class *)class);
+
+	exit_on_error = TRUE;
 	
+	if(got_error)
+		exit(1);
+
+	any_special = setup_special_array((Class *)class, special_array);
+
 	open_files();
 	
 	generate_outfiles();
 
-	fclose(out);
-	fclose(outh);
+	if(devnull)
+		fclose(devnull);
+	else {
+		fclose(out);
+		fclose(outh);
+		if(outph)
+			fclose(outph);
+	}
+
+	if(no_touch_headers &&
+	   ! no_write)
+		compare_and_move_header();
 	
-	poptFreeContext(optCon);
 	return 0;
 }