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 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)
+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;\n",v->id,
+ v->vtype->postfix?
+ v->vtype->postfix:"");
}
static void
}
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);
}
}
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_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")),
+ (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->scope == 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(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_string_new("PARENT_HANDLER (o);\n"),
+ 0,0,FALSE);
+ cl->nodes = g_list_append(cl->nodes,node);
+ overrides++;
+ }
+}
+
static GHashTable *marsh = NULL;
static void
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);
}
if(m->line_no>0)
out_addline_outfile(out);
out_printf(out,"{\n");
+ if(privates>0) {
+ out_printf(out,"\t%s->_priv = "
+ "g_new0 (%sPrivate,1);\n",
+ ((FuncArg *)m->args->data)->name,
+ typebase);
+ }
} else if(m->scope == CLASS_INIT_METHOD) {
if(m->line_no>0)
out_addline_infile(out,m->line_no);
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->scope == 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);
+
+ out_printf(out,"\t{\n");
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,"\t}\n");
out_printf(out,"}\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"
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
+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->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) &&
+ 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)
{
}
}
+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->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) {
+ print_error(FALSE,
+ "signals, overrides and virtuals, "
+ "can't have no arguments",
+ m->line_no);
+ }
+ }
+ }
+}
+
static int
count_signals(Class *c)
{
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 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");
+ }
- 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) {
if(!cc->header)
out_addline_outfile(fp);
} else if(node->type == CLASS_NODE) {
- GList *l;
Class *c = (Class *)class;
- char *otype,*ptype;
-
- signals = count_signals(c);
- arguments = count_arguments(c);
- overrides = count_overrides(c);
+ GList *l;
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);
}
+ 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, 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;
+ 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)
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--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;
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);
+
+ 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);
+
exit_on_error = TRUE;
if(got_error)
projects / gob-dx.git / blobdiff