X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b9f22ab5a7f4d4bfe0932debf8864a21b5c852cd..refs/tags/v0.0.3:/src/main.c

diff --git a/src/main.c b/src/main.c
index 02db339..be842c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,7 @@
 
 #include "tree.h"
 #include "parse.h"
+#include "out.h"
 
 char *filename = "stdin";
 
@@ -38,7 +39,7 @@ extern FILE * yyin;
 extern Node *class;
 extern GList *nodes;
 
-static char *filebase;
+char *filebase;
 static char *funcbase;
 static char *pfuncbase;
 static char *macrobase;
@@ -46,8 +47,11 @@ static char *macrois;
 static char *typebase;
 static char *ptypebase;
 
-static FILE *out;
-static FILE *outh;
+static int signals = 0;
+static int arguments = 0;
+
+FILE *out;
+FILE *outh;
 
 int exit_on_warn = FALSE;
 
@@ -163,7 +167,7 @@ def_methods(Class *c)
 {
 	GList *li;
 	
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *node = li->data;
 		if(node->type == METHOD_NODE) {
@@ -174,10 +178,10 @@ def_methods(Class *c)
 			   m->scope == OVERRIDE_METHOD)
 				continue;
 			
-			fprintf(out,"#define %s %s_%s\n",m->id,funcbase,m->id); 
+			out_printf(out,"#define %s %s_%s\n",m->id,funcbase,m->id); 
 		}
 	}
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 }
 
 static void
@@ -185,7 +189,7 @@ undef_methods(Class *c)
 {
 	GList *li;
 	
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *node = li->data;
 		if(node->type == METHOD_NODE) {
@@ -196,10 +200,10 @@ undef_methods(Class *c)
 			   m->scope == OVERRIDE_METHOD)
 				continue;
 			
-			fprintf(out,"#undef %s\n",m->id); 
+			out_printf(out,"#undef %s\n",m->id); 
 		}
 	}
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 }
 
 static void
@@ -208,22 +212,22 @@ print_type(FILE *fp, Type *t)
 	char *s;
 	int i;
 	s = remove_sep(t->name);
-	fprintf(fp,"%s ",s); 
+	out_printf(fp,"%s ",s); 
 	g_free(s);
 	
 	for(i=0;i<t->stars;i++)
-		fprintf(fp,"*"); 
+		out_printf(fp,"*"); 
 }
 
 static void
 put_variable(Variable *v)
 {
-	fprintf(outh,"\t");
+	out_printf(outh,"\t");
 	if(v->scope == PRIVATE_SCOPE)
-		fprintf(outh,"/* private */ "); 
+		out_printf(outh,"/* private */ "); 
 	print_type(outh,v->vtype);
 
-	fprintf(outh,"%s;\n",v->id); 
+	out_printf(outh,"%s;\n",v->id); 
 }
 
 static void
@@ -232,21 +236,25 @@ print_method(FILE *fp, char *typeprefix, char *nameprefix,
 {
 	GList *li;
 
-	fprintf(fp,"%s",typeprefix); 
+	out_printf(fp,"%s",typeprefix); 
 	print_type(fp,m->mtype);
-	fprintf(fp,"%s%s_%s%s(",
+	out_printf(fp,"%s%s_%s%s(",
 		nameprefix,funcbase,m->id,namepostfix); 
 	
-	for(li=m->args;li;li=g_list_next(li)) {
-		FuncArg *arg = li->data;
-		print_type(fp,arg->atype);
-		if(li->next)
-			fprintf(fp,"%s, ",arg->name); 
-		else
-			fprintf(fp,"%s",arg->name); 
+	if(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); 
 
+		}
+	} else {
+		out_printf(fp,"void"); 
 	}
-	fprintf(fp,")%s\n",postfix); 
+	out_printf(fp,")%s\n",postfix); 
 }
 
 static void
@@ -333,7 +341,7 @@ make_inits(Class *cl)
 				  (Type *)new_type(0,g_strdup("void")),
 				  NULL,NULL,g_strdup("class_init"),
 				  make_init_args(cl,g_strdup("c"),TRUE),
-				  NULL, NULL,0);
+				  NULL, NULL,0,0);
 		cl->nodes = g_list_prepend(cl->nodes,node);
 	}
 	if(!got_init) {
@@ -341,7 +349,7 @@ make_inits(Class *cl)
 				  (Type *)new_type(0,g_strdup("void")),
 				  NULL,NULL,g_strdup("init"),
 				  make_init_args(cl,g_strdup("o"),FALSE),
-				  NULL, NULL,0);
+				  NULL, NULL,0,0);
 		cl->nodes = g_list_prepend(cl->nodes,node);
 	}
 }
