X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b17287deb56775a49030d738d8c8c0e9cd15f9fe..3b10bbd3a88d6e16146414d91d06bb2f36347bfc:/src/main.c

diff --git a/src/main.c b/src/main.c
index dedf432..226e821 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,6 +63,8 @@ static int arguments = 0; /* number of named 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
@@ -83,6 +85,7 @@ gboolean always_private_header = FALSE;
 gboolean no_private_header = FALSE;
 gboolean no_extern_c = FALSE;
 gboolean no_write = FALSE;
+gboolean no_lines = FALSE;
 
 static void
 make_bases(void)
@@ -214,6 +217,27 @@ print_method(FILE *fp, char *typeprefix, char *nameprefix,
 	out_printf(fp, ")%s", postfix); 
 }
 
+static gboolean
+any_method_to_alias(Class *c)
+{
+	GList *li;
+	
+	for(li=c->nodes;li;li=g_list_next(li)) {
+		Node *node = li->data;
+		if(node->type == METHOD_NODE) {
+			Method *m = (Method *)node;
+			
+			if(m->method == INIT_METHOD ||
+			   m->method == CLASS_INIT_METHOD ||
+			   m->method == OVERRIDE_METHOD)
+				continue;
+
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
 
 static void
 make_method_gnu_aliases(Class *c)
@@ -685,6 +709,7 @@ add_enums(Class *c)
 		out_printf(out,
 			   "static guint object_signals[LAST_SIGNAL] = {0};\n\n");
 
+	out_printf(out, "/* pointer to the class of our parent */\n");
 	out_printf(out, "static %sClass *parent_class = NULL;\n\n",ptypebase);
 }
 
@@ -842,7 +867,7 @@ add_signals(Class *c)
 		flags = make_run_signal_flags(m, last);
 		out_printf(out,"\tobject_signals[%s_SIGNAL] =\n"
     			"\t\tgtk_signal_new (\"%s\",\n"
-			"\t\t\%s,\n"
+			"\t\t\t(GtkSignalRunType)(%s),\n"
 			"\t\t\tgtk_object_class->type,\n"
                     	"\t\t\tGTK_SIGNAL_OFFSET (%sClass, %s),\n"
                     	"\t\t\t%s,\n"
@@ -970,9 +995,9 @@ make_arguments(Class *c)
 			"\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,
@@ -980,6 +1005,32 @@ make_arguments(Class *c)
 		   "\tgtk_object_class->get_arg = ___object_get_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
 add_inits(Class *c)
 {
@@ -991,25 +1042,36 @@ add_inits(Class *c)
 			continue;
 		m = (Method *)n;
 		if(m->method == INIT_METHOD) {
-			if(m->line_no>0)
+			if(m->line_no > 0)
 				out_addline_infile(out,m->line_no);
 			print_method(out, "static ", "\n", "", " ", "\n",
 				     m, FALSE, FALSE);
-			if(m->line_no>0)
+			if(m->line_no > 0)
 				out_addline_outfile(out);
 			out_printf(out,"{\n");
-			if(privates>0) {
+			if(privates > 0) {
 				out_printf(out,"\t%s->_priv = "
-					   "g_new0 (%sPrivate,1);\n",
+					   "g_new0 (%sPrivate, 1);\n",
 					   ((FuncArg *)m->args->data)->name,
 					   typebase);
 			}
+			if(initializers > 0) {
+				GList *li;
+				for(li = ((Class *)class)->nodes;
+				    li != NULL;
+				    li = li->next) {
+					Node *n = li->data;
+					if(n->type != VARIABLE_NODE)
+						continue;
+					print_initializer(m, (Variable *)n);
+				}
+			}
 		} else if(m->method == CLASS_INIT_METHOD) {
-			if(m->line_no>0)
+			if(m->line_no > 0)
 				out_addline_infile(out, m->line_no);
 			print_method(out, "static ", "\n", "", " ", "\n",
 				     m, FALSE, FALSE);
-			if(m->line_no>0)
+			if(m->line_no > 0)
 				out_addline_outfile(out);
 			out_printf(out,"{\n");
 			if(signals>0 ||
@@ -1056,7 +1118,7 @@ add_inits(Class *c)
 }
 
 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"
@@ -1089,14 +1151,39 @@ 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);
+		if(is_set && a->atype) {
+			char *cast = get_type(a->atype, TRUE);
+			out_printf(out, "\tcase ARG_%s:\n", s);
+			if(no_gnu || for_cpp) {
+				out_printf(out, "#define ARG "
+					   "((%s)GTK_VALUE_%s(*arg))\n",
+					   cast, a->gtktype);
+			} else {
+				out_printf(out, "#ifdef __GNUC__\n");
+				out_printf(out, "#define ARG "
+					   "({%s foo = GTK_VALUE_%s(*arg); "
+					     "foo; })\n",
+					   cast, a->gtktype);
+				out_printf(out,"#else /* __GNUC__ */\n");
+				out_printf(out, "#define ARG "
+					   "((%s)GTK_VALUE_%s(*arg))\n",
+					   cast, a->gtktype);
+				out_printf(out,"#endif /* __GNUC__ */\n\n");
+			}
+			out_printf(out, "\t\t{\n");
+			g_free(cast);
+		} else {
+			out_printf(out, "\tcase ARG_%s:\n"
+				   "#define ARG (GTK_VALUE_%s(*arg))\n"
+				   "\t\t{\n",
+				   s, a->gtktype);
+		}
 		g_free(s);
-		out_addline_infile(out,line_no);
+		if(line_no > 0)
+			out_addline_infile(out, line_no);
 		out_printf(out,"%s\n",cbuf);
-		out_addline_outfile(out);
+		if(line_no > 0)
+			out_addline_outfile(out);
 		out_printf(out,"\t\t}\n\t\tbreak;\n"
 			"#undef ARG\n");
 	}
@@ -1116,7 +1203,7 @@ print_checks(Method *m, FuncArg *fa)
 		Check *ch = li->data;
 		char *s;
 		/* point to the method prot in .gob for failed checks */
-		if(m->line_no>0)
+		if(m->line_no > 0)
 			out_addline_infile(out,m->line_no);
 		if(is_void)
 			out_printf(out,"\tg_return_if_fail (");
@@ -1157,11 +1244,11 @@ print_checks(Method *m, FuncArg *fa)
 			break;
 		}
 		if(is_void)
-			out_printf(out,");\n");
+			out_printf(out, ");\n");
 		else {
-			out_printf(out,", (");
-			print_type(out,m->mtype,TRUE);
-			out_printf(out,")%s);\n",
+			out_printf(out, ", (");
+			print_type(out, m->mtype, TRUE);
+			out_printf(out, ")%s);\n",
 				m->onerror?m->onerror:"0");
 		}
 	}
@@ -1181,20 +1268,76 @@ print_preconditions(Method *m)
 		out_addline_outfile(out);
 }
 
