/* GOB C Preprocessor
* Copyright (C) 1999,2000 the Free Software Foundation.
* Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2001 George Lebl
*
* Author: George Lebl
*
static char *pfuncbase;
static char *macrobase;
static char *macrois;
+static char *pmacrois;
static char *macrotype;
+static char *pmacrotype;
static char *typebase;
static char *ptypebase;
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 set_properties = 0; /* number of named (set) properties */
+static int get_properties = 0; /* number of named (get) properties */
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 unreftors = 0; /* number of variable unreffing destructors */
+static int destructors = 0; /* number of variable non-unreffing destructors */
static int initializers = 0; /* number of variable initializers */
static gboolean overrode_get_type = FALSE; /* provided your won _get_type */
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_shutdown = FALSE;
+static Method * shutdown_handler = NULL;
static gboolean need_finalize = FALSE;
static Method * finalize_handler = NULL;
gboolean exit_on_warn = FALSE;
gboolean exit_on_error = TRUE;
gboolean got_error = FALSE;
-gint private_header = PRIVATE_HEADER_ALWAYS;
+gint private_header = PRIVATE_HEADER_ONDEMAND;
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
-make_bases(void)
+make_bases (void)
{
- filebase = replace_sep(((Class *)class)->otype, '-');
- g_strdown(filebase);
+ filebase = replace_sep (((Class *)class)->otype, '-');
+ g_strdown (filebase);
- funcbase = replace_sep(((Class *)class)->otype, '_');
- g_strdown(funcbase);
+ funcbase = replace_sep (((Class *)class)->otype, '_');
+ g_strdown (funcbase);
- pfuncbase = replace_sep(((Class *)class)->ptype, '_');
- g_strdown(pfuncbase);
+ pfuncbase = replace_sep (((Class *)class)->ptype, '_');
+ g_strdown (pfuncbase);
- macrobase = replace_sep(((Class *)class)->otype, '_');
- g_strup(macrobase);
+ 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");
+ macrois = make_pre_macro (((Class *)class)->otype, "IS");
+ pmacrois = make_pre_macro (((Class *)class)->ptype, "IS");
- typebase = remove_sep(((Class *)class)->otype);
+ macrotype = make_pre_macro (((Class *)class)->otype, "TYPE");
+ pmacrotype = make_pre_macro (((Class *)class)->ptype, "TYPE");
- ptypebase = remove_sep(((Class *)class)->ptype);
+ typebase = remove_sep (((Class *)class)->otype);
+
+ ptypebase = remove_sep (((Class *)class)->ptype);
}
static char *
-get_type(const Type *t, gboolean postfix_to_stars)
+get_type (const Type *t, gboolean postfix_to_stars)
{
char *s;
int i;
g_free(s);
extra = 0;
- if(postfix_to_stars) {
+ 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++)
+ 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, ' ');
+ if (t->pointer != NULL) {
+ 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);
+ g_string_free (gs, FALSE);
return s;
}
static char *
-get_gtk_doc(const char *id)
+get_gtk_doc (const char *id)
{
char *val;
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));
+ funcbase, id, val);
+ 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);
+ funcbase, id, val);
return NULL;
}
out_printf(fp, "%s", typeprefix);
print_type(fp, m->mtype, TRUE);
- if(kill_underscore)
- id = get_real_id(m->id);
- else
- id = m->id;
+ id = m->id;
if(no_funcbase)
out_printf(fp, "%s%s%s%s(",
m->method == OVERRIDE_METHOD)
continue;
- /* in C++ mode don't alias new */
- if(for_cpp && strcmp(m->id, "new")==0)
- continue;
-
if(m->args != NULL)
- out_printf(out, "#define %s(args...) "
+ out_printf(out, "#define self_%s(args...) "
"%s_%s(args)\n", m->id,
- funcbase, get_real_id(m->id));
+ funcbase, m->id);
else
- out_printf(out, "#define %s() "
+ out_printf(out, "#define self_%s() "
"%s_%s()\n", m->id,
- funcbase, get_real_id(m->id));
+ funcbase, m->id);
}
}
}
m->method == OVERRIDE_METHOD)
continue;
- /* 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 ", "", ") ",
+ print_method(out, "static ", "(* const self_", "", ") ",
"", "",
m, FALSE, TRUE, FALSE);
out_printf(out, " = %s_%s;\n", funcbase,
- get_real_id(m->id));
+ m->id);
local_made_aliases = TRUE;
}
"static void\n"
"___%s_really_bad_hack_to_avoid_warnings(void)\n"
"{\n", funcbase);
+ out_printf(out, "\t((void (*)(void))GET_NEW_VARG)();\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *node = li->data;
if(node->type == METHOD_NODE) {
if(for_cpp && strcmp(m->id, "new")==0)
continue;
- out_printf(out, "\t((void (*)(void))%s)();\n", m->id);
+ out_printf(out, "\t((void (*)(void))self_%s)();\n", m->id);
}
}
out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n",
if ( ! gnu) {
out_printf (outh, "#define %s_SIGNAL_%s(func)\t"
- "\"%s\",GTK_SIGNAL_FUNC(func)\n",
- macrobase, id, get_real_id (m->id));
+ "\"%s\",(GCallback)(func)\n",
+ macrobase, id, m->id);
} else {
out_printf (outh, "#define %s_SIGNAL_%s(func)\t"
- "\"%s\",GTK_SIGNAL_FUNC(({",
- macrobase, id, get_real_id (m->id));
+ "\"%s\",(GCallback)(({",
+ macrobase, id, m->id);
print_method (outh, "", "(* ___", "", ") ", ", gpointer data ",
" = func; ", m, FALSE, TRUE, TRUE);
- out_printf (outh, "___%s; }))\n", get_real_id (m->id));
+ out_printf (outh, "___%s; }))\n", m->id);
}
g_free (id);
g_free(s);
} else if(m->scope == PRIVATE_SCOPE ||
m->method == INIT_METHOD ||
- m->method == CLASS_INIT_METHOD)
+ m->method == CLASS_INIT_METHOD) {
print_method(out, "static ", "", "", " ", "",
no_gnu?";\n":" G_GNUC_UNUSED;\n",
m, FALSE, FALSE, TRUE);
+ }
}
static GList *
else
tn = g_strdup(typename);
- type = new_type(tn, g_strdup("*"), NULL);
- node = new_funcarg((Type *)type, name, NULL);
+ type = node_new (TYPE_NODE,
+ "name:steal", tn,
+ "pointer", "*",
+ NULL);
+ node = node_new (FUNCARG_NODE,
+ "atype:steal", (Type *)type,
+ "name:steal", name,
+ NULL);
return g_list_prepend(NULL, node);
}
}
}
if(!got_class_init) {
- 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++);
+ Type *type = (Type *)node_new (TYPE_NODE,
+ "name", "void",
+ NULL);
+ node = node_new (METHOD_NODE,
+ "scope", NO_SCOPE,
+ "method", CLASS_INIT_METHOD,
+ "mtype:steal", type,
+ "id", "class_init",
+ "args:steal", make_func_arg (cl->otype, TRUE, g_strdup("c")),
+ "unique_id", method_unique_id++,
+ NULL);
cl->nodes = g_list_prepend(cl->nodes, node);
}
if(!got_init) {
- 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++);
+ Type *type = (Type *)node_new (TYPE_NODE,
+ "name", "void",
+ NULL);
+ node = node_new (METHOD_NODE,
+ "scope", NO_SCOPE,
+ "method", INIT_METHOD,
+ "mtype:steal", type,
+ "id", "init",
+ "args:steal", make_func_arg (cl->otype, TRUE, g_strdup("o")),
+ "unique_id", method_unique_id++,
+ NULL);
cl->nodes = g_list_prepend(cl->nodes, node);
}
}
static void
-find_destroy(Class *cl)
+find_shutdown(Class *cl)
{
GList *li;
- destroy_handler = NULL;
+ shutdown_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) {
+ strcmp(m->id, "shutdown")==0) {
+ if(strcmp(m->otype, "G:Object") != 0) {
error_print(GOB_ERROR, m->line_no,
- "destroy method override "
+ "shutdown method override "
"of class other then "
- "Gtk:Object");
+ "G:Object");
}
if(g_list_length(m->args) != 1) {
error_print(GOB_ERROR, m->line_no,
- "destroy method override "
+ "shutdown method override "
"with more then one "
"parameter");
}
- destroy_handler = m;
+ shutdown_handler = m;
break;
}
}
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) {
+ if(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)");
+ "G:Object");
}
if(g_list_length(m->args) != 1) {
error_print(GOB_ERROR, m->line_no,
}
static void
-print_signal_marsal_args(Method *m)
+print_signal_marsal_args (Method *m)
{
- if(strcmp(m->gtktypes->next->data, "NONE")!=0) {
+ 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);
- }
+ for (i = 0, li = m->gtktypes->next;
+ li != NULL;
+ i++, li = li->next) {
+ char *get_func = g_strdup_printf
+ ("g_value_get_%s", (char *)li->data);
+ g_strdown (get_func);
+ out_printf (out, ",\n\t\t(%s) "
+ "%s (param_values + %d)",
+ get_cast (li->data, FALSE),
+ get_func, i + 1);
+ g_free (get_func);
}
}
- out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
+ out_printf (out, ",\n\t\tdata2);\n");
}
static int sig = 1;
char *s;
Method *mm;
+ gboolean ret_none = FALSE;
+ gboolean arglist_none = FALSE;
+ const char *retcast;
- if(m->method != SIGNAL_LAST_METHOD &&
- m->method != SIGNAL_FIRST_METHOD)
+ if (m->method != SIGNAL_LAST_METHOD &&
+ m->method != SIGNAL_FIRST_METHOD)
return;
- if(!marsh)
+ if (marsh == NULL)
marsh = g_hash_table_new(NULL, NULL);
+
+ g_assert (m->gtktypes->next != NULL);
+
+ ret_none = strcmp(m->gtktypes->data, "NONE") == 0;
+ arglist_none = strcmp(m->gtktypes->next->data, "NONE") == 0;
- if(strcmp(m->gtktypes->data, "NONE")==0 &&
- strcmp(m->gtktypes->next->data, "NONE")==0)
+ if (ret_none && arglist_none)
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);
+ mm = find_same_type_signal (m);
+ if (mm != NULL) {
+ s = g_hash_table_lookup (marsh, mm);
+ g_hash_table_insert (marsh, m, s);
return;
}
+
+ if (ret_none)
+ retcast = NULL;
+ else
+ retcast = get_cast (m->gtktypes->data, FALSE);
s = g_strdup_printf("Sig%d", sig++);
out_printf(out, "\ntypedef %s (*___%s) (%s *, ",
get_cast(m->gtktypes->data, FALSE), s, typebase);
- 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));
+ if ( ! arglist_none) {
+ for (li = m->gtktypes->next; li != NULL; li = li->next)
+ 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"
- "\tGtkSignalFunc func,\n"
- "\tgpointer func_data,\n"
- "\tGtkArg * args)\n"
- "{\n", s);
+ out_printf (out, "\nstatic void\n"
+ "___marshal_%s (GClosure *closure,\n"
+ "\tGValue *return_value,\n"
+ "\tguint n_param_values,\n"
+ "\tconst GValue *param_values,\n"
+ "\tgpointer invocation_hint,\n"
+ "\tgpointer marshal_data)\n"
+ "{\n", s);
+
+ if ( ! ret_none)
+ out_printf (out, "\t%s v_return;\n", retcast);
+
+ out_printf (out, "\tregister ___%s callback;\n"
+ "\tregister GCClosure *cc = (GCClosure*) closure;\n"
+ "\tregister gpointer data1, data2;\n\n",
+ s);
+
+ out_printf (out, "\tg_return_if_fail (n_param_values == %d);\n\n",
+ arglist_none ? 1 : g_list_length (m->gtktypes));
+
+ out_printf (out,
+ "\tif (G_CCLOSURE_SWAP_DATA (closure)) {\n"
+ "\t\tdata1 = closure->data;\n"
+ "\t\tdata2 = g_value_peek_pointer (param_values + 0);\n"
+ "\t} else {\n"
+ "\t\tdata1 = g_value_peek_pointer (param_values + 0);\n"
+ "\t\tdata2 = closure->data;\n"
+ "\t}\n\n");
+
+ out_printf (out, "\tcallback = (___%s) "
+ "(marshal_data != NULL ? marshal_data : cc->callback);"
+ "\n\n", s);
- 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);
+ if (ret_none) {
+ out_printf (out, "\tcallback ((%s *)data1", typebase);
} else {
- 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);
+ out_printf (out, "\tv_return = callback ((%s *)data1",
+ typebase);
}
- print_signal_marsal_args(m);
+ print_signal_marsal_args (m);
+
+ if ( ! ret_none) {
+ /* FIXME: This code is so fucking ugly it hurts */
+ gboolean take_ownership =
+ (strcmp ((char *)m->gtktypes->data, "STRING") == 0 ||
+ strcmp ((char *)m->gtktypes->data, "BOXED") == 0);
+ char *set_func = g_strdup_printf ("g_value_set_%s%s",
+ (char *)m->gtktypes->data,
+ take_ownership ?
+ "_take_ownership" : "");
+ g_strdown (set_func);
+
+ out_printf (out, "\n\t%s (return_value, v_return);\n",
+ set_func);
+
+ g_free (set_func);
+ }
+ out_printf (out, "}\n\n");
}
static void
Method *m = (Method *)n;
if(m->method == SIGNAL_LAST_METHOD ||
m->method == SIGNAL_FIRST_METHOD) {
- char *s = g_strdup(get_real_id(m->id));
+ 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");
}
- if(set_arguments > 0 || get_arguments > 0) {
- out_printf(out, "enum {\n\tARG_0");
+ if (set_properties > 0 ||
+ get_properties > 0) {
+ out_printf(out, "enum {\n\tPROP_0");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
- if(n->type == ARGUMENT_NODE) {
+ if (n->type == PROPERTY_NODE) {
+ Property *p = (Property *)n;
+ char *s = g_strdup (p->name);
+ g_strup (s);
+ out_printf (out, ",\n\tPROP_%s", s);
+ g_free(s);
+ } else if (n->type == ARGUMENT_NODE) {
Argument *a = (Argument *)n;
char *s = g_strdup(a->name);
g_strup(s);
- out_printf(out, ",\n\tARG_%s", s);
+ out_printf(out, ",\n\tPROP_%s", s);
g_free(s);
}
}
out_printf(out, "\n};\n\n");
}
- if(signals>0)
+ if (signals > 0)
out_printf(out,
"static guint object_signals[LAST_SIGNAL] = {0};\n\n");
static void
add_get_type(void)
{
- char *chunk_size = ((Class*)class)->chunk_size;
+ /*char *chunk_size = ((Class*)class)->chunk_size;*/
+
+ out_printf(out,
+ "GType\n"
+ "%s_get_type (void)\n"
+ "{\n"
+ "\tstatic GType type = 0;\n\n"
+ "\tif (type == 0) {\n"
+ "\t\tstatic const GTypeInfo info = {\n"
+ "\t\t\tsizeof (%sClass),\n"
+ "\t\t\t(GBaseInitFunc) NULL,\n"
+ "\t\t\t(GBaseFinalizeFunc) NULL,\n"
+ "\t\t\t(GClassInitFunc) %s_class_init,\n"
+ "\t\t\t(GClassFinalizeFunc) NULL,\n"
+ "\t\t\tNULL /* class_data */,\n"
+ "\t\t\tsizeof (%s),\n"
+ "\t\t\t0 /* n_preallocs */,\n"
+ "\t\t\t(GInstanceInitFunc) %s_init,\n"
+ "\t\t};\n\n"
+ "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)0);\n",
+ funcbase, typebase, funcbase, typebase, funcbase,
+ pmacrotype, typebase);
+ /*
+ 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_bonobo_x_get_type (void)
+{
+ /* char *chunk_size = ((Class*)class)->chunk_size; */
+
+ out_printf(out,
+ "\n#error \"BonoboX isn't ported to glib 2.0 and "
+ "gob2 doesn't support it yet\"");
out_printf(out,
"GtkType\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\ttype = bonobo_x_type_unique\n"
+ "\t\t\t(%s_get_type (),\n"
+ "\t\t\tPOA_%s__init, NULL,\n"
+ "\t\t\tGTK_STRUCT_OFFSET (%sClass, _epv),\n"
+ "\t\t\t&info);\n",
funcbase, typebase, typebase, typebase,
- funcbase, funcbase, pfuncbase);
- if(chunk_size) {
+ funcbase, funcbase, pfuncbase,
+ ((Class*)class)->bonobo_x_class,
+ typebase);
+ /*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"
}
static void
-add_overrides(Class *c, const char *oname, gboolean did_base_obj)
+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);
- 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);
+ done = g_hash_table_new (g_str_hash, g_str_equal);
+ if (did_base_obj) {
+ s = g_strdup ("GObject");
+ g_hash_table_insert (done, s, s);
}
- for(li=c->nodes; li; li=g_list_next(li)) {
+ for (li = c->nodes; li != NULL; li = li->next) {
Node *n = li->data;
char *f;
Method *m = (Method *)n;
g_free(f);
}
- g_hash_table_foreach(done, (GHFunc)g_free, NULL);
- g_hash_table_destroy(done);
+ g_hash_table_foreach (done, (GHFunc)g_free, NULL);
+ g_hash_table_destroy (done);
}
static char *
GList *li;
GString *gs;
char *flags[] = {
- "FIRST",
- "LAST",
- "BOTH",
+ "RUN_FIRST",
+ "RUN_LAST",
+ "RUN_CLEANUP",
"NO_RECURSE",
+ "DETAILED",
"ACTION",
"NO_HOOKS",
NULL
gs = g_string_new(NULL);
if(last)
- g_string_assign(gs, "GTK_RUN_LAST");
+ g_string_assign(gs, "G_SIGNAL_RUN_LAST");
else
- g_string_assign(gs, "GTK_RUN_FIRST");
+ g_string_assign(gs, "G_SIGNAL_RUN_FIRST");
if(m->scope == PUBLIC_SCOPE)
- g_string_append(gs, " | GTK_RUN_ACTION");
+ g_string_append(gs, " | G_SIGNAL_ACTION");
for(li = m->flags; li; li = li->next) {
char *flag = li->data;
"perhaps it was misspelled",
flag);
}
- g_string_sprintfa(gs, " | GTK_RUN_%s", flag);
+ g_string_sprintfa(gs, " | G_SIGNAL_%s", flag);
}
{
(char *)g_hash_table_lookup(marsh, m),
NULL);
else
- mar = g_strdup("gtk_signal_default_marshaller");
+ mar = g_strdup("g_cclosure_marshal_VOID__VOID");
is_none = (strcmp(m->gtktypes->next->data, "NONE")==0);
- sig = g_strdup(get_real_id(m->id));
- g_strup(sig);
- flags = make_run_signal_flags(m, last);
- out_printf(out, "\tobject_signals[%s_SIGNAL] =\n"
- "\t\tgtk_signal_new (\"%s\",\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, 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));
+ sig = g_strdup (m->id);
+ g_strup (sig);
+ flags = make_run_signal_flags (m, last);
+ out_printf (out, "\tobject_signals[%s_SIGNAL] =\n"
+ "\t\tg_signal_new (\"%s\",\n"
+ "\t\t\tG_TYPE_FROM_CLASS (g_object_class),\n"
+ "\t\t\t(GSignalFlags)(%s),\n"
+ "\t\t\tG_STRUCT_OFFSET (%sClass, %s),\n"
+ "\t\t\tNULL, NULL,\n"
+ "\t\t\t%s,\n"
+ "\t\t\tG_TYPE_%s, %d",
+ sig, m->id,
+ flags,
+ typebase, 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) {
GList *l;
for(l = m->gtktypes->next; l != NULL; l = l->next)
- out_printf(out, ",\n\t\t\tGTK_TYPE_%s",
+ out_printf(out, ",\n\t\t\tG_TYPE_%s",
(char *)l->data);
}
"\t\tg_error(\"%s line %d: Type mismatch "
"of \\\"%s\\\" signal signature\");\n"
"\t}\n",
- filename, m->line_no, get_real_id(m->id));
+ filename, m->line_no, m->id);
}
}
- out_printf(out, "\tgtk_object_class_add_signals (gtk_object_class,\n"
- "\t\tobject_signals, LAST_SIGNAL);\n\n");
}
static void
}
- if(m->method == OVERRIDE_METHOD) {
+ if (m->method == OVERRIDE_METHOD) {
char *s;
- s = replace_sep(m->otype, '_');
- g_strdown(s);
-
- 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 &&
+ s = replace_sep (m->otype, '_');
+ g_strdown (s);
+
+ if (need_shutdown &&
+ shutdown_handler != NULL &&
+ strcmp (m->id, "shutdown") == 0)
+ out_printf (out, "\tg_object_class->shutdown "
+ "= ___shutdown;\n");
+ else if (need_finalize &&
finalize_handler &&
- strcmp(get_real_id(m->id), "finalize") == 0)
+ strcmp(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)
+ "\tg_object_class->finalize = ___finalize;\n");
+ else if (m->cbuf != NULL)
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));
+ s, m->id, (guint)m->unique_id,
+ funcbase, m->id);
else
out_printf(out, "\t%s_class->%s = NULL;\n",
- s, get_real_id(m->id));
+ s, 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));
+ oname, m->id,
+ funcbase, m->id);
else
out_printf(out, "\t%s->%s = NULL;\n",
- oname, get_real_id(m->id));
+ oname, m->id);
}
}
if(set_line)
}
static void
-make_arguments(Class *c)
+make_argument (Argument *a)
{
- GList *li;
+ GString *flags;
+ GList *l;
+ char *s;
char *argflags[] = {
"CONSTRUCT",
"CONSTRUCT_ONLY",
NULL
};
- out_printf(out, "\n");
- for(li=c->nodes;li;li=g_list_next(li)) {
- Node *n = li->data;
- Argument *a;
- GString *flags;
- GList *l;
- char *s;
- if(n->type != ARGUMENT_NODE)
+ flags = g_string_new ("(GParamFlags)(");
+
+ if(a->get && a->set)
+ g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
+ else if(a->get)
+ g_string_append (flags, "G_PARAM_READABLE");
+ else
+ g_string_append (flags, "G_PARAM_WRITABLE");
+
+ g_assert(a->get || a->set);
+
+ for (l = a->flags; l != NULL; l = l->next) {
+ char *flag = l->data;
+ int i;
+ if(strcmp (flag, "READABLE") == 0 ||
+ strcmp (flag, "WRITABLE") == 0) {
+ error_print(GOB_WARN, a->line_no,
+ "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, " | G_PARAM_%s", flag);
+ }
- a = (Argument *)n;
-
- if(a->get && a->set)
- flags = g_string_new("GTK_ARG_READWRITE");
- else if(a->get)
- flags = g_string_new("GTK_ARG_READABLE");
- else
- flags = g_string_new("GTK_ARG_WRITABLE");
+ g_string_append (flags, ")");
- g_assert(a->get || a->set);
-
- 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);
+ if (!strcmp (a->gtktype, "ENUM"))
+ out_printf(out, "\tparam_spec = g_param_spec_enum (\"%s\", NULL, NULL,\n"
+ "\t\tG_TYPE_ENUM, 0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ if (!strcmp (a->gtktype, "FLAGS"))
+ out_printf(out, "\tparam_spec = g_param_spec_flags (\"%s\", NULL, NULL,\n"
+ "\t\tG_TYPE_FLAGS, 0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "OBJECT"))
+ out_printf(out, "\tparam_spec = g_param_spec_object (\"%s\", NULL, NULL,\n"
+ "\t\tG_TYPE_OBJECT,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "STRING"))
+ out_printf(out, "\tparam_spec = g_param_spec_string (\"%s\", NULL, NULL,\n"
+ "\t\tNULL,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "INT"))
+ out_printf(out, "\tparam_spec = g_param_spec_int (\"%s\", NULL, NULL,\n"
+ "\t\tG_MININT, G_MAXINT,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "UINT"))
+ out_printf(out, "\tparam_spec = g_param_spec_uint (\"%s\", NULL, NULL,\n"
+ "\t\t0, G_MAXUINT,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "INT"))
+ out_printf(out, "\tparam_spec = g_param_spec_int (\"%s\", NULL, NULL,\n"
+ "\t\tG_MININT, G_MAXINT,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "CHAR"))
+ out_printf(out, "\tparam_spec = g_param_spec_char (\"%s\", NULL, NULL,\n"
+ "\t\t-128, 127,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "UCHAR"))
+ out_printf(out, "\tparam_spec = g_param_spec_uchar (\"%s\", NULL, NULL,\n"
+ "\t\t0, 0xFF,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "BOOL") ||
+ !strcmp (a->gtktype, "BOOLEAN"))
+ out_printf(out, "\tparam_spec = g_param_spec_boolean (\"%s\", NULL, NULL,\n"
+ "\t\tFALSE,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "LONG"))
+ out_printf(out, "\tparam_spec = g_param_spec_long (\"%s\", NULL, NULL,\n"
+ "\t\tG_MINLONG, G_MAXLONG,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "ULONG"))
+ out_printf(out, "\tparam_spec = g_param_spec_ulong (\"%s\", NULL, NULL,\n"
+ "\t\t0, G_MAXULONG,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "FLOAT"))
+ out_printf(out, "\tparam_spec = g_param_spec_float (\"%s\", NULL, NULL,\n"
+ "\t\tG_MINFLOAT, G_MAXFLOAT,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "DOUBLE"))
+ out_printf(out, "\tparam_spec = g_param_spec_double (\"%s\", NULL, NULL,\n"
+ "\t\tG_MINDOUBLE, G_MAXDOUBLE,\n"
+ "\t\t0,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else if (!strcmp (a->gtktype, "POINTER"))
+ out_printf(out, "\tparam_spec = g_param_spec_pointer (\"%s\", NULL, NULL,\n"
+ "\t\t%s);\n",
+ a->name, flags->str);
+ else
+ error_printf (GOB_ERROR, a->line_no,
+ "%s type is not supported for arguments, try using properties",
+ a->gtktype);
+
+ out_printf(out, "\tg_object_class_install_property (g_object_class,\n"
+ "\t\tPROP_%s, param_spec);\n", s);
+
+
+ g_free(s);
+ g_string_free(flags, TRUE);
+}
+
+#define value_for_print(str, alt) (str != NULL ? str : alt)
+
+static void
+make_property (Property *p)
+{
+ GString *flags;
+ GList *l;
+ char *s;
+ char *argflags[] = {
+ "CONSTRUCT",
+ "CONSTRUCT_ONLY",
+ "CHILD_ARG",
+ "MASK",
+ NULL
+ };
+
+ flags = g_string_new ("(GParamFlags)(");
+
+ if (p->get != NULL && p->set != NULL)
+ g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
+ else if (p->get != NULL)
+ g_string_append (flags, "G_PARAM_READABLE");
+ else
+ g_string_append (flags, "G_PARAM_WRITABLE");
+
+ if (p->get == NULL && p->set == NULL) {
+ error_print (GOB_ERROR, p->line_no,
+ "Property has no getter nor setter");
+ }
+
+ for (l = p->flags; l != NULL; l = l->next) {
+ char *flag = l->data;
+ int i;
+ if(strcmp (flag, "READABLE") == 0 ||
+ strcmp (flag, "WRITABLE") == 0) {
+ error_print(GOB_WARN, p->line_no,
+ "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, p->line_no,
+ "Unknown flag '%s' used, "
+ "perhaps it was misspelled", flag);
+ }
+ g_string_sprintfa(flags, " | G_PARAM_%s", flag);
+ }
+
+ g_string_append (flags, ")");
+
+ if (strcmp (p->gtktype, "CHAR") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_char\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "-128"),
+ value_for_print (p->maximum, "127"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "UCHAR") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_uchar\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "0xFF"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "BOOLEAN") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_boolean\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "FALSE"),
+ flags->str);
+ else if (strcmp (p->gtktype, "INT") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_int\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MININT"),
+ value_for_print (p->maximum, "G_MAXINT"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "UINT") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_uint\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "G_MAXUINT"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "LONG") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_long\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINLONG"),
+ value_for_print (p->maximum, "G_MAXLONG"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "ULONG") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_ulong\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "0"),
+ value_for_print (p->maximum, "G_MAXULONG"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "UNICHAR") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "ENUM") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_enum\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* enum_type */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->extra_gtktype, "G_TYPE_ENUM"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "FLAGS") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_flags\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* flags_type */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->extra_gtktype, "G_TYPE_FLAGS"),
+ value_for_print (p->default_value, "0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "FLOAT") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_float\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINFLOAT"),
+ value_for_print (p->maximum, "G_MAXFLOAT"),
+ value_for_print (p->default_value, "0.0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "DOUBLE") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_double\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* minimum */,\n"
+ "\t\t %s /* maximum */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->minimum, "G_MINDOUBLE"),
+ value_for_print (p->maximum, "G_MAXDOUBLE"),
+ value_for_print (p->default_value, "0.0"),
+ flags->str);
+ else if (strcmp (p->gtktype, "STRING") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_string\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* default_value */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->default_value, "NULL"),
+ flags->str);
+ else if (strcmp (p->gtktype, "PARAM") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_param\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* param_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->extra_gtktype, "G_TYPE_PARAM"),
+ flags->str);
+ else if (strcmp (p->gtktype, "BOXED") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_boxed\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* boxed_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->extra_gtktype, "G_TYPE_BOXED"),
+ flags->str);
+ else if (strcmp (p->gtktype, "POINTER") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ flags->str);
+ /* FIXME: VALUE_ARRAY */
+ else if (strcmp (p->gtktype, "CLOSURE") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ flags->str);
+ else if (strcmp (p->gtktype, "OBJECT") == 0)
+ out_printf (out, "\tparam_spec = g_param_spec_object\n"
+ "\t\t(\"%s\" /* name */,\n"
+ "\t\t %s /* nick */,\n"
+ "\t\t %s /* blurb */,\n"
+ "\t\t %s /* object_type */,\n"
+ "\t\t %s);\n",
+ p->name,
+ value_for_print (p->nick, "NULL"),
+ value_for_print (p->blurb, "NULL"),
+ value_for_print (p->extra_gtktype, "G_TYPE_OBJECT"),
+ flags->str);
+ else
+ error_printf (GOB_ERROR, p->line_no,
+ "%s type is not supported by properties",
+ p->gtktype);
+
+ s = g_strdup (p->name);
+ g_strup (s);
+ out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
+ "\t\tPROP_%s,\n"
+ "\t\tparam_spec);\n", s);
+ g_free (s);
+
+ g_string_free (flags, TRUE);
+}
- s = g_strdup(a->name);
- g_strup(s);
- 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);
- g_free(s);
- g_string_free(flags, TRUE);
+static void
+make_arguments(Class *c)
+{
+ GList *li;
+ out_printf (out, " {\n"
+ "\tGParamSpec *param_spec;\n\n");
+
+ for (li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
+ if (n->type == PROPERTY_NODE)
+ make_property ((Property *)n);
+ else if (n->type == ARGUMENT_NODE)
+ make_argument ((Argument *)n);
}
+ out_printf(out, " }\n");
- 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");
+ if (get_properties > 0)
+ out_printf(out, "\tg_object_class->get_property = ___object_get_property;\n");
+ if (set_properties > 0)
+ out_printf(out, "\tg_object_class->set_property = ___object_set_property;\n");
}
static void
}
static void
-print_destructor(Variable *v)
+print_destructor (Variable *v)
{
char *root;
if(v->destructor_line > 0)
out_addline_outfile(out);
} else {
- out_printf(out, "#define VAR (%s->%s)\n", root, v->id);
+ out_printf(out, "#define %s (%s->%s)\n", v->id, root, v->id);
+ out_printf(out, "#define VAR %s\n", v->id);
out_printf(out, "\t{\n");
if(v->destructor_line > 0)
out_addline_infile(out, v->destructor_line);
if(v->destructor_line > 0)
out_addline_outfile(out);
- out_printf(out, "\tmemset(&VAR, 0, sizeof(VAR));\n");
+ out_printf(out, "\tmemset(&%s, 0, sizeof(%s));\n",
+ v->id, v->id);
out_printf(out, "#undef VAR\n");
+ out_printf(out, "#undef %s\n", v->id);
}
}
static void
-add_destroy(Class *c)
+add_shutdown (Class *c)
{
out_printf(out, "\nstatic void\n"
- "___destroy(GtkObject *obj_self)\n"
+ "___shutdown (GObject *obj_self)\n"
"{\n");
out_printf(out,
- "#define __GOB_FUNCTION__ \"%s::destroy\"\n",
+ "#define __GOB_FUNCTION__ \"%s::shutdown\"\n",
c->otype);
- if(destructors > 0) {
- out_printf(out, "\t%s *self = %s (obj_self);\n",
- typebase, macrobase);
+ if (unreftors > 0) {
+ out_printf (out, "\t%s *self = %s (obj_self);\n",
+ typebase, macrobase);
}
- if(destroy_handler) {
+ if (shutdown_handler != NULL) {
/* 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);
+ if (shutdown_handler->line_no > 0)
+ out_addline_infile (out, shutdown_handler->line_no);
+ out_printf (out, "\t___%x_%s_shutdown(obj_self);\n",
+ (guint)shutdown_handler->unique_id, funcbase);
+ if (shutdown_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");
+ out_printf (out,
+ "\tif (G_OBJECT_CLASS (parent_class)->shutdown) \\\n"
+ "\t\t(* G_OBJECT_CLASS (parent_class)->shutdown) (obj_self);\n");
}
- if(destructors > 0) {
+ if (unreftors > 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);
+ if (n->type == VARIABLE_NODE &&
+ v->scope != CLASS_SCOPE &&
+ v->destructor_unref)
+ print_destructor (v);
}
}
- out_printf(out, "\treturn;\n");
- if(destructors > 0)
+ out_printf (out, "\treturn;\n");
+ if (unreftors > 0)
out_printf(out, "\tself = NULL;\n");
out_printf(out, "}\n"
"#undef __GOB_FUNCTION__\n\n");
}
static void
-add_finalize(Class *c)
+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"
+ "\nstatic 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) {
+ if (privates > 0 ||
+ destructors > 0) {
out_printf(out, "\t%s *self = %s (obj_self);\n",
typebase, macrobase);
+ }
+ if (privates > 0) {
out_printf(out, "\tgpointer priv = self->_priv;\n");
}
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");
+ "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(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 &&
+ ! v->destructor_unref)
+ print_destructor (v);
+ }
}
- if(privates > 0) {
- out_printf(out, "\tg_free(priv);\n");
+ if (privates > 0) {
+ out_printf(out, "\tg_free (priv);\n");
}
+ out_printf (out, "\treturn;\n");
+ if (destructors > 0 ||
+ privates > 0)
+ out_printf (out, "\tself = NULL;\n");
out_printf(out, "}\n"
"#undef __GOB_FUNCTION__\n\n");
}
+static void
+make_bonobo_x_epv (Class *c, const char *classname)
+{
+ GList *li;
+ gboolean added_line = FALSE;
+
+ for (li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
+ Method *m = (Method *)n;
+ if(n->type != METHOD_NODE ||
+ m->method == OVERRIDE_METHOD)
+ continue;
+
+ if (m->bonobo_x_func) {
+ if(m->line_no > 0) {
+ out_addline_infile(out, m->line_no);
+ added_line = TRUE;
+ } else if (m->line_no == 0 &&
+ added_line) {
+ out_addline_outfile(out);
+ added_line = FALSE;
+ }
+ out_printf (out, "\t%s->_epv.%s = %s;\n",
+ classname, m->id, m->id);
+ }
+ }
+ if (added_line)
+ out_addline_outfile(out);
+}
+
static void
add_inits(Class *c)
{
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;
+ if (set_properties > 0 ||
+ get_properties > 0 ||
+ signals > 0 ||
+ need_shutdown ||
+ need_finalize) {
out_printf(out,
- "\tGtkObjectClass *"
- "gtk_object_class = "
- "(GtkObjectClass*) %s;\n",
- ((FuncArg *)m->args->data)->name);
- out_printf(out,
- "#ifdef G_OBJECT_CLASS\n"
"\tGObjectClass *"
"g_object_class = "
- "(GObjectClass*) %s;\n"
- "#endif /* G_OBJECT_CLASS */\n",
+ "(GObjectClass*) %s;\n",
((FuncArg *)m->args->data)->name);
+ add_unused_class = TRUE;
did_base_obj = TRUE;
}
- if(overrides > 0)
- add_overrides(c,
- ((FuncArg *)m->args->data)->name,
- did_base_obj);
+ if (overrides > 0)
+ add_overrides (c,
+ ((FuncArg *)m->args->data)->name,
+ did_base_obj);
- if(initializers > 0) {
+ if (initializers > 0) {
GList *li;
for(li = ((Class *)class)->nodes;
li != NULL;
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);
+ out_printf(out, "g_type_class_ref (%s);\n",
+ pmacrotype);
if(signals > 0)
add_signals(c);
/* 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_shutdown && !shutdown_handler)
+ out_printf(out, "\tg_object_class->shutdown "
+ "= ___shutdown;\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");
+ out_printf(out, "\tg_object_class->finalize = "
+ "___finalize;\n");
- if(get_arguments > 0 || set_arguments > 0)
+ if(get_properties > 0 || set_properties > 0)
make_arguments(c);
+ if (c->bonobo_x_class != NULL) {
+ make_bonobo_x_epv (c, ((FuncArg *)m->args->data)->name);
+ }
} else
continue;
"\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, "\tg_object_class = NULL;\n");
}
out_printf(out, "}\n"
"#undef __GOB_FUNCTION__\n");
}
}
+static void
+add_argument (Argument *a, gboolean is_set)
+{
+ char *s;
+ char *cbuf;
+ char *the_type_lower;
+ int line_no;
+
+ if(is_set) {
+ cbuf = a->set;
+ line_no = a->set_line;
+ } else {
+ cbuf = a->get;
+ line_no = a->get_line;
+ }
+ if (cbuf == NULL)
+ return;
+ s = g_strdup(a->name);
+ g_strup(s);
+ out_printf(out, "\tcase PROP_%s:\n\t{", s);
+
+ the_type_lower = g_strdup (a->gtktype);
+ g_strdown (the_type_lower);
+
+ if (is_set) {
+ char *cast;
+
+ if (a->atype != NULL)
+ cast = get_type (a->atype, TRUE);
+ else
+ cast = g_strdup (get_cast (a->gtktype, FALSE));
+
+ out_printf (out, "\t%s ARG = (%s) g_value_get_%s (VAL);\n",
+ cast, cast, the_type_lower);
+
+ g_free (cast);
+ } else if ( ! is_set) {
+ char *cast;
+
+ if (a->atype != NULL)
+ cast = get_type (a->atype, TRUE);
+ else
+ cast = g_strdup (get_cast (a->gtktype, FALSE));
+ out_printf (out, "\t%s ARG;\n"
+ "\tmemset (&ARG, 0, sizeof (%s));\n",
+ cast, cast);
+
+ g_free(cast);
+ }
+ g_free (s);
+ out_printf(out, "\t\t{\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");
+ if ( ! is_set) {
+ if (strcmp (a->gtktype, "OBJECT") == 0)
+ out_printf (out, "\t\tg_value_set_%s (VAL, G_OBJECT (ARG))\n",
+ the_type_lower);
+ else
+ out_printf (out, "\t\t"
+ "g_value_set_%s (VAL, ARG);\n",
+ the_type_lower);
+ }
+ g_free (the_type_lower);
+
+ if (is_set) {
+ out_printf (out, "\t\tif (&ARG) ;\n");
+ }
+
+ out_printf (out, "\t\tbreak;\n");
+
+ out_printf (out, "\t}\n");
+}
+
+static void
+add_property (Property *p, gboolean is_set)
+{
+ const char *cbuf;
+ char *the_type_lower;
+ char *name_upper;
+ int line_no;
+
+ if (is_set) {
+ cbuf = p->set;
+ line_no = p->set_line;
+ } else {
+ cbuf = p->get;
+ line_no = p->get_line;
+ }
+ if (cbuf == NULL)
+ return;
+
+ name_upper = g_strdup (p->name);
+ g_strup (name_upper);
+ the_type_lower = g_strdup (p->gtktype);
+ g_strdown (the_type_lower);
+
+ out_printf (out, "\tcase PROP_%s:\n", name_upper);
+
+ out_printf(out, "\t\t{\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");
+
+ g_free (name_upper);
+ g_free (the_type_lower);
+
+ out_printf (out, "\t\tbreak;\n");
+}
+
static void
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"
- "#define __GOB_FUNCTION__ \"%s::%s_arg\"\n"
+ "___object_%s_property (GObject *object,\n"
+ "\tguint property_id,\n"
+ "\t%sGValue *VAL,\n"
+ "\tGParamSpec *pspec)\n"
+ "#define __GOB_FUNCTION__ \"%s::%s_property\"\n"
"{\n"
"\t%s *self;\n\n"
"\tself = %s (object);\n\n"
- "\tswitch (arg_id) {\n",
+ "\tswitch (property_id) {\n",
is_set ? "set" : "get",
+ is_set ? "const " : "",
c->otype, is_set ? "set" : "get",
typebase, macrobase);
- for(li=c->nodes;li;li=g_list_next(li)) {
+ for (li = c->nodes; li != NULL; li = li->next) {
Node *n = li->data;
- Argument *a;
- char *s;
- char *cbuf;
- int line_no;
- if(n->type != ARGUMENT_NODE)
- continue;
- a = (Argument *)n;
- 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);
- 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);
- 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"
- "\treturn;\n\tself = NULL;\n\targ = NULL;\n}\n"
- "#undef __GOB_FUNCTION__\n");
+ if (n->type == PROPERTY_NODE)
+ add_property ((Property *)n, is_set);
+ else if (n->type == ARGUMENT_NODE)
+ add_argument ((Argument *)n, is_set);
+ }
+ out_printf (out, "\tdefault:\n"
+ "/* Apparently in g++ this is needed, glib is b0rk */\n"
+ "#ifndef __PRETTY_FUNCTION__\n"
+ "# undef G_STRLOC\n"
+ "# define G_STRLOC __FILE__ \":\" G_STRINGIFY (__LINE__)\n"
+ "#endif\n"
+ "\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n"
+ "\t\tbreak;\n\t}\n"
+ "\treturn;\n\tself = NULL;\n\tVAL = NULL;\n\tpspec = NULL;\n}\n"
+ "#undef __GOB_FUNCTION__\n");
}
static void
-print_checks(Method *m, FuncArg *fa)
+print_checks (Method *m, FuncArg *fa)
{
GList *li;
gboolean is_void;
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 != NULL; li = li->next) {
Check *ch = li->data;
char *s;
/* point to the method prot in .gob for failed checks */
static void
print_method_body(Method *m, int pre)
{
+ if (m->line_no > 0)
+ out_addline_outfile(out);
out_printf(out, "{\n"
"#define __GOB_FUNCTION__ \"%s::%s\"\n",
((Class *)class)->otype,
- get_real_id(m->id));
+ m->id);
if(pre)
print_preconditions(m);
}
static void
-put_signal_args(Method *m)
+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) {
+ for (ali = m->gtktypes->next, li=m->args->next;
+ li != NULL && ali != NULL;
+ li = li->next, ali = ali->next) {
FuncArg *fa = li->data;
- const char *cast = get_cast(ali->data, FALSE);
+ char *cast = g_strdup (get_cast (ali->data, FALSE));
+
+ if (cast == NULL) {
+ cast = get_type (fa->atype, TRUE);
+ }
/* we should have already proved before that
the we know all the types */
- g_assert(cast);
+ g_assert (cast != NULL);
+
+ out_printf (out, ",\n\t\t(%s)%s", cast,
+ fa->name);
- out_printf(out, ",\n\t\t(%s)%s", cast,
- fa->name);
+ g_free (cast);
}
}
m, FALSE, FALSE, TRUE);
out_addline_outfile(out);
out_printf(out, "{\n");
- s = g_strdup(get_real_id(m->id));
+ s = g_strdup(m->id);
g_strup(s);
if(strcmp(m->mtype->name, "void") == 0 &&
m->mtype->pointer == NULL) {
print_preconditions(m);
if(((FuncArg *)m->args->data)->name)
- out_printf(out, "\tgtk_signal_emit (GTK_OBJECT (%s),\n"
- "\t\tobject_signals[%s_SIGNAL]",
+ out_printf(out, "\tg_signal_emit (G_OBJECT (%s),\n"
+ "\t\tobject_signals[%s_SIGNAL], 0",
((FuncArg *)m->args->data)->name, s);
- put_signal_args(m);
+ put_signal_args (m);
out_printf(out, ");\n}\n");
} else {
out_printf(out, "\t");
else
out_printf(out, ")(0);\n");
print_preconditions(m);
- out_printf(out, "\tgtk_signal_emit (GTK_OBJECT (%s),\n"
- "\t\tobject_signals[%s_SIGNAL]",
+ out_printf(out, "\tg_signal_emit (G_OBJECT (%s),\n"
+ "\t\tobject_signals[%s_SIGNAL], 0",
((FuncArg *)m->args->data)->name, s);
put_signal_args(m);
out_printf(out, ",\n\t\t&return_val);\n"
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));
+ m->id);
if(strcmp(m->mtype->name, "void") == 0 &&
m->mtype->pointer == NULL) {
GList *li;
out_printf(out, "\t\t(*klass->%s)(%s",
- get_real_id(m->id),
+ m->id,
((FuncArg *)m->args->data)->name);
for(li=m->args->next;li;li=g_list_next(li)) {
FuncArg *fa = li->data;
} else {
GList *li;
out_printf(out, "\t\treturn (*klass->%s)(%s",
- get_real_id(m->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, "#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);
+ args, s, m->id, s, 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);
+ args, s, m->id, s, m->id, args);
out_printf(out, "(");
print_type(out, m->mtype, TRUE);
out_printf(out, ")%s))\n",
{
char *outfile, *outfileh, *outfileph;
- if(!for_cpp)
- outfile = g_strconcat(filebase, ".c", NULL);
+ if ( ! for_cpp)
+ outfile = g_strconcat (filebase, ".c", NULL);
else
- outfile = g_strconcat(filebase, ".cc", NULL);
- if(no_touch_headers)
- outfileh = g_strconcat("#gob#", filebase, ".h#gob#", NULL);
+ 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);
+ 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);
+ 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");
+ if (no_write) {
+ devnull = fopen ("/dev/null", "w");
+ if (devnull == NULL)
+ g_error ("Cannot open null device");
out = devnull;
outh = devnull;
- if(outfileph)
+ if (outfileph != NULL)
outph = devnull;
} else {
- out = fopen(outfile, "w");
- if(!out) {
- g_error("Cannot open outfile: %s", outfile);
+ out = fopen (outfile, "w");
+ if (out == NULL) {
+ 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);
+ outh = fopen (outfileh, "w");
+ if (outh == NULL)
+ g_error ("Cannot open outfile: %s", outfileh);
+ if (outfileph != NULL) {
+ outph = fopen (outfileph, "w");
+ if (outph == NULL)
+ g_error ("Cannot open outfile: %s", outfileh);
}
}
}
static void
-put_argument_nongnu_wrappers(Class *c)
+put_argument_nongnu_wrappers (Class *c)
{
GList *li;
- if(get_arguments < 0 && set_arguments < 0)
+ if (get_properties < 0 && set_properties < 0)
return;
- for(li=c->nodes;li;li=g_list_next(li)) {
+ for (li = c->nodes; li != NULL; li = li->next) {
Node *n = li->data;
- Argument *a = (Argument *)n;
+ const char *name, *gtktype;
+ gboolean get, set;
+ Type *atype;
char *aname;
char *cast;
- if(n->type != ARGUMENT_NODE)
+ if (n->type == ARGUMENT_NODE) {
+ Argument *a = (Argument *)n;
+ name = a->name;
+ gtktype = a->gtktype;
+ atype = a->atype;
+ get = a->get != NULL;
+ set = a->set != NULL;
+ } else if (n->type == PROPERTY_NODE) {
+ Property *p = (Property *)n;
+ name = p->name;
+ gtktype = p->gtktype;
+ atype = p->ptype;
+ get = p->get != NULL;
+ set = p->set != NULL;
+ } else {
continue;
+ }
- aname = g_strdup(a->name);
- g_strup(aname);
+ aname = g_strdup (name);
+ g_strup (aname);
- if(a->atype)
- cast = get_type(a->atype, TRUE);
+ if (atype != NULL)
+ cast = get_type (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);
+ cast = g_strdup (get_cast (gtktype, TRUE));
+
+ if (cast != NULL) {
+ if (set)
+ out_printf (outh, "#define %s_PROP_%s(arg) \t"
+ "\"%s\",(%s)(arg)\n",
+ macrobase, aname, name, cast);
+ if (get)
+ out_printf (outh, "#define %s_GET_PROP_%s(arg)\t"
+ "\"%s\",(%s*)(arg)\n",
+ macrobase, aname, 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);
+ if(set)
+ out_printf (outh, "#define %s_PROP_%s(arg) \t"
+ "\"%s\",(arg)\n",
+ macrobase, aname, name);
+ if(get)
+ out_printf (outh, "#define %s_GET_PROP_%s(arg)\t"
+ "\"%s\",(arg)\n",
+ macrobase, aname, name);
}
- g_free(cast);
- g_free(aname);
+ g_free (cast);
+ g_free (aname);
}
}
{
GList *li;
- if(get_arguments < 0 && set_arguments < 0)
+ if(get_properties < 0 && set_properties < 0)
return;
- for(li=c->nodes;li;li=g_list_next(li)) {
+ for (li = c->nodes; li != NULL; li = li->next) {
Node *n = li->data;
- Argument *a = (Argument *)n;
- char *s;
+ const char *name, *gtktype;
+ gboolean get, set;
+ Type *atype;
+ char *aname;
char *cast;
- if(n->type != ARGUMENT_NODE)
+
+ if (n->type == ARGUMENT_NODE) {
+ Argument *a = (Argument *)n;
+ name = a->name;
+ gtktype = a->gtktype;
+ atype = a->atype;
+ get = a->get != NULL;
+ set = a->set != NULL;
+ } else if (n->type == PROPERTY_NODE) {
+ Property *p = (Property *)n;
+ name = p->name;
+ gtktype = p->gtktype;
+ atype = p->ptype;
+ get = p->get != NULL;
+ set = p->set != NULL;
+ } else {
continue;
- s = g_strdup(a->name);
- g_strup(s);
- if(a->atype)
- cast = get_type(a->atype, TRUE);
+ }
+
+ aname = g_strdup (name);
+ g_strup (aname);
+
+ if (atype != NULL)
+ cast = get_type (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"
+ cast = g_strdup (get_cast (gtktype, TRUE));
+
+ if (cast != NULL) {
+ if (set)
+ out_printf (outh, "#define %s_PROP_%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"
+ macrobase, aname, name, cast);
+ if (get)
+ out_printf (outh, "#define %s_GET_PROP_%s(arg)\t"
"\"%s\",({%s*z = (arg); z;})\n",
- macrobase, s, a->name, cast);
+ macrobase, aname, name, cast);
} else {
- if(a->set)
- out_printf(outh, "#define %s_ARG_%s(arg) \t"
+ if (set)
+ out_printf (outh, "#define %s_PROP_%s(arg) \t"
"\"%s\",(arg)\n",
- macrobase, s, a->name);
- if(a->get)
- out_printf(outh, "#define %s_GET_ARG_%s(arg)\t"
+ macrobase, aname, name);
+ if (get)
+ out_printf (outh, "#define %s_GET_PROP_%s(arg)\t"
"\"%s\",(arg)\n",
- macrobase, s, a->name);
+ macrobase, aname, name);
}
- g_free(cast);
- g_free(s);
+ g_free (cast);
+ g_free (aname);
}
}
static void
print_class_block(Class *c)
{
- GList *l;
+ GList *li;
char *s;
gboolean printed_private = FALSE;
"(%s_get_type())\n",
macrotype, funcbase);
out_printf(outh, "#define %s(obj)\t"
- "GTK_CHECK_CAST((obj), %s_get_type(), %s)\n",
+ "G_TYPE_CHECK_INSTANCE_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",
+ "G_TYPE_CHECK_INSTANCE_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",
+ "G_TYPE_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",
+ "G_TYPE_CHECK_INSTANCE_TYPE((obj), %s_get_type ())\n\n",
macrois, funcbase);
- out_printf(outh, "#ifdef GTK_CHECK_GET_CLASS\n"
+ out_printf(outh,
"#define %s_GET_CLASS(obj)\t"
- "GTK_CHECK_GET_CLASS((obj), %s_get_type(), %sClass)\n",
+ "G_TYPE_INSTANCE_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) {
+ 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 TYPE_SELF %s\n", macrotype);
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",
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",
+ 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)) {
+ 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 (li = c->nodes; li; li=li->next) {
static gboolean printed_public = FALSE;
- Node *n = l->data;
+ Node *n = li->data;
Variable *v = (Variable *)n;
if(n->type == VARIABLE_NODE &&
v->scope == PUBLIC_SCOPE) {
}
}
/* put protecteds always AFTER publics */
- for(l=c->nodes; l; l=g_list_next(l)) {
- Node *n = l->data;
+ for (li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
Variable *v = (Variable *)n;
- if(n->type == VARIABLE_NODE &&
- v->scope == PROTECTED_SCOPE) {
- if( ! printed_private) {
- out_printf(outh, "\t/*< private >*/\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);
+ 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);
+ 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");
+ out_printf (outh, "};\n");
- if(privates > 0) {
+ 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)
+ if (outph != NULL)
outfp = outph;
else
outfp = out;
- out_printf(outfp, "struct _%sPrivate {\n",
- typebase);
- for(l=c->nodes; l; l=l->next) {
- Node *n = l->data;
+ out_printf (outfp, "struct _%sPrivate {\n",
+ typebase);
+ for(li=c->nodes; li; li=li->next) {
+ Node *n = li->data;
Variable *v = (Variable *)n;
if(n->type == VARIABLE_NODE &&
v->scope == PRIVATE_SCOPE) {
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;
+ for(li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
if(n->type == METHOD_NODE)
put_vs_method((Method *)n);
}
+ /* If BonoboX type class put down the epv */
+ if (c->bonobo_x_class != NULL) {
+ out_printf (outh,
+ "\t/* Bonobo object epv */\n"
+ "\tPOA_%s__epv _epv;\n",
+ c->bonobo_x_class);
+ }
/* put class scope variables */
- for(l = c->nodes; l != NULL; l = l->next) {
- Node *n = l->data;
+ for (li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
Variable *v = (Variable *)n;
- if(n->type == VARIABLE_NODE &&
- v->scope == CLASS_SCOPE)
- put_variable((Variable *)n, outh);
+ if (n->type == VARIABLE_NODE &&
+ v->scope == CLASS_SCOPE)
+ put_variable ((Variable *)n, outh);
}
- out_printf(outh, "};\n\n");
+ 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");
+ out_printf (out, "/* here are local prototypes */\n");
+ if (set_properties > 0) {
+ out_printf (out, "static void ___object_set_property "
+ "(GObject *object, guint property_id, "
+ "const GValue *value, GParamSpec *pspec);\n");
}
- if(get_arguments > 0) {
- out_printf(out, "static void ___object_get_arg "
- "(GtkObject *object, GtkArg *arg, "
- "guint arg_id);\n");
+ if (get_properties > 0) {
+ out_printf (out, "static void ___object_get_property "
+ "(GObject *object, guint property_id, "
+ "GValue *value, GParamSpec *pspec);\n");
}
- out_printf(outh, "\n/*\n"
- " * Public methods\n"
- " */\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");
+ if ( ! overrode_get_type) {
+ out_printf (outh, "GType\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;
+ for(li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
if(n->type == METHOD_NODE) {
put_pub_method((Method *)n);
put_prot_method((Method *)n);
}
/* argument wrapping macros */
- if(get_arguments > 0 || set_arguments > 0) {
+ if(get_properties > 0 || set_properties > 0) {
out_printf(outh, "\n/*\n"
" * Argument wrapping macros\n"
" */\n");
}
if(signals > 0) {
- for(l = c->nodes; l != NULL; l = l->next) {
- Node *n = l->data;
+ for(li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
if(n->type == METHOD_NODE)
add_signal_prots((Method *)n);
}
add_enums(c);
- if ( ! overrode_get_type)
- add_get_type();
+ if ( ! overrode_get_type) {
+ if (c->bonobo_x_class != NULL)
+ add_bonobo_x_get_type ();
+ else
+ add_get_type ();
+ }
if(any_method_to_alias(c)) {
if( ! no_gnu) {
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);
+ out_printf (out, "/* a macro for creating a new object of our type */\n");
+ out_printf (out,
+ "#define GET_NEW ((%s *)g_object_new(%s_get_type(), NULL))\n\n",
+ typebase, funcbase);
+
+ out_printf (out, "/* a function for creating a new object of our type */\n");
+ out_printf (out, "#include <stdarg.h>\n");
+ out_printf (out,
+ "static %s * GET_NEW_VARG (const char *first, ...)%s;\n"
+ "static %s *\nGET_NEW_VARG (const char *first, ...)\n"
+ "{\n\t%s *ret;\n\tva_list ap;\n"
+ "\tva_start (ap, first);\n"
+ "\tret = (%s *)g_object_new_valist (%s_get_type (), "
+ "first, ap);\n"
+ "\tva_end (ap);\n"
+ "\treturn ret;\n}\n\n",
+ typebase,
+ no_gnu ? "" : " G_GNUC_UNUSED",
+ typebase, typebase, typebase, funcbase);
+
+ if (need_shutdown)
+ add_shutdown (c);
+
+ if (need_finalize)
+ add_finalize (c);
add_inits(c);
- if(set_arguments > 0) {
+ if(set_properties > 0) {
add_getset_arg(c, TRUE);
}
- if(get_arguments > 0) {
+ if(get_properties > 0) {
add_getset_arg(c, FALSE);
}
- for(l = c->nodes; l != NULL; l = l->next) {
- Node *n = l->data;
+ for(li = c->nodes; li != NULL; li = li->next) {
+ Node *n = li->data;
if(n->type == METHOD_NODE)
put_method((Method *)n);
}
}
static void
-print_version_macros(void)
+print_useful_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);
+ int major = 0, minor = 0, pl = 0;
+
+ /* Version stuff */
+ 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);
+
+ /* Useful priv macro thingie */
+ /* FIXME: this should be done the same way that priv is, as a var,
+ * not a define */
+ out_printf (out, "#define selfp (self->_priv)\n\n");
}
static void
{
GList *li;
- /* mandatory include */
- out_printf(outh, "#include <gtk/gtk.h>\n\n");
+ /* mandatory includes */
+ out_printf(outh, "#include <glib.h>\n");
+ out_printf(outh, "#include <gobject/gobject.h>\n");
+ out_printf(outh, "#include <gobject/gvaluetypes.h>\n");
+ out_printf(outh, "#include <gobject/genums.h>\n");
+ out_printf(outh, "#include <gobject/gboxed.h>\n");
+ out_printf(outh, "#include <gobject/gparamspecs.h>\n\n");
/* print the HT_CCODE blocks */
- for(li=nodes;li;li=g_list_next(li)) {
+ for (li = nodes; li != NULL; li = li->next) {
Node *node = li->data;
if(node->type == CCODE_NODE) {
CCode *cc = (CCode *)node;
print_header_prefixes();
- print_version_macros();
+ print_useful_macros();
print_includes();
"\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");
+ "\t--no-kill-underscores Ignored for compatibility\n");
}
static void
} 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;
+ /* no op */;
} else if(strcmp(argv[i], "--always-private-struct")==0) {
always_private_struct = TRUE;
} else if(strcmp(argv[i], "--")==0) {
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);
- overrode_get_type = find_get_type((Class *)class);
-
- make_bases();
- make_inits((Class *)class);
- if(destructors > 0) {
- need_destroy = TRUE;
- find_destroy((Class *)class);
- }
- if(privates > 0) {
+ signals = count_signals ((Class *)class);
+ set_properties = count_set_properties ((Class *)class) +
+ count_set_arguments ((Class *)class);
+ get_properties = count_get_properties ((Class *)class) +
+ count_get_arguments ((Class *)class);
+ overrides = count_overrides ((Class *)class);
+ privates = count_privates ((Class *)class);
+ protecteds = count_protecteds ((Class *)class);
+ unreftors = count_unreftors ((Class *)class);
+ destructors = count_destructors ((Class *)class);
+ initializers = count_initializers ((Class *)class);
+ overrode_get_type = find_get_type ((Class *)class);
+
+ make_bases ();
+ make_inits ((Class *)class);
+ if(unreftors > 0) {
+ need_shutdown = TRUE;
+ find_shutdown ((Class *)class);
+ }
+ if (destructors > 0 ||
+ 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);
+ 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_property_types ((Class *)class);
+ check_argument_types ((Class *)class);
+ check_func_arg_checks ((Class *)class);
exit_on_error = TRUE;
- if(got_error)
- exit(1);
+ if (got_error)
+ exit (1);
- any_special = setup_special_array((Class *)class, special_array);
+ any_special = setup_special_array ((Class *)class, special_array);
- open_files();
+ open_files ();
- generate_outfiles();
+ generate_outfiles ();
- if(devnull)
- fclose(devnull);
- else {
- fclose(out);
- fclose(outh);
- if(outph)
- fclose(outph);
+ if (devnull) {
+ fclose (devnull);
+ } else {
+ fclose (out);
+ fclose (outh);
+ if (outph)
+ fclose (outph);
}
- if(no_touch_headers &&
- ! no_write)
- compare_and_move_header();
+ if (no_touch_headers &&
+ ! no_write)
+ compare_and_move_header ();
return 0;
}
projects / gob-dx.git / blobdiff