#include <time.h>
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
#include "tree.h"
#include "parse.h"
FILE *out;
FILE *outh;
-int exit_on_warn = FALSE;
-int exit_on_error = TRUE;
-int got_error = FALSE;
+gboolean no_touch_headers = FALSE;
+gboolean for_cpp = FALSE;
+gboolean exit_on_warn = FALSE;
+gboolean exit_on_error = TRUE;
+gboolean got_error = FALSE;
void
print_error(int is_warn, char *error,int line)
}
static void
-def_methods(Class *c)
+print_type(FILE *fp, Type *t)
+{
+ char *s;
+ int i;
+ s = remove_sep(t->name);
+ out_printf(fp,"%s ",s);
+ g_free(s);
+
+ for(i=0;i<t->stars;i++)
+ out_printf(fp,"*");
+}
+
+static void
+print_method(FILE *fp, char *typeprefix, char *nameprefix,
+ char *namepostfix,char *postfix, Method *m,
+ gboolean no_funcbase)
+{
+ GList *li;
+
+ out_printf(fp,"%s",typeprefix);
+ print_type(fp,m->mtype);
+ if(no_funcbase)
+ out_printf(fp,"%s%s%s(",
+ nameprefix,m->id,namepostfix);
+ else
+ out_printf(fp,"%s%s_%s%s(",
+ nameprefix,funcbase,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);
+ if(li->next)
+ out_printf(fp,"%s, ",arg->name);
+ else
+ out_printf(fp,"%s",arg->name);
+
+ }
+ if(m->vararg)
+ out_printf(fp,", ...");
+ } else {
+ out_printf(fp,"void");
+ }
+ out_printf(fp,")%s",postfix);
+}
+
+
+static void
+make_method_pointers(Class *c)
{
GList *li;
m->scope == CLASS_INIT_METHOD ||
m->scope == OVERRIDE_METHOD)
continue;
-
- out_printf(out,"#define %s %s_%s\n",m->id,funcbase,m->id);
+
+ /* in C++ mode don't alias new */
+ if(for_cpp && strcmp(m->id,"new")==0)
+ continue;
+
+ print_method(out,"static ","(* ",") ","",m,TRUE);
+ out_printf(out," = %s_%s;\n",funcbase,m->id);
}
}
out_printf(out,"\n");
}
static void
-undef_methods(Class *c)
+add_bad_hack_to_avoid_unused_warnings(Class *c)
{
GList *li;
- out_printf(out,"\n");
+ 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"
+ " 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"
+ "{\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)
continue;
-
- out_printf(out,"#undef %s\n",m->id);
+
+ /* in C++ mode we don't alias new */
+ if(for_cpp && strcmp(m->id,"new")==0)
+ continue;
+
+ out_printf(out,"\t((void (*)(void))%s)();\n",m->id);
}
}
- out_printf(out,"\n");
-}
-
-static void
-print_type(FILE *fp, Type *t)
-{
- char *s;
- int i;
- s = remove_sep(t->name);
- out_printf(fp,"%s ",s);
- g_free(s);
-
- for(i=0;i<t->stars;i++)
- out_printf(fp,"*");
+ out_printf(out,"}\n\n");
}
static void
out_printf(outh,"%s;\n",v->id);
}
-static void
-print_method(FILE *fp, char *typeprefix, char *nameprefix,
- char *namepostfix,char *postfix, Method *m)
-{
- GList *li;
-
- out_printf(fp,"%s",typeprefix);
- print_type(fp,m->mtype);
- out_printf(fp,"%s%s_%s%s(",
- nameprefix,funcbase,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);
- if(li->next)
- out_printf(fp,"%s, ",arg->name);
- else
- out_printf(fp,"%s",arg->name);
-
- }
- if(m->vararg)
- out_printf(fp,", ...");
- } else {
- out_printf(fp,"void");
- }
- out_printf(fp,")%s\n",postfix);
-}
-
static void
put_vs_method(Method *m)
{
m->scope != PRIVATE_VIRTUAL_METHOD)
return;
- print_method(outh,"\t","(* ",") ",";",m);
+ print_method(outh,"\t","(* ",") ",";\n",m,TRUE);
}
static void
m->scope == PRIVATE_VIRTUAL_METHOD)
return;
- print_method(outh,"","\t","\t",";",m);
+ print_method(outh,"","\t","\t",";\n",m,FALSE);
}
static void
m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
m->scope == PRIVATE_VIRTUAL_METHOD) {
if(m->cbuf)
- print_method(out,"static ","_real_"," ",";",m);
- print_method(out,"static ",""," ",";",m);
+ 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_"," ",";",m);
+ print_method(out,"static ","_real_"," ",";\n",m,FALSE);
} else {
- print_method(out,"static ",""," ",";",m);
+ print_method(out,"static ",""," ",";\n",m,FALSE);
}
}
"\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)) {
- out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
+ 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");
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)) {
- out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
- (char *)li->data,i);
+ 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");
if(m->scope == INIT_METHOD) {
if(m->line_no>0)
out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n"," ","",m);
+ 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(m->line_no>0)
out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n"," ","",m);
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
if(m->line_no>0)
out_addline_outfile(out);
out_printf(out,"{\n");
"gtk_object_class = "
"(GtkObjectClass*) %s;\n",
((FuncArg *)m->args->data)->name);
-
+
if(overrides>0)
add_overrides(c,
((FuncArg *)m->args->data)->name,
(signals>0 || arguments>0));
- out_printf(out,"\n\tparent_class = "
- "gtk_type_class (%s_get_type ());\n",
- pfuncbase);
+ 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);
if(signals>0)
add_signals(c);
if(arguments>0)
make_arguments(c);
+
} else
continue;
"\tGtkArg *arg,\n"
"\tguint arg_id)\n"
"{\n"
- "\t%s *self, *this;\n\n"
- "\tself = this = %s (object);\n\n"
+ "\t%s *self;\n\n"
+ "\tself = %s (object);\n\n"
"\tswitch (arg_id) {\n",
is_set?"set":"get",typebase,macrobase);
switch(m->scope) {
case PUBLIC_SCOPE:
out_addline_infile(out,m->line_no);
- print_method(out,"","\n"," ","",m);
+ 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"," ","",m);
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
print_method_body(m,TRUE);
break;
case PRIVATE_SIGNAL_FIRST_METHOD:
case SIGNAL_FIRST_METHOD:
case SIGNAL_LAST_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,private?"static ":"","\n"," ","",m);
+ print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
out_addline_outfile(out);
out_printf(out,"{\n");
s = g_strdup(m->id);
if(!m->cbuf)
break;
out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n_real_"," ","",m);
+ 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"," ","",m);
+ print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
out_addline_outfile(out);
out_printf(out,"{\n"
- "\t%sClass *class;\n",typebase);
+ "\t%sClass *klass;\n",typebase);
print_preconditions(m);
- out_printf(out,"\tclass = %s_CLASS(GTK_OBJECT(%s)->klass);\n\n"
- "\tif(class->%s)\n",
+ out_printf(out,"\tklass = %s_CLASS(GTK_OBJECT(%s)->klass);\n\n"
+ "\tif(klass->%s)\n",
macrobase, ((FuncArg *)m->args->data)->name, m->id);
if(strcmp(m->mtype->name,"void")==0 &&
m->mtype->stars==0) {
GList *li;
- out_printf(out,"\t\t(*class->%s)(%s",m->id,
+ out_printf(out,"\t\t(*klass->%s)(%s",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,");\n}\n");
} else {
GList *li;
- out_printf(out,"\t\treturn (*class->%s)(%s",m->id,
+ out_printf(out,"\t\treturn (*klass->%s)(%s",m->id,
((FuncArg *)m->args->data)->name);
for(li=m->args->next;li;li=g_list_next(li)) {
FuncArg *fa = li->data;
if(!m->cbuf)
break;
out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n_real_"," ","",m);
+ print_method(out,"static ","\n_real_"," ","\n",m,FALSE);
print_method_body(m,FALSE);
break;
case OVERRIDE_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,"static ","\n"," ","",m);
+ print_method(out,"static ","\n"," ","\n",m,FALSE);
print_method_body(m,TRUE);
break;
default:
{
char *outfile,*outfileh;
- outfile = g_strconcat(filebase,".c",NULL);
- outfileh = g_strconcat(filebase,".h",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);
+ else
+ outfileh = g_strconcat(filebase,".h",NULL);
out = fopen(outfile,"w");
if(!out) {
time_t curtime;
time(&curtime);
- out_printf(outh,"/* Generated by GOB (v%s) on %s"
- " (do not edit directly) */\n\n",VERSION,ctime(&curtime));
+ out_printf(outh,"/* 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));
"#include <gtk/gtk.h>\n\n",p,p);
g_free(p);
- out_printf(outh,"#ifdef __cplusplus\n"
- "extern \"C\" {\n"
- "#endif /* __cplusplus */\n\n");
+ if(!for_cpp)
+ out_printf(outh,"#ifdef __cplusplus\n"
+ "extern \"C\" {\n"
+ "#endif /* __cplusplus */\n\n");
out_printf(out,"#include \"%s.h\"\n\n",filebase);
add_get_type();
- def_methods(c);
+ make_method_pointers(c);
out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
- funcbase);
-
+ funcbase);
+
add_inits(c);
if(arguments>0) {
out_printf(out,"#undef GET_NEW\n");
- undef_methods(c);
+ add_bad_hack_to_avoid_unused_warnings(c);
g_free(otype);
g_free(ptype);
g_assert_not_reached();
}
- out_printf(outh,"\n#ifdef __cplusplus\n"
- "}\n"
- "#endif /* __cplusplus */\n\n"
- "#endif");
+ if(!for_cpp)
+ out_printf(outh,"\n#ifdef __cplusplus\n"
+ "}\n"
+ "#endif /* __cplusplus */\n");
+ out_printf(outh,"\n#endif");
}
#if 0
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--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");
}
static void
exit_on_warn = TRUE;
} else if(strcmp(argv[i],"--no-exit-on-warn")==0) {
exit_on_warn = FALSE;
+ } else if(strcmp(argv[i],"--for-cpp")==0) {
+ for_cpp = TRUE;
+ } else if(strcmp(argv[i],"--no-touch-headers")==0) {
+ no_touch_headers = TRUE;
} else if(strcmp(argv[i],"--")==0) {
/*further arguments are files*/
no_opts = TRUE;
}
}
+static void
+compare_and_move_header(void)
+{
+ char *hfnew = g_strconcat("#gob#",filebase,".h#gob#",NULL);
+ char *hf = g_strconcat(filebase,".h",NULL);
+ struct stat s;
+ 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);
+ 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(rename(hfnew,hf)!=0)
+ print_error(FALSE,"Can't rename new header file",0);
+ g_free(hfnew);
+ g_free(hf);
+}
+
int
main(int argc, char *argv[])
{
fclose(out);
fclose(outh);
+
+ if(no_touch_headers)
+ compare_and_move_header();
#if 0
poptFreeContext(optCon);
projects / gob-dx.git / blobdiff