gboolean no_lines = FALSE;
gboolean no_self_alias = FALSE;
gboolean no_kill_underscores = FALSE;
+gboolean always_private_struct = FALSE;
int method_unique_id = 1;
if(*p == '[') extra++;
}
g_string_append_c(gs, ' ');
-
- for(i=0; i<(t->stars+extra); i++)
- g_string_append_c(gs, '*');
+ if(t->pointer) {
+ g_string_append(gs, t->pointer);
+ for(i=0; i < extra; i++)
+ g_string_append_c(gs, '*');
+ g_string_append_c(gs, ' ');
+ }
+
s = gs->str;
g_string_free(gs, FALSE);
return s;
else
tn = g_strdup(typename);
- type = new_type(1, tn, NULL);
+ type = new_type(tn, g_strdup("*"), NULL);
node = new_funcarg((Type *)type, name, NULL);
return g_list_prepend(NULL, node);
}
}
if(!got_class_init) {
node = new_method(NO_SCOPE, CLASS_INIT_METHOD,
- (Type *)new_type(0, g_strdup("void"), NULL),
+ (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,
}
if(!got_init) {
node = new_method(NO_SCOPE, INIT_METHOD,
- (Type *)new_type(0, g_strdup("void"), NULL),
+ (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,
find_destroy(Class *cl)
{
GList *li;
- Node *node;
destroy_handler = NULL;
for(li=cl->nodes;li;li=g_list_next(li)) {
find_finalize(Class *cl)
{
GList *li;
- Node *node;
finalize_handler = NULL;
for(li=cl->nodes;li;li=g_list_next(li)) {
static void
add_get_type(void)
{
+ char *chunk_size = ((Class*)class)->chunk_size;
+
out_printf(out, "guint\n"
"%s_get_type (void)\n"
"{\n"
"\t\t\t/* reserved_2 */ NULL,\n"
"\t\t\t(GtkClassInitFunc) NULL,\n"
"\t\t};\n\n"
- "\t\ttype = gtk_type_unique (%s_get_type(), &info);\n"
- "\t}\n\n"
- "\treturn type;\n"
- "}\n\n",
+ "\t\ttype = gtk_type_unique (%s_get_type(), &info);\n",
funcbase, typebase, typebase, typebase,
funcbase, funcbase, pfuncbase);
+ if(chunk_size) {
+ out_printf(out, "#if %s > 0\n"
+ "\t\tgtk_type_set_chunk_alloc(type,%s);\n"
+ "#endif\n",
+ chunk_size, chunk_size);
+ }
+ out_printf(out,"\t}\n\n"
+ "\treturn type;\n"
+ "}\n\n");
}
static void
for(li = c->nodes; li; li = g_list_next(li)) {
Node *n = li->data;
Method *m = (Method *)n;
- char *id;
if(n->type != METHOD_NODE ||
(m->method != SIGNAL_FIRST_METHOD &&
m, FALSE, FALSE, TRUE);
if(m->line_no > 0)
out_addline_outfile(out);
- out_printf(out, "{\n");
+ out_printf(out, "{\n"
+ "#define __GOB_FUNCTION__ \"%s::init\"\n",
+ c->otype);
if(privates > 0) {
out_printf(out, "\t%s->_priv = "
"g_new0 (%sPrivate, 1);\n",
((FuncArg *)m->args->data)->name,
typebase);
+ } else if(always_private_struct) {
+ out_printf(out, "\t%s->_priv = NULL;\n",
+ ((FuncArg *)m->args->data)->name);
}
if(initializers > 0) {
GList *li;
m, FALSE, FALSE, TRUE);
if(m->line_no > 0)
out_addline_outfile(out);
- out_printf(out, "{\n");
+ out_printf(out, "{\n"
+ "#define __GOB_FUNCTION__ \"%s::class_init\"\n",
+ c->otype);
if(signals > 0 ||
arguments > 0 ||
need_destroy ||
} else {
out_printf(out, "return;\n");
}
- out_printf(out, "}\n");
+ out_printf(out, "}\n"
+ "#undef __GOB_FUNCTION__\n");
}
}
"___object_%s_arg (GtkObject *object,\n"
"\tGtkArg *arg,\n"
"\tguint arg_id)\n"
+ "#define __GOB_FUNCTION__ \"%s::%s_arg\"\n"
"{\n"
"\t%s *self;\n\n"
"\tself = %s (object);\n\n"
"\tswitch (arg_id) {\n",
- is_set?"set":"get", typebase, macrobase);
+ is_set ? "set" : "get",
+ c->otype, is_set ? "set" : "get",
+ typebase, macrobase);
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
out_printf(out, "\t\t}\n\t\tbreak;\n"
"#undef ARG\n");
}
- out_printf(out, "\tdefault:\n\t\tbreak;\n\t}\n}\n");
+ out_printf(out, "\tdefault:\n\t\tbreak;\n\t}\n}\n"
+ "#undef __GOB_FUNCTION__\n");
}
static void
gboolean is_void;
gboolean checked_null = FALSE;
is_void = (strcmp(m->mtype->name, "void")==0 &&
- m->mtype->stars == 0);
+ m->mtype->pointer == NULL);
- for(li=fa->checks;li;li=g_list_next(li)) {
+ for(li = fa->checks; li; li = g_list_next(li)) {
Check *ch = li->data;
char *s;
/* point to the method prot in .gob for failed checks */
static void
print_method_body(Method *m, int pre)
{
- out_printf(out, "{\n");
+ out_printf(out, "{\n"
+ "#define __GOB_FUNCTION__ \"%s::%s\"\n",
+ ((Class *)class)->otype,
+ get_real_id(m->id));
if(pre)
print_preconditions(m);
out_printf(out, "\t%s}", m->cbuf);
}
+ /* Note, there is no \n between the last } and this } so that
+ * errors/warnings reported on the end of the body get pointed to the
+ * right line in the .gob source */
out_printf(out, "}\n");
if(m->cbuf)
out_addline_outfile(out);
+ out_printf(out, "#undef __GOB_FUNCTION__\n");
}
static void
char *s, *args, *doc;
gboolean is_void;
is_void = (strcmp(m->mtype->name, "void")==0 &&
- m->mtype->stars == 0);
+ m->mtype->pointer == NULL);
out_printf(out, "\n");
if(m->method != OVERRIDE_METHOD) {
doc = get_gtk_doc(m->id);
out_printf(out, "{\n");
s = g_strdup(get_real_id(m->id));
g_strup(s);
- if(strcmp(m->mtype->name, "void")==0 &&
- m->mtype->stars==0) {
+ 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"
"\tif(klass->%s)\n",
macrobase, ((FuncArg *)m->args->data)->name,
get_real_id(m->id));
- if(strcmp(m->mtype->name, "void")==0 &&
- m->mtype->stars==0) {
+ 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),
"GTK_CHECK_TYPE((obj),%s_get_type ())\n\n",
macrois, funcbase);
- 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 IS_SELF(x) %s(x)\n", macrois);
out_printf(out, "typedef %sClass SelfClass;\n\n", typebase);
}
- if(privates > 0) {
+ 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"
"#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)) {
+ for(l=c->nodes; l; l=g_list_next(l)) {
static gboolean printed_public = FALSE;
Node *n = l->data;
Variable *v = (Variable *)n;
if(n->type == VARIABLE_NODE &&
v->scope == PUBLIC_SCOPE) {
- if(!printed_public) {
+ if( ! printed_public) {
out_printf(outh, "\t/*< public >*/\n");
printed_public = TRUE;
}
}
}
/* put protecteds always AFTER publics */
- for(l=c->nodes;l;l=g_list_next(l)) {
+ for(l=c->nodes; l; l=g_list_next(l)) {
Node *n = l->data;
Variable *v = (Variable *)n;
if(n->type == VARIABLE_NODE &&
v->scope == PROTECTED_SCOPE) {
- if(!printed_private) {
+ if( ! printed_private) {
out_printf(outh, "\t/*< private >*/\n");
printed_private = TRUE;
}
put_variable((Variable *)n, outh);
}
}
- if(privates>0) {
- if(!printed_private)
+ 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(outfp, "struct _%sPrivate {\n",
typebase);
- for(l=c->nodes;l;l=l->next) {
+ for(l=c->nodes; l; l=l->next) {
Node *n = l->data;
Variable *v = (Variable *)n;
if(n->type == VARIABLE_NODE &&
print_help(void)
{
fprintf(stderr, "Gob version %s\n\n", VERSION);
+ fprintf(stderr, "gob [options] file.gob\n\n");
fprintf(stderr, "Options:\n"
"\t--help,-h,-? Display this help\n"
"\t--version Display version\n"
"put private\n"
"\t structure and protected "
"prototypes inside c file\n"
+ "\t--always-private-struct Always create a private pointer "
+ "in\n"
+ "\t the object structure\n"
"\t--no-write,-n Don't write output files, just "
"check syntax\n"
"\t--no-lines Don't print '#line' to output\n"
"\t--no-self-alias Don't create self type and macro "
"aliases\n"
"\t--no-kill-underscores Don't remove the leading underscore "
- "from short id names");
+ "from\n"
+ "\t short id names\n");
}
static void
no_self_alias = TRUE;
} else if(strcmp(argv[i], "--no-kill-underscores")==0) {
no_kill_underscores = TRUE;
+ } else if(strcmp(argv[i], "--always-private-struct")==0) {
+ always_private_struct = TRUE;
} else if(strcmp(argv[i], "--")==0) {
/*further arguments are files*/
no_opts = TRUE;
check_nonvoidempty((Class *)class);
check_signal_args((Class *)class);
check_argument_types((Class *)class);
+ check_func_arg_checks((Class *)class);
exit_on_error = TRUE;
projects / gob-dx.git / blobdiff