+static void
+print_destructor(char *self_id, Variable *v)
+{
+	char *root;
+
+	if(v->destructor == NULL)
+		return;
+
+	if(v->scope == PRIVATE_SCOPE)
+		root = g_strconcat(self_id, "->_priv", NULL);
+	else
+		root = g_strdup(self_id);
+
+	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);\n",
+			   root, v->id, v->destructor, 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\t%s *self G_GNUC_UNUSED = %s;\n",
+			   typebase, self_id);
+		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, "#undef VAR\n");
+	}
+
+	g_free(root);
+}
+
 /* put in code if it's needed */
 static void
 put_in_gen_code(Method *m)
 {
-	/* now we only have the freeing of the private structure */
-	if(privates>0 &&
-	   m->method == OVERRIDE_METHOD &&
-	   strcmp(m->id,"finalize")==0) {
-		out_printf(out,"\tg_free (%s (%s)->_priv);\n"
-			   "\t%s (%s)->_priv = NULL;\n",
-			   macrobase,
-			   ((FuncArg *)m->args->data)->name,
-			   macrobase,
-			   ((FuncArg *)m->args->data)->name);
+	if(m->method == OVERRIDE_METHOD &&
+	   strcmp(m->id, "finalize")==0) {
+		if(privates > 0 || destructors > 0) {
+			out_printf(out,"\t%s *___self = %s (%s);\n",
+				   typebase, macrobase,
+				   ((FuncArg *)m->args->data)->name);
+		}
+		if(destructors > 0) {
+			GList *li;
+			for(li = ((Class *)class)->nodes;
+			    li != NULL;
+			    li = li->next) {
+				Node *n = li->data;
+				if(n->type == VARIABLE_NODE)
+					print_destructor("___self",
+							 (Variable *)n);
+			}
+		}
+		if(privates > 0) {
+			out_printf(out,"\tg_free (___self->_priv);\n"
+				   "\t___self->_priv = NULL;\n",
+				   macrobase,
+				   ((FuncArg *)m->args->data)->name,
+				   macrobase,
+				   ((FuncArg *)m->args->data)->name);
+		}
 	}
 }
 
@@ -1213,13 +1356,13 @@ print_method_body(Method *m, int pre)
 	   ugly in the .c file, but that is not supposed to be
 	   human readable anyway. */
 	if(m->cbuf) {
-		out_printf(out,"{\n");
+		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%s}", m->cbuf);
 	}
 
-	out_printf(out,"}\n");
+	out_printf(out, "}\n");
 
 	if(m->cbuf)
 		out_addline_outfile(out);
@@ -1249,7 +1392,7 @@ get_arg_names_for_macro(Method *m)
 {
 	char *p;
 	GList *li;
-	GString *gs = g_string_new("");
+	GString *gs = g_string_new(NULL);
 	p = "";
 	for(li=m->args;li;li=g_list_next(li)) {
 		FuncArg *arg = li->data;
@@ -1257,7 +1400,7 @@ get_arg_names_for_macro(Method *m)
 		p = ",";
 	}
 	p = gs->str;
-	g_string_free(gs,FALSE);
+	g_string_free(gs, FALSE);
 	return p;
 }
 
