/* GOB C Preprocessor
* Copyright (C) 1999,2000 the Free Software Foundation.
* Copyright (C) 2000 Eazel, Inc.
- * Copyright (C) 2001-2004 George (Jiri) Lebl
+ * Copyright (C) 2001-2009 George (Jiri) Lebl
*
* Author: George (Jiri) Lebl
*
static gboolean special_array[SPECIAL_LAST] = {0};
static gboolean any_special = FALSE;
+static gboolean need_constructor = FALSE;
+static Method * user_constructor = NULL;
+
static gboolean need_dispose = FALSE;
static Method * dispose_handler = NULL;
-
+static Method * user_dispose_method = NULL;
+
static gboolean need_finalize = FALSE;
static Method * finalize_handler = NULL;
+static Method * user_finalize_method = NULL;
FILE *out = NULL;
FILE *outh = NULL;
const char *afterargs,
const char *postfix,
const Method *m,
+ gboolean print_funcattrs,
gboolean one_arg_per_line,
gboolean no_funcbase,
gboolean kill_underscore,
} else {
out_printf(fp, "void");
}
- out_printf(fp, "%s)%s", afterargs, postfix);
+ /* Slightly icky: sometimes we are called st m->funcattrs
+ hasn't been set, but if so it should be NULL since its been
+ zero-initialized. */
+ if(print_funcattrs && m->funcattrs != NULL
+ && strlen(m->funcattrs) > 0) {
+ /* To keep the output neat, we trim off the trailing '\n'
+ from the end of funcattrs for a moment. */
+ size_t funcattrs_len = strlen(m->funcattrs);
+ gboolean funcattrs_chomped = FALSE;
+ if((m->funcattrs)[funcattrs_len - 1] == '\n') {
+ m->funcattrs[funcattrs_len - 1] = '\0';
+ funcattrs_chomped = TRUE;
+ }
+ out_printf(fp, "%s)\n%s%s", afterargs, m->funcattrs, postfix);
+ /* Put it back like it was (though it shouldn't matter). */
+ if (funcattrs_chomped) {
+ (m->funcattrs)[funcattrs_len - 1] = '\n';
+ }
+ }
+ else {
+ out_printf(fp, "%s)%s", afterargs, postfix);
+ }
}
static gboolean
if(m->method == INIT_METHOD ||
m->method == CLASS_INIT_METHOD ||
+ m->method == CONSTRUCTOR_METHOD ||
+ m->method == DISPOSE_METHOD ||
+ m->method == FINALIZE_METHOD ||
m->method == OVERRIDE_METHOD)
continue;
if(m->method == INIT_METHOD ||
m->method == CLASS_INIT_METHOD ||
+ m->method == CONSTRUCTOR_METHOD ||
+ m->method == DISPOSE_METHOD ||
+ m->method == FINALIZE_METHOD ||
m->method == OVERRIDE_METHOD)
continue;
if(m->method == INIT_METHOD ||
m->method == CLASS_INIT_METHOD ||
+ m->method == CONSTRUCTOR_METHOD ||
+ m->method == DISPOSE_METHOD ||
+ m->method == FINALIZE_METHOD ||
m->method == OVERRIDE_METHOD)
continue;
/* if a signal mark it as such */
if(m->method != VIRTUAL_METHOD)
- print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n",
- m, FALSE, TRUE, TRUE, FALSE, FALSE);
+ print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n",
+ m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE);
else
- print_method(outh, "\t", "(* ", "", ") ", "", ";\n",
- m, FALSE, TRUE, TRUE, FALSE, FALSE);
+ print_method(outh, "\t", "(* ", "", ") ", "", ";\n",
+ m, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE);
+
}
static void
if(m->scope != PUBLIC_SCOPE)
return;
+ out_addline_infile(outh, m->line_no);
print_method(outh, "", "\t", "", "\t", "", ";\n", m,
- TRUE, FALSE, TRUE, FALSE, FALSE);
+ TRUE, TRUE, FALSE, TRUE, FALSE, FALSE);
+ out_addline_outfile(outh);
}
static void
"(GCallback) __extension__ ({",
funcbase, m->id, macrobase, typebase, m->id);
print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
- " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
+ " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE);
out_printf (outh, "___%s; }), (data))\n", m->id);
/* connect_after */
"(GCallback) __extension__ ({",
funcbase, m->id, macrobase, typebase, m->id);
print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
- " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
+ " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE);
out_printf (outh, "___%s; }), (data))\n", m->id);
/* connect_data */
"(GCallback) __extension__ ({",
funcbase, m->id, macrobase, typebase, m->id);
print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
- " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
+ " = (func); ", m, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE);
out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id);
}
}
static void
put_prot_method(const Method *m)
{
- if(m->scope != PROTECTED_SCOPE)
- return;
+ FILE *f;
- if(outph)
- print_method(outph, "", "\t", "", "\t", "", ";\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
- else
- print_method(out, "", "\t", "", "\t", "", ";\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ if(m->scope != PROTECTED_SCOPE)
+ return;
+
+ f = outph ? outph : out;
+
+ out_addline_infile(f, m->line_no);
+ print_method(f, "", "\t", "", "\t", "", ";\n",
+ m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE);
+ out_addline_outfile(f);
}
static void
if(m->cbuf)
print_method(out,
"static ", "___real_", "", " ", "", ";\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
}
/* no else, here, it might still have a private prototype, it's not
* exclusive */
m->cbuf)) {
/* add unique ID */
char *s = g_strdup_printf("___%x_", (guint)m->unique_id);
+ out_addline_infile(out, m->line_no);
print_method(out, "static ", s, "", " ", "",
no_gnu?";\n":" G_GNUC_UNUSED;\n",
- m, FALSE, FALSE, FALSE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
+ out_addline_outfile(out);
g_free(s);
} else if(m->scope == PRIVATE_SCOPE ||
m->method == INIT_METHOD ||
- m->method == CLASS_INIT_METHOD) {
+ m->method == CLASS_INIT_METHOD ||
+ m->method == CONSTRUCTOR_METHOD ||
+ m->method == DISPOSE_METHOD ||
+ m->method == FINALIZE_METHOD) {
+ out_addline_infile(out, m->line_no);
print_method(out, "static ", "", "", " ", "",
no_gnu?";\n":" G_GNUC_UNUSED;\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE);
+ out_addline_outfile(out);
}
}
}
}
-static void
-find_dispose(const Class *cl)
+static Method *
+find_method(const Class *cl, int method, const char *id)
{
GList *li;
- dispose_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, "dispose")==0) {
- if(strcmp(m->otype, "G:Object") != 0) {
- error_print(GOB_ERROR, m->line_no,
- "dispose method override "
- "of class other then "
- "G:Object");
- }
- if(g_list_length(m->args) != 1) {
- error_print(GOB_ERROR, m->line_no,
- "dispose method override "
- "with more then one "
- "parameter");
- }
- dispose_handler = m;
- break;
- }
+ if (m->method == method
+ && (id == NULL || strcmp(m->id, id)==0))
+ return m;
}
}
+
+ return NULL;
}
static void
-find_finalize(const Class *cl)
+find_constructor(const Class *cl)
{
- GList *li;
+ user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL);
+}
- finalize_handler = NULL;
- for(li=cl->nodes;li;li=g_list_next(li)) {
- Node *n = li->data;
- if(n->type == METHOD_NODE) {
- Method *m = (Method *)n;
- if(m->method == OVERRIDE_METHOD &&
- strcmp(m->id, "finalize")==0) {
- if(strcmp(m->otype, "G:Object") != 0) {
- error_print(GOB_ERROR, m->line_no,
- "finalize method override "
- "of class other then "
- "G:Object");
- }
- if(g_list_length(m->args) != 1) {
- error_print(GOB_ERROR, m->line_no,
- "finalize method override "
- "with more then one "
- "parameter");
- }
- finalize_handler = m;
- break;
- }
- }
+static void
+find_dispose(const Class *cl)
+{
+ dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose");
+ if (dispose_handler != NULL) {
+ if(strcmp(dispose_handler->otype, "G:Object") != 0)
+ error_print(GOB_ERROR, dispose_handler->line_no,
+ "dispose method override "
+ "of class other then "
+ "G:Object");
+ if(g_list_length(dispose_handler->args) != 1)
+ error_print(GOB_ERROR, dispose_handler->line_no,
+ "dispose method override "
+ "with more then one "
+ "parameter");
+ }
+
+ user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL);
+}
+
+static void
+find_finalize(const Class *cl)
+{
+ finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize");
+ if (finalize_handler != NULL) {
+ if(strcmp(finalize_handler->otype, "G:Object") != 0)
+ error_print(GOB_ERROR, finalize_handler->line_no,
+ "finalize method override "
+ "of class other then "
+ "G:Object");
+ if(g_list_length(finalize_handler->args) != 1)
+ error_print(GOB_ERROR, finalize_handler->line_no,
+ "finalize method override "
+ "with more then one "
+ "parameter");
}
+
+ user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL);
}
if (v->initializer_simple)
out_printf(out, "\t%s->%s = %s;\n",
root, v->id, v->initializer);
- else if (!strcmp(v->id, "_glade_xml"))
+ else if (strcmp(v->id, "_glade_xml") == 0)
+ /* This is OK, this v->initializer string is set internally
+ and it will eat exactly one string! */
out_printf(out,v->initializer, ((FuncArg *)m->args->data)->name);
else
- out_printf(out,v->initializer);
+ out_printf(out, "%s", v->initializer);
if(v->initializer_line > 0)
out_addline_outfile(out);
}
}
+static void
+add_constructor (Class *c)
+{
+ out_printf(out, "\nstatic GObject *\n"
+ "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n"
+ "{\n");
+ out_printf(out,
+ "#define __GOB_FUNCTION__ \"%s::constructor\"\n",
+ c->otype);
+
+ out_printf(out, "\tGObject *obj_self;\n");
+ out_printf(out, "\t%s *self;\n", typebase);
+
+ out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n");
+ out_printf(out, "\tself = %s (obj_self);\n", macrobase);
+
+ if (user_constructor->line_no > 0)
+ out_addline_infile (out, user_constructor->line_no);
+ out_printf (out, "\t%s_constructor (self);\n", funcbase);
+ if (user_constructor->line_no > 0)
+ out_addline_outfile (out);
+
+ out_printf(out, "\treturn obj_self;\n");
+ out_printf(out, "}\n"
+ "#undef __GOB_FUNCTION__\n\n");
+}
+
static void
add_dispose (Class *c)
{
"#define __GOB_FUNCTION__ \"%s::dispose\"\n",
c->otype);
- if (unreftors > 0) {
+ if (unreftors > 0 || user_dispose_method != NULL) {
out_printf (out, "\t%s *self%s = %s (obj_self);\n",
typebase,
! no_gnu ? " G_GNUC_UNUSED" : "",
if (dispose_handler->line_no > 0)
out_addline_outfile (out);
} else {
+ if (user_dispose_method != NULL) {
+ if (user_dispose_method->line_no > 0)
+ out_addline_infile (out, user_dispose_method->line_no);
+ out_printf (out, "\t%s_dispose (self);\n", funcbase);
+ if (user_dispose_method->line_no > 0)
+ out_addline_outfile (out);
+ }
+
out_printf (out,
"\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n"
"\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n");
c->otype);
if (privates > 0 ||
- destructors > 0) {
+ destructors > 0 ||
+ user_finalize_method != NULL) {
const char *unused = "";
if ( ! no_gnu)
unused = " G_GNUC_UNUSED";
if(finalize_handler->line_no > 0)
out_addline_outfile(out);
} else {
+ if (user_finalize_method != NULL) {
+ if (user_finalize_method->line_no > 0)
+ out_addline_infile (out, user_finalize_method->line_no);
+ out_printf (out, "\t%s_finalize (self);\n", funcbase);
+ if (user_finalize_method->line_no > 0)
+ out_addline_outfile (out);
+ }
+
out_printf(out,
"\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n"
"\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n");
if(m->line_no > 0)
out_addline_infile(out, m->line_no);
print_method(out, "static ", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, TRUE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, TRUE,
+ FALSE);
+ out_printf(out, "{\n");
if(m->line_no > 0)
out_addline_outfile(out);
- out_printf(out, "{\n"
+ out_printf(out,
"#define __GOB_FUNCTION__ \"%s::init\"\n",
c->otype);
if (privates > 0) {
if(m->line_no > 0)
out_addline_infile(out, m->line_no);
print_method(out, "static ", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, TRUE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, TRUE,
+ FALSE);
+ out_printf(out, "{\n");
if(m->line_no > 0)
out_addline_outfile(out);
- out_printf(out, "{\n"
+ out_printf(out,
"#define __GOB_FUNCTION__ \"%s::class_init\"\n",
c->otype);
if (set_properties > 0 ||
get_properties > 0 ||
signals > 0 ||
+ need_constructor ||
need_dispose ||
need_finalize) {
out_printf(out,
/* if there are no handlers for these things, we
* need to set them up here */
+ if(need_constructor)
+ out_printf(out, "\tg_object_class->constructor "
+ "= ___constructor;\n");
if(need_dispose && !dispose_handler)
out_printf(out, "\tg_object_class->dispose "
"= ___dispose;\n");
static void
print_method_body (Method *m, gboolean pre, gboolean unused_self)
{
+ out_printf(out, "{\n");
if (m->line_no > 0)
out_addline_outfile(out);
- out_printf(out, "{\n"
- "#define __GOB_FUNCTION__ \"%s::%s\"\n",
+ out_printf(out, "#define __GOB_FUNCTION__ \"%s::%s\"\n",
((Class *)class)->otype,
m->id);
if (pre)
out_addline_infile(out, m->line_no);
if(m->scope == PRIVATE_SCOPE)
print_method(out, "static ", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
else /* PUBLIC, PROTECTED */
print_method(out, "", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
print_method_body(m, TRUE, TRUE);
/* the outfile line was added above */
break;
out_addline_infile(out, m->line_no);
if(m->scope == PRIVATE_SCOPE)
print_method(out, "static ", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
else /* PUBLIC, PROTECTED */
print_method(out, "", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
- out_addline_outfile (out);
-
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
out_printf (out, "{\n");
+ out_addline_outfile (out);
+
out_printf (out,
"\tGValue ___param_values[%d];\n"
"\tGValue ___return_val;\n\n"
if(m->line_no > 0)
out_addline_infile(out, m->line_no);
print_method(out, "static ", "\n___real_", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, TRUE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE);
print_method_body(m, FALSE, TRUE);
/* the outfile line was added above */
break;
out_addline_infile(out, m->line_no);
if(m->scope==PRIVATE_SCOPE)
print_method(out, "static ", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
else /* PUBLIC, PROTECTED */
print_method(out, "", "\n", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, FALSE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
+ out_printf(out, "{\n");
out_addline_outfile(out);
- out_printf(out, "{\n"
- "\t%sClass *klass;\n", typebase);
+ out_printf(out, "\t%sClass *klass;\n", typebase);
print_preconditions(m);
out_printf(out, "\tklass = %s_GET_CLASS(%s);\n\n"
"\tif(klass->%s)\n",
if(m->line_no > 0)
out_addline_infile(out, m->line_no);
print_method(out, "static ", "\n___real_", "", " ", "", "\n",
- m, FALSE, FALSE, TRUE, TRUE, FALSE);
+ m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE);
print_method_body(m, FALSE, TRUE);
/* the outfile line was added above */
break;
out_addline_infile(out, m->line_no);
s = g_strdup_printf("\n___%x_", (guint)m->unique_id);
print_method(out, "static ", s, "", " ", "", "\n",
- m, FALSE, FALSE, FALSE, TRUE, FALSE);
+ m, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE);
g_free(s);
out_addline_outfile(out);
s = replace_sep(m->otype, '_');
/* the outfile line was added above */
out_printf(out, "#undef PARENT_HANDLER\n");
break;
+ case CONSTRUCTOR_METHOD:
+ case DISPOSE_METHOD:
+ case FINALIZE_METHOD:
+ if(m->line_no > 0)
+ out_addline_infile(out, m->line_no);
+ print_method(out, "static ", "\n", "", " ", "", "\n",
+ m, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE);
+ print_method_body(m, TRUE, TRUE);
+ /* the outfile line was added above */
default:
break;
}
}
out_printf(fp, "%s\n", cc->cbuf);
if(cc->cctype == C_CCODE ||
+ cc->cctype == AD_CCODE ||
cc->cctype == A_CCODE ||
cc->cctype == AT_CCODE ||
cc->cctype == PH_CCODE)
" */\n");
if ( ! overrode_get_type) {
- out_printf (outh, "GType\t%s_get_type\t(void);\n", funcbase);
+ out_printf (outh, "GType\t%s_get_type\t(void) G_GNUC_CONST;\n", funcbase);
}
for(li = c->nodes; li != NULL; li = li->next) {
funcbase);
}
+ for (li = nodes; li != NULL; li = li->next) {
+ Node *node = li->data;
+ if (node->type == CCODE_NODE) {
+ CCode *cc = (CCode *)node;
+ if (cc->cctype == AD_CCODE)
+ print_ccode_block (cc);
+ }
+ }
+
+ if (need_constructor)
+ add_constructor (c);
+
if (need_dispose)
add_dispose (c);
g_free (str);
out_printf (outh, "%s_get_type()\n", funcprefix);
- out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix);
+ out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
out_printf (out,
"GType\n%s_get_type (void)\n"
g_free (str);
out_printf (outh, "%s_get_type()\n", funcprefix);
- out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix);
+ out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
out_printf (out,
"GType\n%s_get_type (void)\n"
g_free (str);
out_printf (outh, "%s_get_type ()\n", funcprefix);
- out_printf (outh, "GType %s_get_type (void);\n\n", funcprefix);
+ out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
out_printf (out,
"GType\n%s_get_type (void)\n"
if (node->type == CCODE_NODE) {
CCode *cc = (CCode *)node;
if (cc->cctype != HT_CCODE &&
- cc->cctype != AT_CCODE)
+ cc->cctype != AT_CCODE &&
+ cc->cctype != AD_CCODE)
print_ccode_block ((CCode *)node);
} else if (node->type == CLASS_NODE) {
print_class_block ((Class *)node);
make_bases ();
make_inits ((Class *)class);
- if(unreftors > 0) {
+
+ find_constructor ((Class *)class);
+ if (user_constructor != NULL)
+ need_constructor = TRUE;
+
+ find_dispose ((Class *)class);
+ if (unreftors > 0 ||
+ dispose_handler != NULL ||
+ user_dispose_method != NULL)
need_dispose = TRUE;
- find_dispose ((Class *)class);
- }
+
+ find_finalize ((Class *)class);
if (destructors > 0 ||
- privates > 0) {
+ privates > 0 ||
+ user_finalize_method != NULL) {
need_finalize = TRUE;
- find_finalize ((Class *)class);
}
+
check_bad_symbols ((Class *)class);
check_duplicate_symbols ((Class *)class);
check_duplicate_overrides ((Class *)class);
check_property_types ((Class *)class);
check_argument_types ((Class *)class);
check_func_arg_checks ((Class *)class);
+ check_func_attrs ((Class *)class);
check_for_class_destructors ((Class *)class);
exit_on_error = TRUE;
projects / gob-dx.git / blobdiff