@@ -370,19 +378,19 @@ add_signal_prots(Method *m)
 	
 	g_hash_table_insert(marsh,m,s);
 	
-	fprintf(out,"\ntypedef ");
+	out_printf(out,"\ntypedef ");
 	print_type(out,m->mtype);
 	
-	fprintf(out,"(*%s) (",s);
+	out_printf(out,"(*%s) (",s);
 	
 	for(li=m->args;li;li=g_list_next(li)) {
 		FuncArg *arg = li->data;
 		print_type(out,arg->atype);
-		fprintf(out,", "); 
+		out_printf(out,", "); 
 	}
-	fprintf(out,"gpointer);\n"); 
+	out_printf(out,"gpointer);\n"); 
 	
-	fprintf(out,"\nstatic void\n"
+	out_printf(out,"\nstatic void\n"
 		"marshal_%s (GtkObject * object,\n"
 		"\tGtkSignalFunc func,\n"
 		"\tgpointer func_data,\n"
@@ -391,22 +399,22 @@ add_signal_prots(Method *m)
 	
 	if(strcmp(m->gtktypes->data,"NONE")==0) {
 		int i;
-		fprintf(out, "\t%s rfunc;\n\n"
+		out_printf(out, "\t%s rfunc;\n\n"
 			"\trfunc = (%s)func;\n\n"
 			"\t(*rfunc)((%s *)object",s,s,typebase);
 		if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
 			for(i=0,li=m->gtktypes->next;li;
 			    i++,li=g_list_next(li)) {
-				fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+				out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
 					(char *)li->data,i);
 			}
 		}
-		fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
 	} else {
 		int i;
-		fprintf(out, "\t%s rfunc;\n\t",s);
+		out_printf(out, "\t%s rfunc;\n\t",s);
 		print_type(out,m->mtype);
-		fprintf(out, " *retval;\n\n"
+		out_printf(out, " *retval;\n\n"
 			"\trfunc = (%s)func;\n\n"
 			"\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
 			"\t*retval = (*rfunc)((%s *)object",
@@ -415,11 +423,11 @@ add_signal_prots(Method *m)
 		if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
 			for(i=0,li=m->gtktypes->next;li;
 			    i++,li=g_list_next(li)) {
-				fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+				out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
 					(char *)li->data,i);
 			}
 		}
-		fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+		out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
 	}
 
 }