@@ -1284,7 +1427,7 @@ put_method(Method *m)
 		else /* PUBLIC, PROTECTED */
 			print_method(out, "", "\n", "", " ", "\n",
 				     m, FALSE, FALSE);
-		print_method_body(m,TRUE);
+		print_method_body(m, TRUE);
 		break;
 	case SIGNAL_FIRST_METHOD:
 	case SIGNAL_LAST_METHOD:
@@ -1480,9 +1623,9 @@ put_argument_nongnu_wrappers(Class *c)
 		s = g_strdup(a->name);
 		g_strup(s);
 		if(a->atype)
-			cast = get_type(a->atype,TRUE);
+			cast = get_type(a->atype, TRUE);
 		else
-			cast = g_strdup(get_cast(a->gtktype,TRUE));
+			cast = g_strdup(get_cast(a->gtktype, TRUE));
 
 		if(cast) {
 			if(a->set)
@@ -1804,18 +1947,22 @@ print_class_block(Class *c)
 
 	add_get_type();
 
-	if(no_gnu)
-		make_method_nongnu_aliases(c);
-	else {
-		out_printf(out,"\n#ifdef __GNUC__\n");
-		make_method_gnu_aliases(c);
-		out_printf(out,"#else /* __GNUC__ */\n");
-		make_method_nongnu_aliases(c);
-		out_printf(out,"#endif /* __GNUC__ */\n\n");
+	if(any_method_to_alias(c)) {
+		if(no_gnu)
+			make_method_nongnu_aliases(c);
+		else {
+			out_printf(out,"\n#ifdef __GNUC__\n");
+			make_method_gnu_aliases(c);
+			out_printf(out,"#else /* __GNUC__ */\n");
+			make_method_nongnu_aliases(c);
+			out_printf(out,"#endif /* __GNUC__ */\n\n");
+		}
 	}
 
-	out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
-		   funcbase);
+	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);
 
 	add_inits(c);
 
@@ -1831,8 +1978,6 @@ print_class_block(Class *c)
 		}
 	}
 
-	out_printf(out,"#undef GET_NEW\n");
-
 	add_bad_hack_to_avoid_unused_warnings(c);
 }
 
@@ -1852,13 +1997,14 @@ print_file_comments(void)
 {
 	time_t curtime;
 	time(&curtime);
-	out_printf(outh,"/* Generated by GOB (v%s)"
-	       "   (do not edit directly) */\n\n",VERSION);
+	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);
+			   "   (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));
+		   "   (do not edit directly) */\n\n",
+		   VERSION, ctime(&curtime));
 }
 
 static void
@@ -1867,17 +2013,17 @@ print_includes(void)
 	gboolean found_header;
 	char *p;
 
-	p = g_strconcat(filebase,".h",NULL);
+	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);
+	if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) {
+		out_printf(out, "#include \"%s.h\"\n\n", filebase);
 		found_header = FALSE;
 	}
 	g_free(p);
 
 	/* if we are creating a private header see if it was included */
 	if(outph) {
-		p = g_strconcat(filebase,"-private.h",NULL);
+		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);
@@ -1901,21 +2047,21 @@ print_header_prefixes(void)
 {
 	char *p;
 
-	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",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"
+		out_printf(outph, "#ifndef __%s_PRIVATE_H__\n"
 			   "#define __%s_PRIVATE_H__\n\n"
-			   "#include \"%s.h\"\n\n",p,p,filebase);
+			   "#include \"%s.h\"\n\n", p, p, filebase);
 	g_free(p);
 
 	if(!no_extern_c) {
-		out_printf(outh,"#ifdef __cplusplus\n"
+		out_printf(outh, "#ifdef __cplusplus\n"
 			   "extern \"C\" {\n"
 			   "#endif /* __cplusplus */\n\n");
 		if(outph)
-			out_printf(outph,"#ifdef __cplusplus\n"
+			out_printf(outph, "#ifdef __cplusplus\n"
 				   "extern \"C\" {\n"
 				   "#endif /* __cplusplus */\n\n");
 	}
@@ -2028,7 +2174,8 @@ print_help(void)
 	  	"\t                        structure and protected "
 					  "prototypes inside c file\n"
 		"\t--no-write,-n           Don't write output files, just "
-					  "check syntax\n");
+					  "check syntax\n"
+		"\t--no-lines              Don't print '#line' to output\n");
 }
 
 static void
@@ -2076,6 +2223,8 @@ parse_options(int argc, char *argv[])
 			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], "--")==0) {
 			/*further arguments are files*/
 			no_opts = TRUE;
@@ -2169,6 +2318,8 @@ main(int argc, char *argv[])
 	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);