static char *ptypebase;
static int signals = 0; /* number of signals */
-static int arguments = 0; /* number of named arguments */
+static int set_arguments = 0; /* number of named (set) arguments */
+static int get_arguments = 0; /* number of named (get) arguments */
static int overrides = 0; /* number of override methods */
static int privates = 0; /* number of private data members */
static int protecteds = 0; /* number of protected methods */
static char *
get_gtk_doc(char *id)
{
- char *val, *s;
+ char *val;
if(!gtk_doc_hash)
return NULL;
if(val)
return g_strdup_printf("/**\n * %s_%s:\n%s **/\n",
funcbase, get_real_id(id), val);
- s = g_strconcat(funcbase, "_", get_real_id(id), NULL);
- val = g_hash_table_lookup(gtk_doc_hash, s);
- g_free(s);
+ val = g_hash_table_lookup(gtk_doc_hash, get_real_id(id));
if(val)
return g_strdup_printf("/**\n * %s_%s:\n%s **/\n",
funcbase, get_real_id(id), val);
return;
if(!no_gnu)
- out_printf(out, "\n\n#ifndef __GNUC__\n");
+ out_printf(out, "\n\n#if (!defined __GNUC__) || (defined __GNUC__ && defined __STRICT_ANSI__)\n");
out_printf(out,
"/*REALLY BAD HACK\n"
" This is to avoid unused warnings if you don't call\n"
out_printf(out, "\t___%s_really_bad_hack_to_avoid_warnings();\n",
funcbase);
if(!no_gnu)
- out_printf(out, "}\n#endif /* __GNUC__ */\n\n");
+ out_printf(out, "}\n#endif /* !__GNUC__ || (__GNUC__ && __STRICT_ANSI__) */\n\n");
else
out_printf(out, "}\n\n");
}
m, FALSE, FALSE, FALSE);
g_free(s);
} else if(m->scope == PRIVATE_SCOPE ||
- m->method == INIT_METHOD ||
- m->method == CLASS_INIT_METHOD)
+ m->method == INIT_METHOD ||
+ m->method == CLASS_INIT_METHOD)
print_method(out, "static ", "", "", " ",
no_gnu?";\n":" G_GNUC_UNUSED;\n",
m, FALSE, FALSE, TRUE);
Method *m = (Method *)n;
if(m->method == INIT_METHOD) {
if(got_init)
- print_error(FALSE, "init defined more then once", m->line_no);
+ error_print(GOB_ERROR, m->line_no, "init defined more then once");
got_init = TRUE;
} else if(m->method == CLASS_INIT_METHOD) {
if(got_class_init)
- print_error(FALSE, "class_init defined more then once", m->line_no);
+ error_print(GOB_ERROR, m->line_no, "class_init defined more then once");
got_class_init = TRUE;
}
}
if(m->method == OVERRIDE_METHOD &&
strcmp(m->id, "destroy")==0) {
if(strcmp(m->otype, "Gtk:Object") != 0) {
- print_error(FALSE,
+ error_print(GOB_ERROR, m->line_no,
"destroy method override "
"of class other then "
- "Gtk:Object",
- m->line_no);
+ "Gtk:Object");
}
if(g_list_length(m->args) != 1) {
- print_error(FALSE,
+ error_print(GOB_ERROR, m->line_no,
"destroy method override "
"with more then one "
- "parameter",
- m->line_no);
+ "parameter");
}
destroy_handler = m;
break;
Method *m = (Method *)n;
if(m->method == OVERRIDE_METHOD &&
strcmp(m->id, "finalize")==0) {
- if(strcmp(m->otype, "Gtk:Object") != 0) {
- print_error(FALSE,
+ if(strcmp(m->otype, "Gtk:Object") != 0 &&
+ strcmp(m->otype, "G:Object") != 0) {
+ error_print(GOB_ERROR, m->line_no,
"finalize method override "
"of class other then "
- "Gtk:Object",
- m->line_no);
+ "Gtk:Object (or G:Object"
+ "for GTK+ 2.0)");
}
if(g_list_length(m->args) != 1) {
- print_error(FALSE,
+ error_print(GOB_ERROR, m->line_no,
"finalize method override "
"with more then one "
- "parameter",
- m->line_no);
+ "parameter");
}
finalize_handler = m;
break;
}
out_printf(out, "\tLAST_SIGNAL\n};\n\n");
}
- if(arguments>0) {
+ if(set_arguments > 0 || get_arguments > 0) {
out_printf(out, "enum {\n\tARG_0");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
break;
}
/* if we haven't found it in our list */
- if(!flags[i]) {
- char *s;
- s = g_strdup_printf("Unknown flag '%s' used, "
- "perhaps it was misspelled",
- flag);
- print_error(TRUE, s, m->line_no);
- g_free(s);
+ if( ! flags[i]) {
+ error_printf(GOB_WARN, m->line_no,
+ "Unknown flag '%s' used, "
+ "perhaps it was misspelled",
+ flag);
}
g_string_sprintfa(gs, " | GTK_RUN_%s", flag);
}
flags,
typebase, get_real_id(m->id), mar,
(char *)m->gtktypes->data,
- is_none?0:g_list_length(m->gtktypes->next));
+ is_none ? 0 : g_list_length(m->gtktypes->next));
g_free(mar);
g_free(sig);
g_free(flags);
- if(!is_none) {
+ if( ! is_none) {
GList *l;
- for(l=m->gtktypes->next;l;l=g_list_next(l))
+ for(l = m->gtktypes->next; l != NULL; l = l->next)
out_printf(out, ",\n\t\t\tGTK_TYPE_%s",
(char *)l->data);
}
out_printf(out, ");\n");
+
+ if(strcmp(m->gtktypes->data, "NONE") != 0 ||
+ ! is_none) {
+ GList *gl, *al;
+ char *sep = "";
+ out_printf(out, "\tif(");
+ if(strcmp(m->gtktypes->data, "NONE") != 0) {
+ out_printf(out, "%s sizeof(", sep);
+ print_type(out, m->mtype, FALSE);
+ out_printf(out, "%s",
+ m->mtype->postfix ?
+ m->mtype->postfix : "");
+ out_printf(out, ") != sizeof(%s)",
+ get_cast(m->gtktypes->data, FALSE));
+
+ sep = " || ";
+ }
+
+ for(al = m->args->next, gl = m->gtktypes->next;
+ al != NULL && gl != NULL;
+ al = al->next, gl = gl->next) {
+ FuncArg *arg = al->data;
+ char *gtkarg = gl->data;
+
+ out_printf(out, "%ssizeof(", sep);
+ print_type(out, arg->atype, FALSE);
+ out_printf(out, "%s",
+ arg->atype->postfix ?
+ arg->atype->postfix : "");
+ out_printf(out, ") != sizeof(%s)",
+ get_cast(gtkarg, FALSE));
+
+ sep = " || ";
+ }
+ out_printf(out, ") {\n"
+ "\t\tg_error(\"%s line %d: Type mismatch "
+ "of \\\"%s\\\" signal signature\");\n"
+ "\t}\n",
+ filename, m->line_no, get_real_id(m->id));
+
+ }
}
out_printf(out, "\tgtk_object_class_add_signals (gtk_object_class,\n"
"\t\tobject_signals, LAST_SIGNAL);\n\n");
if(need_destroy &&
destroy_handler &&
- strcmp(m->id, "destroy") == 0)
+ strcmp(get_real_id(m->id), "destroy") == 0)
out_printf(out, "\tgtk_object_class->destroy "
"= ___destroy;\n");
else if(need_finalize &&
finalize_handler &&
- strcmp(m->id, "finalize") == 0)
+ strcmp(get_real_id(m->id), "finalize") == 0)
out_printf(out,
"#ifdef G_OBJECT_CLASS\n"
"\tg_object_class->finalize = ___finalize;\n"
else if(m->cbuf)
out_printf(out,
"\t%s_class->%s = ___%x_%s_%s;\n",
- s, m->id, (guint)m->unique_id,
- funcbase, m->id);
+ s, get_real_id(m->id), (guint)m->unique_id,
+ funcbase, get_real_id(m->id));
else
out_printf(out, "\t%s_class->%s = NULL;\n",
- s, m->id);
+ s, get_real_id(m->id));
} else {
if(m->cbuf)
out_printf(out, "\t%s->%s = ___real_%s_%s;\n",
flags = g_string_new("GTK_ARG_READABLE");
else
flags = g_string_new("GTK_ARG_WRITABLE");
+
+ g_assert(a->get || a->set);
for(l=a->flags;l;l=g_list_next(l)) {
char *flag = l->data;
if(strcmp(flag, "READWRITE")==0 ||
strcmp(flag, "READABLE")==0 ||
strcmp(flag, "WRITABLE")==0) {
- print_error(TRUE, "READWRITE, READABLE and "
+ error_print(GOB_WARN, a->line_no,
+ "READWRITE, READABLE and "
"WRITABLE argument flags are "
- "set automatically", a->line_no);
+ "set automatically");
continue;
}
- for(i=0;argflags[i];i++) {
+ 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]) {
- char *s;
- s = g_strdup_printf("Unknown flag '%s' used, "
- "perhaps it was misspelled",
- flag);
- print_error(TRUE, s, a->line_no);
- g_free(s);
+ 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);
}
g_string_free(flags, TRUE);
}
- out_printf(out,
- "\n\tgtk_object_class->set_arg = ___object_set_arg;\n"
- "\tgtk_object_class->get_arg = ___object_get_arg;\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");
}
static void
c->otype);
if(destructors > 0) {
- out_printf(out, "\t%s *self G_GNUC_UNUSED = %s (obj_self);\n",
+ out_printf(out, "\t%s *self = %s (obj_self);\n",
typebase, macrobase);
}
}
}
+ out_printf(out, "\treturn;\n");
+ if(destructors > 0)
+ out_printf(out, "\tself = NULL;\n");
out_printf(out, "}\n"
"#undef __GOB_FUNCTION__\n\n");
}
if(privates > 0) {
out_printf(out, "\t%s *self = %s (obj_self);\n",
typebase, macrobase);
+ out_printf(out, "\tgpointer priv = self->_priv;\n");
}
if(finalize_handler) {
}
if(privates > 0) {
- out_printf(out, "\tg_free (self->_priv);\n"
- "\tself->_priv = NULL;\n");
+ out_printf(out, "\tg_free(priv);\n");
}
out_printf(out, "}\n"
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
Method *m;
+
+ gboolean add_unused_class = FALSE;
+
if(n->type != METHOD_NODE)
continue;
m = (Method *)n;
"#define __GOB_FUNCTION__ \"%s::class_init\"\n",
c->otype);
if(signals > 0 ||
- arguments > 0 ||
+ set_arguments > 0 ||
+ get_arguments > 0 ||
need_destroy ||
need_finalize) {
+ add_unused_class = TRUE;
out_printf(out,
"\tGtkObjectClass *"
- "gtk_object_class G_GNUC_UNUSED = "
+ "gtk_object_class = "
"(GtkObjectClass*) %s;\n",
((FuncArg *)m->args->data)->name);
out_printf(out,
"#ifdef G_OBJECT_CLASS\n"
"\tGObjectClass *"
- "g_object_class G_GNUC_UNUSED = "
+ "g_object_class = "
"(GObjectClass*) %s;\n"
"#endif /* G_OBJECT_CLASS */\n",
((FuncArg *)m->args->data)->name);
li = li->next) {
Node *n = li->data;
Variable *v = (Variable *)n;
- if(n->type != VARIABLE_NODE ||
- v->scope != CLASS_SCOPE)
- continue;
- print_initializer(m, v);
+ if(n->type == VARIABLE_NODE &&
+ v->scope == CLASS_SCOPE)
+ print_initializer(m, v);
}
}
"\tgtk_object_class->finalize = ___finalize;\n"
"#endif /* G_OBJECT_CLASS */\n");
- if(arguments > 0)
+ if(get_arguments > 0 || set_arguments > 0)
make_arguments(c);
} else
out_printf(out, "%s\n", m->cbuf);
out_addline_outfile(out);
out_printf(out, " }\n");
- } else {
- out_printf(out, "return;\n");
+ }
+ out_printf(out, "\treturn;\n");
+ out_printf(out,
+ "\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, "}\n"
"#undef __GOB_FUNCTION__\n");
"((%s)GTK_VALUE_%s(*arg))\n",
cast, a->gtktype);
} else {
- out_printf(out, "#ifdef __GNUC__\n");
+ out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
if(strcmp(a->gtktype, "OBJECT")==0) {
out_printf(out, "#define ARG "
"({%s foo = "
"foo; })\n",
cast, a->gtktype);
}
- out_printf(out, "#else /* __GNUC__ */\n");
+ 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__ */\n\n");
+ out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n");
}
out_printf(out, "\t\t{\n");
g_free(cast);
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"
+ "\treturn;\n\tself = NULL;\n\targ = NULL;\n}\n"
"#undef __GOB_FUNCTION__\n");
}
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, m->id, s, m->id, args);
+ args, s, get_real_id(m->id), s, get_real_id(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, m->id, s, m->id, args);
+ args, s, get_real_id(m->id), s, get_real_id(m->id), args);
out_printf(out, "(");
print_type(out, m->mtype, TRUE);
out_printf(out, ")%s))\n",
{
GList *li;
- if(arguments<0)
+ if(get_arguments < 0 && set_arguments < 0)
return;
for(li=c->nodes;li;li=g_list_next(li)) {
{
GList *li;
- if(arguments<0)
+ if(get_arguments < 0 && set_arguments < 0)
return;
for(li=c->nodes;li;li=g_list_next(li)) {
out_printf(outh, "};\n\n");
out_printf(out, "/* here are local prototypes */\n");
- if(arguments > 0) {
+ if(set_arguments > 0) {
out_printf(out, "static void ___object_set_arg "
"(GtkObject *object, GtkArg *arg, "
- "guint arg_id);\n"
- "static void ___object_get_arg "
+ "guint arg_id);\n");
+ }
+ if(get_arguments > 0) {
+ out_printf(out, "static void ___object_get_arg "
"(GtkObject *object, GtkArg *arg, "
"guint arg_id);\n");
}
/* argument wrapping macros */
- if(arguments > 0 && ! no_gnu) {
- out_printf(outh, "\n/*\n"
- " * Argument wrapping macros\n"
- " */\n");
- out_printf(outh, "#ifdef __GNUC__\n");
- put_argument_gnu_wrappers(c);
- out_printf(outh, "#else /* __GNUC__ */\n");
- put_argument_nongnu_wrappers(c);
- out_printf(outh, "#endif /* __GNUC__ */\n\n");
- } else if(arguments > 0 && no_gnu) {
- out_printf(outh, "\n/*\n"
- " * Argument wrapping macros\n"
- " */\n");
- put_argument_nongnu_wrappers(c);
+ if(get_arguments > 0 || set_arguments > 0) {
+ if( ! no_gnu) {
+ out_printf(outh, "\n/*\n"
+ " * Argument wrapping macros\n"
+ " */\n");
+ out_printf(outh, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
+ put_argument_gnu_wrappers(c);
+ out_printf(outh, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n");
+ put_argument_nongnu_wrappers(c);
+ out_printf(outh, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n");
+ } else {
+ out_printf(outh, "\n/*\n"
+ " * Argument wrapping macros\n"
+ " */\n");
+ put_argument_nongnu_wrappers(c);
+ }
}
if(signals > 0) {
if(no_gnu)
make_method_nongnu_aliases(c);
else {
- out_printf(out, "\n#ifdef __GNUC__\n");
+ out_printf(out, "\n#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
make_method_gnu_aliases(c);
- out_printf(out, "#else /* __GNUC__ */\n");
+ out_printf(out, "#else /* __GNUC__ && !__STRICT_ANSI__ */\n");
make_method_nongnu_aliases(c);
- out_printf(out, "#endif /* __GNUC__ */\n\n");
+ out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n\n");
}
}
add_inits(c);
- if(arguments > 0) {
+ if(set_arguments > 0) {
add_getset_arg(c, TRUE);
+ }
+
+ if(get_arguments > 0) {
add_getset_arg(c, FALSE);
}
char *p;
/* We may need string.h for memset */
- if(destructors > 0)
+ if(destructors > 0 &&
+ ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
out_printf(out, "#include <string.h> /* memset() */\n\n");
+ }
p = g_strconcat(filebase, ".h", NULL);
found_header = TRUE;
- if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) {
+ if( ! g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) {
out_printf(out, "#include \"%s.h\"\n\n", filebase);
found_header = FALSE;
}
/* if we are creating a private header see if it was included */
if(outph) {
p = g_strconcat(filebase, "-private.h", NULL);
- if(!g_list_find_custom(include_files, p, (GCompareFunc)strcmp)) {
+ if( ! g_list_find_custom(include_files, p,
+ (GCompareFunc)strcmp)) {
out_printf(out, "#include \"%s-private.h\"\n\n",
filebase);
if(found_header)
- print_error(TRUE,
+ error_printf(GOB_WARN, 0,
"Implicit private header include "
"added to top of\n"
"\tsource file, while public "
"you should\n"
"\texplicitly include "
"the private header below the "
- "public one.", 0);
+ "public one.");
}
g_free(p);
}
"#include \"%s.h\"\n\n", p, p, filebase);
g_free(p);
- if(!no_extern_c) {
+ if( ! no_extern_c) {
out_printf(outh, "#ifdef __cplusplus\n"
"extern \"C\" {\n"
"#endif /* __cplusplus */\n\n");
static void
print_header_postfixes(void)
{
- if(!no_extern_c)
+ if( ! no_extern_c)
out_printf(outh, "\n#ifdef __cplusplus\n"
"}\n"
"#endif /* __cplusplus */\n");
out_printf(outh, "\n#endif\n");
if(outph) {
- if(!no_extern_c)
+ if( ! no_extern_c)
out_printf(outph, "\n#ifdef __cplusplus\n"
"}\n"
"#endif /* __cplusplus */\n");
GList *li;
/* print the AT_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;
- if(cc->cctype==AT_CCODE)
+ if(cc->cctype == AT_CCODE)
print_ccode_block((CCode *)node);
}
}
Node *node = li->data;
if(node->type == CCODE_NODE) {
CCode *cc = (CCode *)node;
- if(cc->cctype==HT_CCODE)
+ if(cc->cctype == HT_CCODE)
print_ccode_block((CCode *)node);
}
}
Node *node = li->data;
if(node->type == CCODE_NODE) {
CCode *cc = (CCode *)node;
- if(cc->cctype!=HT_CCODE)
+ if(cc->cctype != HT_CCODE &&
+ cc->cctype != AT_CCODE)
print_ccode_block((CCode *)node);
} else if(node->type == CLASS_NODE) {
print_class_block((Class *)node);
filename = NULL;
- for(i=1;i<argc;i++) {
- if(no_opts || argv[i][0]!='-') {
+ for(i = 1 ; i < argc; i++) {
+ if(no_opts ||
+ argv[i][0] != '-') {
/*must be a file*/
if(got_file) {
fprintf(stderr, "Specify only one file!\n");
} else {
/*by now we know we have a string starting with
- which is a short option string*/
- char *p = argv[i]+1;
- for(p=argv[i]+1; *p; p++) {
+ char *p;
+ for(p = argv[i] + 1; *p; p++) {
switch(*p) {
case 'w':
exit_on_warn=TRUE;
char *hfnew = g_strconcat("#gob#", filebase, ".h#gob#", NULL);
char *hf = g_strconcat(filebase, ".h", NULL);
struct stat s;
- if(stat(hf, &s)==0) {
+ if(stat(hf, &s) == 0) {
char *s;
s = g_strdup_printf("cmp '%s' '%s' > /dev/null", hf, hfnew);
- if(system(s)==0) {
- if(unlink(hfnew)!=0)
- print_error(FALSE,
- "Can't remove new header file", 0);
+ if(system(s) == 0) {
+ if(unlink(hfnew) != 0)
+ error_printf(GOB_ERROR, 0,
+ "Can't remove new header file");
g_free(hfnew);
g_free(hf);
g_free(s);
return;
}
g_free(s);
- if(unlink(hf)!=0)
- print_error(FALSE, "Can't remove old header file", 0);
+ if(unlink(hf) != 0)
+ error_printf(GOB_ERROR, 0,
+ "Can't remove old header file");
}
- if(rename(hfnew, hf)!=0)
- print_error(FALSE, "Can't rename new header file", 0);
+ if(rename(hfnew, hf) != 0)
+ error_printf(GOB_ERROR, 0,
+ "Can't rename new header file");
g_free(hfnew);
g_free(hf);
}
} else
filename = "stdin";
+ /* This is where parsing is done */
/*yydebug = 1;*/
- if(yyparse()!=0)
+ if(yyparse() != 0)
g_error("Parsing errors, quitting");
- if(!class)
- print_error(FALSE, " no class defined", 0);
+
+ if( ! class)
+ error_print(GOB_ERROR, 0, " no class defined");
exit_on_error = FALSE;
signals = count_signals((Class *)class);
- arguments = count_arguments((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);
fclose(outph);
}
- if(no_touch_headers && !no_write)
+ if(no_touch_headers &&
+ ! no_write)
compare_and_move_header();
return 0;
projects / gob-dx.git / blobdiff