extern Node *class;
extern GList *nodes;
+extern GList *include_files;
+
char *filebase;
static char *funcbase;
static char *pfuncbase;
static char *typebase;
static char *ptypebase;
-static int signals = 0;
-static int arguments = 0;
-static int overrides = 0;
+static int signals = 0; /* number of signals */
+static int arguments = 0; /* number of named arguments */
+static int overrides = 0; /* number of override methods */
+static int privates = 0; /* number of private data members */
+static int protecteds = 0; /* number of protected methods */
+
+static gboolean made_aliases = FALSE; /* if we made any shorthand aliases
+ and need the REALLY UGLY HACK to
+ avoid warnings */
-FILE *out;
-FILE *outh;
+FILE *out = NULL;
+FILE *outh = NULL;
+FILE *outph = NULL;
gboolean no_touch_headers = FALSE;
gboolean for_cpp = FALSE;
gboolean exit_on_warn = FALSE;
gboolean exit_on_error = TRUE;
gboolean got_error = FALSE;
+gboolean always_private_header = FALSE;
+gboolean no_private_header = FALSE;
void
print_error(int is_warn, char *error,int line)
}
static void
-print_type(FILE *fp, Type *t)
+print_type(FILE *fp, Type *t, gboolean postfix_to_stars)
{
char *s;
int i;
+ int extra;
+
s = remove_sep(t->name);
out_printf(fp,"%s ",s);
g_free(s);
+
+ extra = 0;
+ if(postfix_to_stars) {
+ 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++)
+ if(*p == '[') extra++;
+ }
- for(i=0;i<t->stars;i++)
+ for(i=0;i<(t->stars+extra);i++)
out_printf(fp,"*");
}
GList *li;
out_printf(fp,"%s",typeprefix);
- print_type(fp,m->mtype);
+ print_type(fp,m->mtype,TRUE);
if(no_funcbase)
out_printf(fp,"%s%s%s(",
nameprefix,m->id,namepostfix);
if(m->args) {
for(li=m->args;li;li=g_list_next(li)) {
FuncArg *arg = li->data;
- print_type(fp,arg->atype);
+ print_type(fp,arg->atype,FALSE);
if(li->next)
- out_printf(fp,"%s, ",arg->name);
+ out_printf(fp,"%s%s, ",arg->name,
+ arg->atype->postfix?
+ arg->atype->postfix:"");
else
- out_printf(fp,"%s",arg->name);
-
+ out_printf(fp,"%s%s",arg->name,
+ arg->atype->postfix?
+ arg->atype->postfix:"");
}
if(m->vararg)
out_printf(fp,", ...");
if(node->type == METHOD_NODE) {
Method *m = (Method *)node;
- if(m->scope == INIT_METHOD ||
- m->scope == CLASS_INIT_METHOD ||
- m->scope == OVERRIDE_METHOD)
+ if(m->method == INIT_METHOD ||
+ m->method == CLASS_INIT_METHOD ||
+ m->method == OVERRIDE_METHOD)
continue;
/* in C++ mode don't alias new */
print_method(out,"static ","(* ",") ","",m,TRUE);
out_printf(out," = %s_%s;\n",funcbase,m->id);
+
+ made_aliases = TRUE;
}
}
out_printf(out,"\n");
add_bad_hack_to_avoid_unused_warnings(Class *c)
{
GList *li;
+
+ /* if we haven't had any methods, just return */
+ if(!made_aliases)
+ return;
out_printf(out,"\n\n/*REALLY BAD HACK\n"
" This is to avoid unused warnings if you don't call\n"
- " some method, it pollutes the namespace but the call\n"
- " is weird enough. I need to find a better way to do\n"
+ " some method. I need to find a better way to do\n"
" this */\n");
- out_printf(out,"void __%s_really_bad_hack_to_avoid_warnings(void);\n",
- funcbase);
- out_printf(out,"void\n__%s_really_bad_hack_to_avoid_warnings(void)\n"
+ out_printf(out,"static void\n"
+ "__%s_really_bad_hack_to_avoid_warnings(void)\n"
"{\n",funcbase);
for(li=c->nodes;li;li=g_list_next(li)) {
Node *node = li->data;
if(node->type == METHOD_NODE) {
Method *m = (Method *)node;
- if(m->scope == INIT_METHOD ||
- m->scope == CLASS_INIT_METHOD ||
- m->scope == OVERRIDE_METHOD)
+ if(m->method == INIT_METHOD ||
+ m->method == CLASS_INIT_METHOD ||
+ m->method == OVERRIDE_METHOD)
continue;
/* in C++ mode we don't alias new */
out_printf(out,"\t((void (*)(void))%s)();\n",m->id);
}
}
+ out_printf(out, "\t__%s_really_bad_hack_to_avoid_warnings();\n",
+ funcbase);
out_printf(out,"}\n\n");
}
static void
-put_variable(Variable *v)
+put_variable(Variable *v, FILE *fp)
{
- out_printf(outh,"\t");
- if(v->scope == PRIVATE_SCOPE)
- out_printf(outh,"/* private */ ");
- print_type(outh,v->vtype);
-
- out_printf(outh,"%s;\n",v->id);
+ out_printf(fp,"\t");
+ print_type(fp,v->vtype,FALSE);
+ out_printf(fp,"%s%s;",v->id,
+ v->vtype->postfix?
+ v->vtype->postfix:"");
+ if(v->scope == PROTECTED_SCOPE)
+ out_printf(fp," /* protected */");
+ out_printf(fp,"\n");
}
static void
put_vs_method(Method *m)
{
- if(m->scope != SIGNAL_LAST_METHOD &&
- m->scope != SIGNAL_FIRST_METHOD &&
- m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
- m->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
- m->scope != VIRTUAL_METHOD &&
- m->scope != PRIVATE_VIRTUAL_METHOD)
+ if(m->method != SIGNAL_LAST_METHOD &&
+ m->method != SIGNAL_FIRST_METHOD &&
+ m->method != VIRTUAL_METHOD)
return;
print_method(outh,"\t","(* ",") ",";\n",m,TRUE);
static void
put_pub_method(Method *m)
{
- if(m->scope == PRIVATE_SCOPE ||
- m->scope == OVERRIDE_METHOD ||
- m->scope == INIT_METHOD ||
- m->scope == CLASS_INIT_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_VIRTUAL_METHOD)
+ if(m->scope != PUBLIC_SCOPE)
return;
print_method(outh,"","\t","\t",";\n",m,FALSE);
}
static void
-put_priv_method_prot(Method *m)
+put_prot_method(Method *m)
{
- if(m->scope == PUBLIC_SCOPE)
+ if(m->scope != PROTECTED_SCOPE)
return;
- if(m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_VIRTUAL_METHOD) {
+ if(outph)
+ print_method(outph,"","\t","\t",";\n",m,FALSE);
+ else
+ print_method(out,"","\t","\t",";\n",m,FALSE);
+}
+
+static void
+put_priv_method_prot(Method *m)
+{
+ if(m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD ||
+ m->method == VIRTUAL_METHOD) {
if(m->cbuf)
print_method(out,"static ","_real_"," ",";\n",m,FALSE);
- print_method(out,"static ",""," ",";\n",m,FALSE);
- } else if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == VIRTUAL_METHOD) {
- if(!m->cbuf)
- return;
- print_method(out,"static ","_real_"," ",";\n",m,FALSE);
- } else {
- print_method(out,"static ",""," ",";\n",m,FALSE);
}
+
+ if(m->scope == PRIVATE_SCOPE ||
+ m->method == INIT_METHOD ||
+ m->method == CLASS_INIT_METHOD ||
+ (m->method == OVERRIDE_METHOD &&
+ m->cbuf))
+ print_method(out,"static ",""," ",";\n",m,FALSE);
}
static GList *
-make_init_args(Class *cl, char *name, int is_class)
+make_func_arg(char *typename, int is_class, char *name)
{
Node *node;
Node *type;
char *tn;
if(is_class)
- tn = g_strconcat(cl->otype,":Class",NULL);
+ tn = g_strconcat(typename,":Class",NULL);
else
- tn = g_strdup(cl->otype);
+ tn = g_strdup(typename);
- type = new_type(1,tn);
+ type = new_type(1,tn,NULL);
node = new_funcarg((Type *)type,name,NULL);
return g_list_prepend(NULL, node);
}
Node *n = li->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == INIT_METHOD) {
+ if(m->method == INIT_METHOD) {
if(got_init)
print_error(FALSE,"init defined more then once",m->line_no);
got_init = TRUE;
- } else if(m->scope == CLASS_INIT_METHOD) {
+ } else if(m->method == CLASS_INIT_METHOD) {
if(got_class_init)
print_error(FALSE,"class_init defined more then once",m->line_no);
got_class_init = TRUE;
}
}
if(!got_class_init) {
- node = new_method(CLASS_INIT_METHOD,
- (Type *)new_type(0,g_strdup("void")),
+ node = new_method(NO_SCOPE, CLASS_INIT_METHOD,
+ (Type *)new_type(0,g_strdup("void"),NULL),
NULL,NULL,g_strdup("class_init"),
- make_init_args(cl,g_strdup("c"),TRUE),
+ make_func_arg(cl->otype,TRUE,g_strdup("c")),
NULL, NULL,0,0,FALSE);
cl->nodes = g_list_prepend(cl->nodes,node);
}
if(!got_init) {
- node = new_method(INIT_METHOD,
- (Type *)new_type(0,g_strdup("void")),
+ node = new_method(NO_SCOPE, INIT_METHOD,
+ (Type *)new_type(0,g_strdup("void"),NULL),
NULL,NULL,g_strdup("init"),
- make_init_args(cl,g_strdup("o"),FALSE),
+ make_func_arg(cl->otype,FALSE,g_strdup("o")),
NULL, NULL,0,0,FALSE);
cl->nodes = g_list_prepend(cl->nodes,node);
}
}
+static void
+make_destroy(Class *cl)
+{
+ int got_destroy = FALSE;
+ GList *li;
+ Node *node;
+ 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) {
+ got_destroy = TRUE;
+ break;
+ } else {
+ print_error(FALSE,"destroy method override "
+ "of class other then Gtk:Object",
+ m->line_no);
+ }
+
+ }
+ }
+ }
+ if(!got_destroy) {
+ node = new_method(NO_SCOPE, OVERRIDE_METHOD,
+ (Type *)new_type(0,g_strdup("void"),NULL),
+ g_strdup("Gtk:Object"),
+ NULL,g_strdup("destroy"),
+ make_func_arg("Gtk:Object",FALSE,g_strdup("o")),
+ NULL,
+ g_strdup("PARENT_HANDLER (o);\n"),
+ 0,0,FALSE);
+ cl->nodes = g_list_append(cl->nodes,node);
+ overrides++;
+ }
+}
+
+/* here we will find out how inconsistent gtk really is :) */
+/* the commented out types mean that these types don't actually
+ exist. so we "emulate them" with an equivalent */
+const struct {
+ char *gtkname;
+ char *typename;
+} our_gtk_type_table[] = {
+ { "NONE", "void" },
+ { "CHAR", "gchar" },
+ { "UCHAR", "guchar" },
+ { "BOOL", "gboolean" },
+ { "INT", "gint" },
+ { "UINT", "guint" },
+ { "LONG", "glong" },
+ { "ULONG", "gulong" },
+ { "FLOAT", "gfloat" },
+ { "DOUBLE", "gdouble" },
+ { "STRING", /*"GtkString"*/"gchar *" },
+ { "ENUM", /*"GtkEnum"*/"gint" },
+ { "FLAGS", /*"GtkFlags"*/"guint" },
+ { "BOXED", /*"GtkBoxed"*/"gpointer" },
+ { "POINTER", "gpointer" },
+ { "OBJECT", "GtkObject *" },
+ { "SIGNAL", /*"GtkSignal"*/"__twopointertype" },
+ { "ARGS", /*"GtkArgs"*/"__twopointertype" },
+ { "CALLBACK", /*"GtkCallback"*/"__threepointertype" },
+ { "C_CALLBACK", /*"GtkCCallback"*/"__twopointertype" },
+ { "FOREIGN", /*"GtkForeign"*/"__twopointertype" },
+
+ { NULL, NULL }
+};
+
+static const char *
+get_cast(char *type)
+{
+ int i;
+ for(i=0;our_gtk_type_table[i].gtkname;i++) {
+ if(strcmp(our_gtk_type_table[i].gtkname,type)==0) {
+ return our_gtk_type_table[i].typename;
+ }
+ }
+ return NULL;
+}
+
+
+/* hash of method -> name of signal prototype */
static GHashTable *marsh = NULL;
+/* list of methods with different signal prototypes,
+ we check this list if we can use a signal prototype of a
+ previous signal method, there are only uniques here */
+static GList *eq_signal_methods = NULL;
+
+/* compare a list of strings */
+static gboolean
+is_list_equal(GList *a, GList *b)
+{
+ for(;a && b; a=a->next, b=b->next) {
+ if(strcmp(a->data,b->data)!=0) {
+ return FALSE;
+ }
+ }
+ /* the the lists were different length */
+ if(a || b)
+ return FALSE;
+ return TRUE;
+}
+
+static Method *
+find_same_type_signal(Method *m)
+{
+ GList *li;
+ for(li=eq_signal_methods;li;li=li->next) {
+ Method *mm = li->data;
+ if(is_list_equal(mm->gtktypes,m->gtktypes))
+ return mm;
+ }
+ return NULL;
+}
+
+static void
+print_signal_marsal_args(Method *m)
+{
+ 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),
+ (char *)li->data,i);
+ }
+ }
+ }
+ out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
+}
+
+
static void
add_signal_prots(Method *m)
{
GList *li;
static int sig = 1;
char *s;
+ Method *mm;
- if(m->scope != SIGNAL_LAST_METHOD &&
- m->scope != SIGNAL_FIRST_METHOD &&
- m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
- m->scope != PRIVATE_SIGNAL_FIRST_METHOD)
+ if(m->method != SIGNAL_LAST_METHOD &&
+ m->method != SIGNAL_FIRST_METHOD)
return;
if(!marsh)
if(strcmp(m->gtktypes->data,"NONE")==0 &&
strcmp(m->gtktypes->next->data,"NONE")==0)
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);
+ return;
+ }
s = g_strdup_printf("__Sig%d",sig++);
g_hash_table_insert(marsh,m,s);
+ eq_signal_methods = g_list_prepend(eq_signal_methods,m);
- out_printf(out,"\ntypedef ");
- print_type(out,m->mtype);
+ /* we know that we'll know all the gtktypes (so get_cast can't fail) */
+ out_printf(out,"\ntypedef %s (*%s) (%s *, ",
+ get_cast(m->gtktypes->data),s, typebase);
- out_printf(out,"(*%s) (",s);
-
- for(li=m->args;li;li=g_list_next(li)) {
- FuncArg *arg = li->data;
- print_type(out,arg->atype);
- out_printf(out,", ");
- }
+ for(li=m->gtktypes->next;li;li=g_list_next(li))
+ out_printf(out,"%s, ",get_cast(li->data));
out_printf(out,"gpointer);\n");
out_printf(out,"\nstatic void\n"
"{\n",s);
if(strcmp(m->gtktypes->data,"NONE")==0) {
- int i;
out_printf(out, "\t%s rfunc;\n\n"
"\trfunc = (%s)func;\n\n"
"\t(*rfunc)((%s *)object",s,s,typebase);
- if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
- GList *ali = m->args->next;
- for(i=0,li=m->gtktypes->next;li;
- i++,li=g_list_next(li)) {
- if(!for_cpp || !ali)
- out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
- else {
- FuncArg *fa = ali->data;
- out_printf(out, ",\n\t\t(");
- print_type(out,fa->atype);
- out_printf(out, ")GTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
- }
-
- if(ali) ali = ali->next;
- }
- }
- out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
} else {
- int i;
out_printf(out, "\t%s rfunc;\n\t",s);
- print_type(out,m->mtype);
+ print_type(out,m->mtype,TRUE);
out_printf(out, " *retval;\n\n"
"\trfunc = (%s)func;\n\n"
"\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
"\t*retval = (*rfunc)((%s *)object",
s,(char *)m->gtktypes->data,
g_list_length(m->gtktypes)-1,typebase);
- if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
- GList *ali = m->args->next;
- for(i=0,li=m->gtktypes->next;li;
- i++,li=g_list_next(li)) {
- if(!for_cpp || !ali)
- out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
- else {
- FuncArg *fa = ali->data;
- out_printf(out, ",\n\t\t(");
- print_type(out,fa->atype);
- out_printf(out, ")GTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
- }
-
- if(ali) ali = ali->next;
- }
- }
- out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
}
+ print_signal_marsal_args(m);
}
Node *n = li->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD) {
+ if(m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD) {
char *s = g_strdup(m->id);
g_strup(s);
out_printf(out,"\t%s_SIGNAL,\n",s);
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
char *f;
- Method *m;
+ Method *m = (Method *)n;
if(n->type != METHOD_NODE ||
- ((Method *)n)->scope != OVERRIDE_METHOD)
+ m->method != OVERRIDE_METHOD)
continue;
- m = (Method *)n;
s = remove_sep(m->otype);
out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
- Method *m;
char *mar;
char *sig;
int is_none;
int last = FALSE;
+ Method *m = (Method *)n;
if(n->type != METHOD_NODE ||
- (((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
- ((Method *)n)->scope != SIGNAL_LAST_METHOD &&
- ((Method *)n)->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
- ((Method *)n)->scope != PRIVATE_SIGNAL_LAST_METHOD))
+ (m->method != SIGNAL_FIRST_METHOD &&
+ m->method != SIGNAL_LAST_METHOD))
continue;
- m = (Method *)n;
- if(m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ if(m->method == SIGNAL_FIRST_METHOD)
last = FALSE;
else
last = TRUE;
out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
- Method *m;
+ Method *m = (Method *)n;
if(n->type != METHOD_NODE ||
- (((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
- ((Method *)n)->scope != SIGNAL_LAST_METHOD &&
- ((Method *)n)->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
- ((Method *)n)->scope != PRIVATE_SIGNAL_LAST_METHOD &&
- ((Method *)n)->scope != VIRTUAL_METHOD &&
- ((Method *)n)->scope != PRIVATE_VIRTUAL_METHOD &&
- ((Method *)n)->scope != OVERRIDE_METHOD))
+ (m->method != SIGNAL_FIRST_METHOD &&
+ m->method != SIGNAL_LAST_METHOD &&
+ m->method != VIRTUAL_METHOD &&
+ m->method != OVERRIDE_METHOD))
continue;
- m = (Method *)n;
- if(m->scope == OVERRIDE_METHOD) {
+ if(m->method == OVERRIDE_METHOD) {
char *s;
s = replace_sep(m->otype,'_');
g_strdown(s);
- out_printf(out,"\t%s_class->%s = %s_%s;\n",
- s,m->id,funcbase,m->id);
+ if(m->cbuf)
+ out_printf(out,"\t%s_class->%s = %s_%s;\n",
+ s,m->id,funcbase,m->id);
+ else
+ out_printf(out,"\t%s_class->%s = NULL;\n",
+ s,m->id);
} else {
if(m->cbuf)
out_printf(out,"\t%s->%s = _real_%s_%s;\n",
if(n->type != METHOD_NODE)
continue;
m = (Method *)n;
- if(m->scope == INIT_METHOD) {
+ if(m->method == INIT_METHOD) {
if(m->line_no>0)
out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","\n",m,FALSE);
if(m->line_no>0)
out_addline_outfile(out);
out_printf(out,"{\n");
- } else if(m->scope == CLASS_INIT_METHOD) {
+ if(privates>0) {
+ out_printf(out,"\t%s->_priv = "
+ "g_new0 (%sPrivate,1);\n",
+ ((FuncArg *)m->args->data)->name,
+ typebase);
+ }
+ } else if(m->method == CLASS_INIT_METHOD) {
if(m->line_no>0)
out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","\n",m,FALSE);
if(m->cbuf) {
out_printf(out," {\n");
out_addline_infile(out,m->ccode_line);
- out_printf(out,"%s\n",m->cbuf->str);
+ out_printf(out,"%s\n",m->cbuf);
out_addline_outfile(out);
- out_printf(out," }\n",m->cbuf->str);
+ out_printf(out," }\n");
} else {
out_printf(out,"return;\n");
}
Node *n = li->data;
Argument *a;
char *s;
- GString *cbuf;
+ char *cbuf;
int line_no;
if(n->type != ARGUMENT_NODE)
continue;
s,a->gtktype);
g_free(s);
out_addline_infile(out,line_no);
- out_printf(out,"%s\n",cbuf->str);
+ out_printf(out,"%s\n",cbuf);
out_addline_outfile(out);
out_printf(out,"\t\t}\n\t\tbreak;\n"
"#undef ARG\n");
print_checks(Method *m, FuncArg *fa)
{
GList *li;
- int is_void;
+ gboolean is_void;
is_void = (strcmp(m->mtype->name,"void")==0 &&
m->mtype->stars == 0);
out_printf(out,");\n");
else {
out_printf(out,", (");
- print_type(out,m->mtype);
+ print_type(out,m->mtype,TRUE);
out_printf(out,")%s);\n",
m->onerror?m->onerror:"0");
}
}
}
+/* put in code if it's needed */
+static void
+put_in_gen_code(Method *m)
+{
+ /* now we only have the freeing of the private structure */
+ if(privates>0 &&
+ m->method == OVERRIDE_METHOD &&
+ strcmp(m->id,"destroy")==0) {
+ out_printf(out,"\tg_free (%s (%s)->_priv);\n"
+ "\t%s (%s)->_priv = NULL;\n",
+ macrobase,
+ ((FuncArg *)m->args->data)->name,
+ macrobase,
+ ((FuncArg *)m->args->data)->name);
+
+ }
+}
+
static void
print_method_body(Method *m, int pre)
{
out_printf(out,"{\n");
- if(pre) {
+ if(pre)
print_preconditions(m);
- out_printf(out,"\t{\n");
+ put_in_gen_code(m);
+
+ /* Note: the trailing }'s are on one line, this is so
+ that we get the no return warning correctly and point to
+ the correct line in the .gob file, yes this is slightly
+ ugly in the .c file, but that is not supposed to be
+ human readable anyway. */
+ if(m->cbuf) {
+ out_printf(out,"{\n");
+ out_addline_infile(out,m->ccode_line);
+ out_printf(out,"\t%s}",m->cbuf);
}
- out_addline_infile(out,m->ccode_line);
- out_printf(out,"\t\t%s\n",m->cbuf->str);
- out_addline_outfile(out);
-
- if(pre)
- out_printf(out,"\t}\n");
out_printf(out,"}\n");
+
+ if(m->cbuf)
+ out_addline_outfile(out);
+}
+
+static void
+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) {
+ FuncArg *fa = li->data;
+ const char *cast = get_cast(ali->data);
+ /* we should have already proved before that
+ the we know all the types */
+ g_assert(cast);
+
+ out_printf(out,",\n\t\t(%s)%s",cast,
+ fa->name);
+ }
}
static void
put_method(Method *m)
{
char *s;
- int private = FALSE;
+ gboolean is_void;
+ is_void = (strcmp(m->mtype->name,"void")==0 &&
+ m->mtype->stars == 0);
out_printf(out,"\n");
- switch(m->scope) {
- case PUBLIC_SCOPE:
+ switch(m->method) {
+ case REGULAR_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,"","\n"," ","\n",m,FALSE);
- print_method_body(m,TRUE);
- break;
- case PRIVATE_SCOPE:
- out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n"," ","\n",m,FALSE);
+ if(m->scope == PRIVATE_SCOPE)
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
+ else /* PUBLIC, PROTECTED */
+ print_method(out,"","\n"," ","\n",m,FALSE);
print_method_body(m,TRUE);
break;
- case PRIVATE_SIGNAL_FIRST_METHOD:
- case PRIVATE_SIGNAL_LAST_METHOD:
- private = TRUE;
case SIGNAL_FIRST_METHOD:
case SIGNAL_LAST_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+ if(m->scope == PRIVATE_SCOPE)
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
+ else
+ print_method(out,"","\n"," ","\n",m,FALSE);
out_addline_outfile(out);
out_printf(out,"{\n");
s = g_strdup(m->id);
g_strup(s);
if(strcmp(m->mtype->name,"void")==0 &&
m->mtype->stars==0) {
- GList *li;
print_preconditions(m);
if(((FuncArg *)m->args->data)->name)
out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (%s),\n"
"\t\tobject_signals[%s_SIGNAL]",
((FuncArg *)m->args->data)->name,s);
- for(li=m->args->next;li;li=g_list_next(li)) {
- FuncArg *fa = li->data;
- out_printf(out,",\n\t\t%s",fa->name);
- }
+ put_signal_args(m);
out_printf(out,");\n}\n");
} else {
- GList *li;
out_printf(out,"\t");
- print_type(out,m->mtype);
+ print_type(out,m->mtype,TRUE);
out_printf(out,"return_val;\n");
print_preconditions(m);
out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (%s),\n"
"\t\tobject_signals[%s_SIGNAL]",
((FuncArg *)m->args->data)->name,s);
- for(li=m->args->next;li;li=g_list_next(li)) {
- FuncArg *fa = li->data;
- out_printf(out,",\n\t\t%s",fa->name);
- }
+ put_signal_args(m);
out_printf(out,",\n\t\t&return_val);\n"
"\treturn return_val;\n}\n");
}
print_method(out,"static ","\n_real_"," ","\n",m,FALSE);
print_method_body(m,FALSE);
break;
- case PRIVATE_VIRTUAL_METHOD:
- private = TRUE;
case VIRTUAL_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
+ if(m->scope==PRIVATE_SCOPE)
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
+ else
+ print_method(out,"","\n"," ","\n",m,FALSE);
out_addline_outfile(out);
out_printf(out,"{\n"
"\t%sClass *klass;\n",typebase);
out_printf(out,");\n"
"\telse\n"
"\t\treturn (");
- print_type(out,m->mtype);
+ print_type(out,m->mtype,TRUE);
out_printf(out,")(%s);\n}\n",
m->onerror?m->onerror:"0");
}
print_method_body(m,FALSE);
break;
case OVERRIDE_METHOD:
+ if(!m->cbuf)
+ break;
out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","\n",m,FALSE);
s = replace_sep(m->otype,'_');
g_strup(s);
- out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
- "\t{ if(%s_CLASS(parent_class)->%s) \\\n"
- "\t\t(* %s_CLASS(parent_class)->%s)(##args); }\n",
- s,m->id,s,m->id);
+ if(is_void) {
+ out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
+ "\t{ if(%s_CLASS(parent_class)->%s) \\\n"
+ "\t\t(* %s_CLASS(parent_class)->%s)(##args); }\n",
+ s,m->id,s,m->id);
+ } else {
+ out_printf(out,"#define PARENT_HANDLER(args...) \\\n"
+ "\t((%s_CLASS(parent_class)->%s)? \\\n"
+ "\t\t(* %s_CLASS(parent_class)->%s)(##args): \\\n"
+ "\t\t(",
+ s,m->id,s,m->id);
+ out_printf(out,"(");
+ print_type(out,m->mtype,TRUE);
+ out_printf(out,")%s))\n",
+ m->onerror?m->onerror:"0");
+ }
g_free(s);
print_method_body(m,TRUE);
out_printf(out,"#undef PARENT_HANDLER\n");
}
static void
-check_duplicate(Class *c,Node *node,char *id, int line_no)
+check_duplicate(Class *c, Node *node, char *id, int line_no)
{
GList *l;
for(l=c->nodes;l;l=g_list_next(l)) {
}
}
+static void
+check_bad_symbols(Class *c)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ if((m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD ||
+ m->method == VIRTUAL_METHOD) &&
+ strcmp(m->id,"__parent__")==0) {
+ char *s;
+ s = g_strdup_printf("'%s' not allowed as an "
+ "identifier of signal "
+ "or virtual methods",
+ m->id);
+ print_error(FALSE,s,m->line_no);
+ g_free(s);
+ }
+ } else if(n->type == VARIABLE_NODE) {
+ Variable *v = (Variable *)n;
+ if(strcmp(v->id,"_priv")==0 ||
+ strcmp(v->id,"__parent__")==0) {
+ char *s;
+ s = g_strdup_printf("'%s' not allowed as a data "
+ "member name",v->id);
+ print_error(FALSE,s,v->line_no);
+ g_free(s);
+ }
+ }
+ }
+}
+
+
static void
check_duplicate_named(Class *c,Node *node,char *id, int line_no)
{
char *s;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD) {
+ if(m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD) {
nid = m->id;
nline_no = m->line_no;
} else
Node *n = l->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ if(m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD)
check_duplicate_named(c,n,m->id,m->line_no);
} else if(n->type == ARGUMENT_NODE) {
Argument *a = (Argument *)n;
Node *n = l->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope!=PUBLIC_SCOPE &&
- strcmp(m->id,"new")==0)
+ if((strcmp(m->id,"new")==0) &&
+ (m->method != REGULAR_METHOD ||
+ m->scope != PUBLIC_SCOPE))
print_error(TRUE,
- "'new' should be a public method",
+ "'new' should be a regular\n"
+ "public method",
m->line_no);
}
}
Method *m = (Method *)n;
if(!m->vararg)
continue;
- if(m->scope == OVERRIDE_METHOD ||
- m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
- m->scope == VIRTUAL_METHOD ||
- m->scope == PRIVATE_VIRTUAL_METHOD) {
+ if(m->method == OVERRIDE_METHOD ||
+ m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD ||
+ m->method == VIRTUAL_METHOD) {
print_error(FALSE,
"signals, overrides and virtuals, "
"can't have variable argument "
}
}
+static void
+check_firstarg(Class *c)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ if(m->args)
+ continue;
+ if(m->method == OVERRIDE_METHOD ||
+ m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD ||
+ m->method == VIRTUAL_METHOD) {
+ print_error(FALSE,
+ "signals, overrides and virtuals, "
+ "can't have no arguments",
+ m->line_no);
+ }
+ }
+ }
+}
+
+static void
+check_nonvoidempty(Class *c)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ if(m->method != REGULAR_METHOD)
+ continue;
+ if(!(strcmp(m->mtype->name,"void")==0 &&
+ m->mtype->stars == 0) &&
+ !m->cbuf) {
+ print_error(TRUE,
+ "non-void empty method found, "
+ "regular non-void function should "
+ "not be empty.",
+ m->line_no);
+ /* add a body here, so that the user will also
+ get a warning from gcc, and so that it will
+ at least point him to the prototype of the
+ function in the .gob file */
+ m->cbuf = g_strdup("/*empty*/");
+ m->ccode_line = m->line_no;
+ }
+ }
+ }
+}
+
+static void
+check_signal_args(Class *c)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ GList *l;
+ if(m->method != SIGNAL_LAST_METHOD &&
+ m->method != SIGNAL_FIRST_METHOD)
+ continue;
+
+ for(l=m->gtktypes;l;l=l->next) {
+ char *s;
+ if(get_cast(l->data))
+ continue;
+ s = g_strdup_printf("Unknown GTK+ type '%s' "
+ "among signal types",
+ (char *)l->data);
+ print_error(FALSE, s, m->line_no);
+ g_free(s);
+ }
+ }
+ }
+}
+
static int
count_signals(Class *c)
{
Node *n = l->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
- m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ if(m->method == SIGNAL_LAST_METHOD ||
+ m->method == SIGNAL_FIRST_METHOD)
num++;
}
}
Node *n = l->data;
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
- if(m->scope == OVERRIDE_METHOD)
+ if(m->method == OVERRIDE_METHOD)
+ num++;
+ }
+ }
+ return num;
+}
+
+static int
+count_privates(Class *c)
+{
+ int num = 0;
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == VARIABLE_NODE) {
+ Variable *v = (Variable *)n;
+ if(v->scope == PRIVATE_SCOPE)
+ num++;
+ }
+ }
+ return num;
+}
+
+static int
+count_protecteds(Class *c)
+{
+ int num = 0;
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ if(m->scope == PROTECTED_SCOPE)
num++;
}
}
static void
open_files(void)
{
- char *outfile,*outfileh;
+ char *outfile,*outfileh,*outfileph;
if(!for_cpp)
outfile = g_strconcat(filebase,".c",NULL);
outfileh = g_strconcat("#gob#",filebase,".h#gob#",NULL);
else
outfileh = g_strconcat(filebase,".h",NULL);
+
+ if((privates>0 || protecteds>0 || always_private_header) &&
+ !no_private_header)
+ outfileph = g_strconcat(filebase,"-private.h",NULL);
+ else
+ outfileph = NULL;
+
out = fopen(outfile,"w");
if(!out) {
if(!outh) {
g_error("Cannot open outfile: %s",outfileh);
}
+ if(outfileph) {
+ outph = fopen(outfileph,"w");
+ if(!outph) {
+ g_error("Cannot open outfile: %s",outfileh);
+ }
+ }
}
static void
char *p;
GList *li;
time_t curtime;
+ gboolean found_header;
time(&curtime);
out_printf(outh,"/* Generated by GOB (v%s)"
" (do not edit directly) */\n\n",VERSION);
+ if(outph)
+ out_printf(outph,"/* Generated by GOB (v%s)"
+ " (do not edit directly) */\n\n",VERSION);
out_printf(out,"/* Generated by GOB (v%s) on %s"
" (do not edit directly) */\n\n",VERSION,ctime(&curtime));
g_strup(p);
out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
"#include <gtk/gtk.h>\n\n",p,p);
+ if(outph)
+ out_printf(outph,"#ifndef __%s_PRIVATE_H__\n"
+ "#define __%s_PRIVATE_H__\n\n"
+ "#include \"%s.h\"\n\n",p,p,filebase);
g_free(p);
- if(!for_cpp)
+ if(!for_cpp) {
out_printf(outh,"#ifdef __cplusplus\n"
"extern \"C\" {\n"
"#endif /* __cplusplus */\n\n");
+ if(outph)
+ out_printf(outph,"#ifdef __cplusplus\n"
+ "extern \"C\" {\n"
+ "#endif /* __cplusplus */\n\n");
+ }
- out_printf(out,"#include \"%s.h\"\n\n",filebase);
-
+ p = g_strconcat(filebase,".h",NULL);
+ found_header = TRUE;
+ if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp)) {
+ out_printf(out,"#include \"%s.h\"\n\n",filebase);
+ found_header = FALSE;
+ }
+ g_free(p);
+
+ /* if we are creating a private header see if it was included */
+ if(outph) {
+ p = g_strconcat(filebase,"-private.h",NULL);
+ 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,
+ "Implicit private header include "
+ "added to top of\n"
+ "\tsource file, while public "
+ "header is at a custom location, "
+ "you should\n"
+ "\texplicitly include "
+ "the private header below the "
+ "public one.", 0);
+ }
+ g_free(p);
+ }
+
for(li=nodes;li;li=g_list_next(li)) {
Node *node = li->data;
if(node->type == CCODE_NODE) {
out_printf(fp,"\n");
out_addline_infile(fp,cc->line_no);
}
- out_printf(fp,"%s\n",cc->cbuf->str);
+ out_printf(fp,"%s\n",cc->cbuf);
if(!cc->header)
out_addline_outfile(fp);
} else if(node->type == CLASS_NODE) {
- GList *l;
Class *c = (Class *)class;
- char *otype,*ptype;
+ GList *l;
- signals = count_signals(c);
- arguments = count_arguments(c);
- overrides = count_overrides(c);
+ out_printf(out,"/* utility types we may need */\n");
+ out_printf(out,"typedef struct { "
+ "gpointer a; gpointer b; "
+ "} __twopointertype;\n");
+ out_printf(out,"typedef struct { "
+ "gpointer a; gpointer b; "
+ "gpointer c; "
+ "} __threepointertype;\n");
out_printf(outh,"\n#define %s\t"
"(%s_get_type())\n",
"GTK_CHECK_TYPE((obj), %s_get_type ())\n\n",
macrois,funcbase);
- otype = remove_sep(c->otype);
- ptype = remove_sep(c->ptype);
- out_printf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
+ if(privates>0)
+ out_printf(outh,"\ntypedef struct _%sPrivate %sPrivate;\n",typebase,typebase);
+
+ out_printf(outh,"\ntypedef struct _%s %s;\n",typebase,typebase);
out_printf(outh,"struct _%s {\n\t%s __parent__;\n",
- otype,ptype);
+ typebase,ptypebase);
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
- if(n->type == VARIABLE_NODE)
- put_variable((Variable *)n);
+ Variable *v = (Variable *)n;
+ if(n->type == VARIABLE_NODE &&
+ v->scope == PUBLIC_SCOPE)
+ put_variable((Variable *)n,outh);
}
+ /* put protecteds always AFTER publics */
+ 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)
+ put_variable((Variable *)n,outh);
+ }
+ if(privates>0)
+ out_printf(outh,"\t%sPrivate *_priv;\n",typebase);
out_printf(outh,"};\n");
+ 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)
+ outfp = outph;
+ else
+ outfp = out;
+
+ out_printf(outfp,"struct _%sPrivate {\n",
+ typebase);
+ for(l=c->nodes;l;l=l->next) {
+ Node *n = l->data;
+ Variable *v = (Variable *)n;
+ if(n->type == VARIABLE_NODE &&
+ v->scope == PRIVATE_SCOPE) {
+ out_addline_infile(outfp,v->line_no);
+ put_variable(v,outfp);
+ }
+ }
+ out_addline_outfile(outfp);
+ out_printf(outfp,"};\n");
+ }
+
out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
- otype,otype);
+ typebase,typebase);
out_printf(outh,
"struct _%sClass {\n\t%sClass __parent__;\n",
- otype,ptype);
+ typebase,ptypebase);
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
if(n->type == METHOD_NODE)
"guint arg_id);\n");
}
+ out_printf(out,"/* here are local prototypes */\n");
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
if(n->type == METHOD_NODE) {
put_pub_method((Method *)n);
+ put_prot_method((Method *)n);
put_priv_method_prot((Method *)n);
}
}
if(signals>0) {
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
- if(n->type == METHOD_NODE) {
+ if(n->type == METHOD_NODE)
add_signal_prots((Method *)n);
- }
}
}
out_printf(out,"#undef GET_NEW\n");
add_bad_hack_to_avoid_unused_warnings(c);
-
- g_free(otype);
- g_free(ptype);
} else
g_assert_not_reached();
}
"}\n"
"#endif /* __cplusplus */\n");
out_printf(outh,"\n#endif");
+ if(outph) {
+ if(!for_cpp)
+ out_printf(outph,"\n#ifdef __cplusplus\n"
+ "}\n"
+ "#endif /* __cplusplus */\n");
+ out_printf(outph,"\n#endif");
+ }
}
#if 0
{
fprintf(stderr,"Gob version %s\n\n",VERSION);
fprintf(stderr,"Options:\n"
- "\t--help,-h,-? Display this help\n"
- "\t--exit-on-warn,-w Exit with an error on warnings\n"
- "\t--no-exit-on-warn Don't exit on warnings [default]\n"
- "\t--for-cpp Create C++ files\n"
- "\t--no-touch-headers Don't touch headers unless they "
- "really changed\n");
+ "\t--help,-h,-? Display this help\n"
+ "\t--version Display version\n"
+ "\t--exit-on-warn,-w Exit with an error on warnings\n"
+ "\t--no-exit-on-warn Don't exit on warnings [default]\n"
+ "\t--for-cpp Create C++ files\n"
+ "\t--no-touch-headers Don't touch headers unless they "
+ "really changed\n"
+ "\t--always-private-header Always create a private header "
+ "file,\n"
+ "\t even if it would be empty\n"
+ "\t--no-private-header Don't create a private header, "
+ "put private\n"
+ "\t structure and protected "
+ "prototypes inside c file\n");
}
static void
} else if(strcmp(argv[i],"--help")==0) {
print_help();
exit(0);
+ } else if(strcmp(argv[i],"--version")==0) {
+ fprintf(stderr,"Gob version %s\n",VERSION);
+ exit(0);
} else if(strcmp(argv[i],"--exit-on-warn")==0) {
exit_on_warn = TRUE;
} else if(strcmp(argv[i],"--no-exit-on-warn")==0) {
for_cpp = TRUE;
} else if(strcmp(argv[i],"--no-touch-headers")==0) {
no_touch_headers = TRUE;
+ } else if(strcmp(argv[i],"--always-private-header")==0) {
+ no_private_header = FALSE;
+ always_private_header = TRUE;
+ } else if(strcmp(argv[i],"--no-private-header")==0) {
+ always_private_header = FALSE;
+ no_private_header = TRUE;
} else if(strcmp(argv[i],"--")==0) {
/*further arguments are files*/
no_opts = TRUE;
}
}
+/* this is a somewhat ugly hack, but it appears to work */
static void
compare_and_move_header(void)
{
if(!class)
print_error(FALSE," no class defined",0);
- make_bases();
-
+
exit_on_error = FALSE;
+
+ signals = count_signals((Class *)class);
+ arguments = count_arguments((Class *)class);
+ overrides = count_overrides((Class *)class);
+ privates = count_privates((Class *)class);
+ protecteds = count_protecteds((Class *)class);
+
+ make_bases();
make_inits((Class *)class);
+ if(privates>0)
+ make_destroy((Class *)class);
+ check_bad_symbols((Class *)class);
check_duplicate_symbols((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);
+
exit_on_error = TRUE;
if(got_error)
projects / gob-dx.git / blobdiff