@@ -428,43 +436,50 @@ static void
 add_enums(Class *c)
 {
 	GList *li;
-	fprintf(out,"\nenum {\n");
-	for(li=c->nodes;li;li=g_list_next(li)) {
-		Node *n = li->data;
-		if(n->type == METHOD_NODE) {
-			Method *m = (Method *)n;
-			if(m->scope == SIGNAL_LAST_METHOD ||
-			   m->scope == SIGNAL_FIRST_METHOD) {
-				char *s = g_strdup(m->id);
-				g_strup(s);
-				fprintf(out,"\t%s_SIGNAL,\n",s);
-				g_free(s);
+	out_printf(out,"\n");
+	if(signals>0) {
+		out_printf(out,"enum {\n");
+		for(li=c->nodes;li;li=g_list_next(li)) {
+			Node *n = li->data;
+			if(n->type == METHOD_NODE) {
+				Method *m = (Method *)n;
+				if(m->scope == SIGNAL_LAST_METHOD ||
+				   m->scope == SIGNAL_FIRST_METHOD) {
+					char *s = g_strdup(m->id);
+					g_strup(s);
+					out_printf(out,"\t%s_SIGNAL,\n",s);
+					g_free(s);
+				}
 			}
 		}
+		out_printf(out,"\tLAST_SIGNAL\n};\n\n");
 	}
-	fprintf(out,"\tLAST_SIGNAL\n"
-		"};\n\n"
-		"enum {\n"
-		"\tARG_0,\n");
-	for(li=c->nodes;li;li=g_list_next(li)) {
-		Node *n = li->data;
-		if(n->type == ARGUMENT_NODE) {
-			Argument *a = (Argument *)n;
-			char *s = g_strdup(a->name);
-			g_strup(s);
-			fprintf(out,"\tARG_%s,\n",s);
-			g_free(s);
+	if(arguments>0) {
+		out_printf(out,"enum {\n\tARG_0,\n");
+		for(li=c->nodes;li;li=g_list_next(li)) {
+			Node *n = li->data;
+			if(n->type == ARGUMENT_NODE) {
+				Argument *a = (Argument *)n;
+				char *s = g_strdup(a->name);
+				g_strup(s);
+				out_printf(out,"\tARG_%s,\n",s);
+				g_free(s);
+			}
 		}
+		out_printf(out, "};\n\n");
 	}
-	fprintf(out, "};\n\n"
-		"static guint object_signals[LAST_SIGNAL] = {0};\n\n"
-		"static %sClass *parent_class = NULL;\n\n",ptypebase);
+
+	if(signals>0)
+		out_printf(out,
+			   "static guint object_signals[LAST_SIGNAL] = {0};\n\n");
+
+	out_printf(out, "static %sClass *parent_class = NULL;\n\n",ptypebase);
 }
 
 static void
 add_get_type(void)
 {
-	fprintf(out, "guint\n"
+	out_printf(out, "guint\n"
 		"%s_get_type (void)\n"
 		"{\n"
 		"\tstatic guint type = 0;\n\n"
@@ -517,7 +532,7 @@ add_overrides(Class *c, char *oname)
 		f = replace_sep(m->otype,'_');
 		g_strdown(f);
 
-		fprintf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
+		out_printf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
 			s,f,s,oname);
 		
 		g_free(f);
@@ -531,7 +546,7 @@ add_signals(Class *c)
 {
 	GList *li;
 
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Method *m;
@@ -556,7 +571,7 @@ add_signals(Class *c)
 		
 		sig = g_strdup(m->id);
 		g_strup(sig);
-		fprintf(out,"\tobject_signals[%s_SIGNAL] =\n"
+		out_printf(out,"\tobject_signals[%s_SIGNAL] =\n"
     			"\t\tgtk_signal_new (\"%s\",\n"
 			"\t\t\tGTK_RUN_%s,\n"
 			"\t\t\tgtk_object_class->type,\n"
@@ -573,13 +588,13 @@ add_signals(Class *c)
 		if(!is_none) {
 			GList *l;
 			for(l=m->gtktypes->next;l;l=g_list_next(l))
-				fprintf(out,",\n\t\t\tGTK_TYPE_%s",
+				out_printf(out,",\n\t\t\tGTK_TYPE_%s",
 					(char *)l->data);
 		}
 
-		fprintf(out,");\n");
+		out_printf(out,");\n");
 	}
-	fprintf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
+	out_printf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
 		"\t\tobject_signals, LAST_SIGNAL);\n\n");
 }
 
@@ -588,7 +603,7 @@ set_def_handlers(Class *c, char *oname)
 {
 	GList *li;
 
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Method *m;
@@ -605,39 +620,25 @@ set_def_handlers(Class *c, char *oname)
 			char *s;
 			s = replace_sep(m->otype,'_');
 			g_strdown(s);
-			fprintf(out,"\t%s_class->%s = %s_%s;\n",
+			out_printf(out,"\t%s_class->%s = %s_%s;\n",
 				s,m->id,funcbase,m->id);
 		} else {
 			if(m->cbuf)
-				fprintf(out,"\t%s->%s = _real_%s_%s;\n",
+				out_printf(out,"\t%s->%s = _real_%s_%s;\n",
 					oname,m->id,funcbase,m->id);
 			else
-				fprintf(out,"\t%s->%s = NULL;\n",
+				out_printf(out,"\t%s->%s = NULL;\n",
 					oname,m->id);
 		}
 	}
 }
 
-static int
-is_arguments(Class *c)
-{
-	GList *li;
-
-	for(li=c->nodes;li;li=g_list_next(li)) {
-		Node *n = li->data;
-		if(n->type == ARGUMENT_NODE)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-
 static void
 make_arguments(Class *c)
 {
 	GList *li;
 
-	fprintf(out,"\n");
+	out_printf(out,"\n");
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Argument *a;
@@ -661,7 +662,7 @@ make_arguments(Class *c)
 
 		s = g_strdup(a->name);
 		g_strup(s);
-		fprintf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
+		out_printf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
 			"\t\tGTK_TYPE_%s,\n"
 			"\t\t%s,\n"
 			"\t\tARG_%s);\n",
@@ -670,11 +671,9 @@ make_arguments(Class *c)
 		g_string_free(flags,TRUE);
 	}
 	
-	if(is_arguments(c)) {
-		fprintf(out,
-			"\n\tgtk_object_class->set_arg = __object_set_arg;\n"
-			"\tgtk_object_class->get_arg = __object_get_arg;\n");
-	}
+	out_printf(out,
+		   "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
+		   "\tgtk_object_class->get_arg = __object_get_arg;\n");
 }
 
 static void
@@ -688,34 +687,49 @@ add_inits(Class *c)
 			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->cbuf)
-				fprintf(out,"{\n%s\n}\n\n",m->cbuf->str);
-			else
-				fprintf(out,"{\n\treturn;\n}\n\n");
+			if(m->line_no>0)
+				out_addline_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);
-			fprintf(out,"{\n"
+			if(m->line_no>0)
+				out_addline_outfile(out);
+			out_printf(out,"{\n"
 				"\tGtkObjectClass *gtk_object_class = "
 				"(GtkObjectClass*) %s;\n",
 				((FuncArg *)m->args->data)->name);
 			
 			add_overrides(c, ((FuncArg *)m->args->data)->name);
 			
-			fprintf(out,"\n\tparent_class = "
+			out_printf(out,"\n\tparent_class = "
 				"gtk_type_class (%s_get_type ());\n",
 				pfuncbase);
 
-			add_signals(c);
+			if(signals>0)
+				add_signals(c);
 
 			set_def_handlers(c, ((FuncArg *)m->args->data)->name);
 			
-			make_arguments(c);
-			
-			if(m->cbuf)
-				fprintf(out," {\n%s\n }\n",m->cbuf->str);
-			fprintf(out,"}\n");
+			if(arguments>0)
+				make_arguments(c);
+		} else
+			continue;
+
+		if(m->cbuf) {
+			out_printf(out," {\n");
+			out_addline_infile(out,m->ccode_line);
+			out_printf(out,"%s\n",m->cbuf->str);
+			out_addline_outfile(out);
+			out_printf(out," }\n",m->cbuf->str);
+		} else {
+			out_printf(out,"return;\n");
 		}
+		out_printf(out,"}\n");
 	}
 }
 
@@ -723,7 +737,7 @@ static void
 add_getset_arg(Class *c, int is_set)
 {
 	GList *li;
-	fprintf(out,"\nstatic void\n"
+	out_printf(out,"\nstatic void\n"
 		"__object_%s_arg (GtkObject *object,\n"
 		"\tGtkArg *arg,\n"
 		"\tguint arg_id)\n"
@@ -737,22 +751,34 @@ add_getset_arg(Class *c, int is_set)
 		Node *n = li->data;
 		Argument *a;
 		char *s;
+		GString *cbuf;
+		int line_no;
 		if(n->type != ARGUMENT_NODE)
 			continue;
 		a = (Argument *)n;
-		if((is_set && !a->set) ||
-		   (!is_set && !a->get))
+		if(is_set) {
+			cbuf = a->set;
+			line_no = a->set_line;
+		} else {
+			cbuf = a->get;
+			line_no = a->get_line;
+		}
+		if(!cbuf)
 			continue;
 		s = g_strdup(a->name);
 		g_strup(s);
-		fprintf(out,"\tcase ARG_%s:\n"
+		out_printf(out,"\tcase ARG_%s:\n"
 			"#define ARG (GTK_VALUE_%s(*arg))\n"
-			"\t\t{\n%s\n\t\t}\n\t\tbreak;\n"
-			"#undef ARG\n",
-			s,a->gtktype,a->set->str);
+			"\t\t{\n",
+			s,a->gtktype);
 		g_free(s);
+		out_addline_infile(out,line_no);
+		out_printf(out,"%s\n",cbuf->str);
+		out_addline_outfile(out);
+		out_printf(out,"\t\t}\n\t\tbreak;\n"
+			"#undef ARG\n");
 	}
-	fprintf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
+	out_printf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
 }
 
 static void
@@ -767,43 +793,43 @@ print_checks(Method *m, FuncArg *fa)
 		Check *ch = li->data;
 		char *s;
 		if(is_void)
-			fprintf(out,"\tg_return_if_fail (");
+			out_printf(out,"\tg_return_if_fail (");
 		else
-			fprintf(out,"\tg_return_val_if_fail (");
+			out_printf(out,"\tg_return_val_if_fail (");
 		switch(ch->chtype) {
 		case NULL_CHECK:
-			fprintf(out,"%s != NULL",fa->name);
+			out_printf(out,"%s != NULL",fa->name);
 			break;
 		case TYPE_CHECK:
 			s = make_is_macro(fa->atype->name);
-			fprintf(out,"%s (%s)",s,fa->name);
+			out_printf(out,"%s (%s)",s,fa->name);
 			g_free(s);
 			break;
 		case LT_CHECK:
-			fprintf(out,"%s < %s",fa->name,ch->number);
+			out_printf(out,"%s < %s",fa->name,ch->number);
 			break;
 		case GT_CHECK:
-			fprintf(out,"%s > %s",fa->name,ch->number);
+			out_printf(out,"%s > %s",fa->name,ch->number);
 			break;
 		case LE_CHECK:
-			fprintf(out,"%s <= %s",fa->name,ch->number);
+			out_printf(out,"%s <= %s",fa->name,ch->number);
 			break;
 		case GE_CHECK:
-			fprintf(out,"%s >= %s",fa->name,ch->number);
+			out_printf(out,"%s >= %s",fa->name,ch->number);
 			break;
 		case EQ_CHECK:
-			fprintf(out,"%s == %s",fa->name,ch->number);
+			out_printf(out,"%s == %s",fa->name,ch->number);
 			break;
 		case NE_CHECK:
-			fprintf(out,"%s != %s",fa->name,ch->number);
+			out_printf(out,"%s != %s",fa->name,ch->number);
 			break;
 		}
 		if(is_void)
-			fprintf(out,");\n");
+			out_printf(out,");\n");
 		else {
-			fprintf(out,", (");
+			out_printf(out,", (");
 			print_type(out,m->mtype);
-			fprintf(out,")%s);\n",
+			out_printf(out,")%s);\n",
 				m->onerror?m->onerror:"0");
 		}
 	}
@@ -824,123 +850,161 @@ print_preconditions(Method *m)
 static void
 print_method_body(Method *m, int pre)
 {
-	fprintf(out,"{\n");
+	out_printf(out,"{\n");
 	if(pre) {
 		print_preconditions(m);
-		fprintf(out,"\t{\n");
+		out_printf(out,"\t{\n");
 	}
 
-	fprintf(out,"\t\t%s\n",m->cbuf->str);
+	out_addline_infile(out,m->ccode_line);
+	out_printf(out,"\t\t%s\n",m->cbuf->str);
+	out_addline_outfile(out);
 
 	if(pre)
-		fprintf(out,"\t}\n");
-	fprintf(out,"}\n");
+		out_printf(out,"\t}\n");
+	out_printf(out,"}\n");
 }
 
 static void
 put_method(Method *m)
 {
 	char *s;
-	fprintf(out,"\n");
-	if(strcmp(m->id,"new")==0) {
-		fprintf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
-			funcbase);
-	}
+	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);
 		break;
 	case SIGNAL_FIRST_METHOD:
 	case SIGNAL_LAST_METHOD:
+		out_addline_infile(out,m->line_no);
 		print_method(out,"","\n"," ","",m);
-		fprintf(out,"{\n");
+		out_addline_outfile(out);
+		out_printf(out,"{\n");
 		s = g_strdup(m->id);
 		g_strup(s);
 		if(strcmp(m->mtype->name,"void")==0 &&
 		   m->mtype->stars==0) {
 			GList *li;
 			print_preconditions(m);
-			fprintf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
+			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;
-				fprintf(out,",\n\t\t%s",fa->name);
+				out_printf(out,",\n\t\t%s",fa->name);
 			}
-			fprintf(out,");\n}\n");
+			out_printf(out,");\n}\n");
 		} else {
 			GList *li;
-			fprintf(out,"\t");
+			out_printf(out,"\t");
 			print_type(out,m->mtype);
-			fprintf(out,"return_val;\n");
+			out_printf(out,"return_val;\n");
 			print_preconditions(m);
-			fprintf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
+			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;
-				fprintf(out,",\n\t\t%s",fa->name);
+				out_printf(out,",\n\t\t%s",fa->name);
 			}
-			fprintf(out,",\n\t\t&return_val);\n"
+			out_printf(out,",\n\t\t&return_val);\n"
 				"\treturn return_val;\n}\n");
 		}
 
 		if(!m->cbuf)
 			break;
+		out_addline_infile(out,m->line_no);
 		print_method(out,"static ","\n_real_"," ","",m);
 		print_method_body(m,FALSE);
 		break;
 	case VIRTUAL_METHOD:
+		out_addline_infile(out,m->line_no);
 		print_method(out,"","\n"," ","",m);
-		fprintf(out,"{\n"
+		out_addline_outfile(out);
+		out_printf(out,"{\n"
 			"\t%sClass *class;\n",typebase);
 		print_preconditions(m);
-		fprintf(out,"\tclass = %s_CLASS(GTK_OBJECT(this)->klass);\n\n"
+		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) {
 			GList *li;
-			fprintf(out,"\t\t(*class->%s)(this",m->id);
+			out_printf(out,"\t\t(*class->%s)(this",m->id);
 			for(li=m->args->next;li;li=g_list_next(li)) {
 				FuncArg *fa = li->data;
-				fprintf(out,",%s",fa->name);
+				out_printf(out,",%s",fa->name);
 			}
-			fprintf(out,");\n}\n");
+			out_printf(out,");\n}\n");
 		} else {
 			GList *li;
-			fprintf(out,"\t\treturn (*class->%s)(this",m->id);
+			out_printf(out,"\t\treturn (*class->%s)(this",m->id);
 			for(li=m->args->next;li;li=g_list_next(li)) {
 				FuncArg *fa = li->data;
-				fprintf(out,",%s",fa->name);
+				out_printf(out,",%s",fa->name);
 			}
-			fprintf(out,");\n"
+			out_printf(out,");\n"
 				"\telse\n"
 				"\t\treturn (");
 			print_type(out,m->mtype);
-			fprintf(out,")(%s);\n}\n",
+			out_printf(out,")(%s);\n}\n",
 				m->onerror?m->onerror:"0");
 		}
 
 		if(!m->cbuf)
 			break;
+		out_addline_infile(out,m->line_no);
 		print_method(out,"static ","\n_real_"," ","",m);
 		print_method_body(m,FALSE);
 		break;
 	case OVERRIDE_METHOD:
+		out_addline_infile(out,m->line_no);
 		print_method(out,"static ","\n"," ","",m);
 		print_method_body(m,TRUE);
 		break;
 	default:
 		break;
 	}
-	if(strcmp(m->id,"new")==0)
-		fprintf(out,"#undef GET_NEW\n");
 }
 
+static int
+count_signals(Class *c)
+{
+	int num = 0;
+	GList *l;
+	for(l=c->nodes;l;l=g_list_next(l)) {
+		Node *n = l->data;
+		if(n->type == METHOD_NODE) {
+			Method *m = (Method *)n;
+			if(m->scope == SIGNAL_LAST_METHOD ||
+			   m->scope == SIGNAL_FIRST_METHOD)
+				num++;
+		}
+	}
+	return num;
+}
+
+static int
+count_arguments(Class *c)
+{
+	int num = 0;
+	GList *li;
+
+	for(li=c->nodes;li;li=g_list_next(li)) {
+		Node *n = li->data;
+		if(n->type == ARGUMENT_NODE)
+			num ++;
+	}
+	return num;
+}
+
+
+
 static void
 open_files(void)
 {
@@ -967,22 +1031,22 @@ generate_outfiles(void)
 	time_t curtime;
 
 	time(&curtime);
-	fprintf(outh,"/* Generated by GOB (v%s) on %s"
+	out_printf(outh,"/* Generated by GOB (v%s) on %s"
 	       "   (do not edit directly) */\n\n",VERSION,ctime(&curtime));
-	fprintf(out,"/* Generated by GOB (v%s) on %s"
+	out_printf(out,"/* Generated by GOB (v%s) on %s"
 	       "   (do not edit directly) */\n\n",VERSION,ctime(&curtime));
 	
 	p = replace_sep(((Class *)class)->otype,'_');
 	g_strup(p);
-	fprintf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
+	out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
 		"#include <gtk/gtk.h>\n\n",p,p);
 	g_free(p);
 
-	fprintf(outh,"#ifdef __cplusplus\n"
+	out_printf(outh,"#ifdef __cplusplus\n"
 		"extern \"C\" {\n"
 		"#endif /* __cplusplus */\n\n");
 	
-	fprintf(out,"#include \"%s.h\"\n\n",filebase);
+	out_printf(out,"#include \"%s.h\"\n\n",filebase);
 	
 	for(li=nodes;li;li=g_list_next(li)) {
 		Node *node = li->data;
@@ -991,39 +1055,46 @@ generate_outfiles(void)
 			FILE *fp;
 			if(cc->header)
 				fp = outh;
-			else
+			else {
 				fp = out;
-			fprintf(fp,"\n%s\n",cc->cbuf->str);
+				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;
+
+			signals = count_signals(c);
+			arguments = count_arguments(c);
 			
-			fprintf(outh,"\n#define %s(obj)\t"
+			out_printf(outh,"\n#define %s(obj)\t"
 				"GTK_CHECK_CAST((obj),%s_get_type(),%s)\n",
 				macrobase,funcbase,typebase);
-			fprintf(outh,"#define %s_CLASS(klass)\t"
+			out_printf(outh,"#define %s_CLASS(klass)\t"
 				"GTK_CHECK_CLASS_CAST((klass),%s_get_type(),%sClass)\n",
 				macrobase,funcbase,typebase);
-			fprintf(outh,"#define %s(obj)\t"
+			out_printf(outh,"#define %s(obj)\t"
 				"GTK_CHECK_TYPE((obj), %s_get_type ())\n\n",
 				macrois,funcbase);
 
 			otype = remove_sep(c->otype);
 			ptype = remove_sep(c->ptype);
-			fprintf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
-			fprintf(outh,"struct _%s {\n\t%s __parent__;\n",
-				otype,ptype);
+			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);
 			}
-			fprintf(outh,"};\n");
+			out_printf(outh,"};\n");
 
-			fprintf(outh,"\ntypedef struct _%sClass %sClass;\n",
+			out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
 				otype,otype);
-			fprintf(outh,
+			out_printf(outh,
 				"struct _%sClass {\n\t%sClass __parent__;\n",
 				otype,ptype);
 			for(l=c->nodes;l;l=g_list_next(l)) {
@@ -1031,17 +1102,17 @@ generate_outfiles(void)
 				if(n->type == METHOD_NODE)
 					put_vs_method((Method *)n);
 			}
-			fprintf(outh,"};\n\n");
+			out_printf(outh,"};\n\n");
 
-			fprintf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
+			out_printf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
 			
-			if(is_arguments(c)) {
-				fprintf(out,"static void __object_set_arg "
-					"(GtkObject *object, GtkArg *arg, "
-					"guint arg_id);\n"
-					"static void __object_get_arg "
-					"(GtkObject *object, GtkArg *arg, "
-					"guint arg_id);\n");
+			if(arguments>0) {
+				out_printf(out,"static void __object_set_arg "
+					   "(GtkObject *object, GtkArg *arg, "
+					   "guint arg_id);\n"
+					   "static void __object_get_arg "
+					   "(GtkObject *object, GtkArg *arg, "
+					   "guint arg_id);\n");
 			}
 
 			for(l=c->nodes;l;l=g_list_next(l)) {
@@ -1052,10 +1123,12 @@ generate_outfiles(void)
 				}
 			}
 
-			for(l=c->nodes;l;l=g_list_next(l)) {
-				Node *n = l->data;
-				if(n->type == METHOD_NODE) {
-					add_signal_prots((Method *)n);
+			if(signals>0) {
+				for(l=c->nodes;l;l=g_list_next(l)) {
+					Node *n = l->data;
+					if(n->type == METHOD_NODE) {
+						add_signal_prots((Method *)n);
+					}
 				}
 			}
 			
@@ -1064,10 +1137,13 @@ generate_outfiles(void)
 			add_get_type();
 
 			def_methods(c);
+
+			out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
+				funcbase);
 			
 			add_inits(c);
 
-			if(is_arguments(c)) {
+			if(arguments>0) {
 				add_getset_arg(c, TRUE);
 				add_getset_arg(c, FALSE);
 			}
@@ -1079,6 +1155,8 @@ generate_outfiles(void)
 				}
 			}
 
+			out_printf(out,"#undef GET_NEW\n");
+
 			undef_methods(c);
 
 			g_free(otype);
@@ -1087,7 +1165,7 @@ generate_outfiles(void)
 			g_assert_not_reached();
 	}
 
-	fprintf(outh,"\n#ifdef __cplusplus\n"
+	out_printf(outh,"\n#ifdef __cplusplus\n"
 		"}\n"
 		"#endif /* __cplusplus */\n\n"
 		"#endif");