static int overrides = 0; /* number of override functions */
static int privates = 0; /* number of private data members */
-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 */
+ 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,", ...");
}
static void
-put_variable(Variable *v, FILE *fp, int priv)
+put_variable(Variable *v, FILE *fp)
{
- if(v->scope == PRIVATE_SCOPE) {
- if(!priv) return;
- } else {
- if(priv) return;
- }
-
out_printf(fp,"\t");
- print_type(fp,v->vtype);
- out_printf(fp,"%s;\n",v->id);
+ print_type(fp,v->vtype,FALSE);
+ out_printf(fp,"%s%s;\n",v->id,
+ v->vtype->postfix?
+ v->vtype->postfix:"");
}
static void
else
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);
}
}
if(!got_class_init) {
node = new_method(CLASS_INIT_METHOD,
- (Type *)new_type(0,g_strdup("void")),
+ (Type *)new_type(0,g_strdup("void"),NULL),
NULL,NULL,g_strdup("class_init"),
make_func_arg(cl->otype,TRUE,g_strdup("c")),
NULL, NULL,0,0,FALSE);
}
if(!got_init) {
node = new_method(INIT_METHOD,
- (Type *)new_type(0,g_strdup("void")),
+ (Type *)new_type(0,g_strdup("void"),NULL),
NULL,NULL,g_strdup("init"),
make_func_arg(cl->otype,FALSE,g_strdup("o")),
NULL, NULL,0,0,FALSE);
}
if(!got_destroy) {
node = new_method(OVERRIDE_METHOD,
- (Type *)new_type(0,g_strdup("void")),
+ (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")),
g_hash_table_insert(marsh,m,s);
out_printf(out,"\ntypedef ");
- print_type(out,m->mtype);
+ print_type(out,m->mtype,TRUE);
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,", ");
+ print_type(out,arg->atype,TRUE);
+ out_printf(out,", ");
}
out_printf(out,"gpointer);\n");
else {
FuncArg *fa = ali->data;
out_printf(out, ",\n\t\t(");
- print_type(out,fa->atype);
+ print_type(out,fa->atype,TRUE);
out_printf(out, ")GTK_VALUE_%s(args[%d])",
(char *)li->data,i);
}
} 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"
else {
FuncArg *fa = ali->data;
out_printf(out, ",\n\t\t(");
- print_type(out,fa->atype);
+ print_type(out,fa->atype,TRUE);
out_printf(out, ")GTK_VALUE_%s(args[%d])",
(char *)li->data,i);
}
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");
}
} 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"
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");
}
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 || 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");
+ }
p = g_strconcat(filebase,".h",NULL);
- if(!g_list_find_custom(include_files,p,(GCompareFunc)strcmp))
+ 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) {
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,outh,FALSE);
+ Variable *v = (Variable *)n;
+ if(n->type == VARIABLE_NODE &&
+ v->scope == PUBLIC_SCOPE)
+ put_variable((Variable *)n,outh);
}
if(privates>0)
out_printf(outh,"\t%sPrivate *_priv;\n",typebase);
out_printf(outh,"};\n");
if(privates>0) {
- out_printf(out,"struct _%sPrivate {\n",
+ FILE *outfp;
+
+ /* if we are to stick this into the private
+ header, otherwise 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;
- if(n->type == VARIABLE_NODE) {
- Variable *v = (Variable *)n;
- out_addline_infile(out,v->line_no);
- put_variable(v,out,TRUE);
+ 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(out);
- out_printf(out,"};\n");
+ out_addline_outfile(outfp);
+ out_printf(outfp,"};\n");
}
out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
"}\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--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, even if it would be empty\n"
+ "\t--no-private-header Don't create a private header, "
+ "put private structure inside c "
+ "file\n");
}
static void
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;