#include "config.h"
#include <glib.h>
+#if 0
#include <popt.h>
+#endif
#include <time.h>
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
#include "tree.h"
#include "parse.h"
#include "out.h"
+#include "main.h"
-char *filename = "stdin";
+char *filename = NULL;
int yyparse(void);
static int signals = 0;
static int arguments = 0;
+static int overrides = 0;
FILE *out;
FILE *outh;
-int exit_on_warn = FALSE;
+gboolean no_touch_headers = FALSE;
+gboolean for_cpp = FALSE;
+gboolean exit_on_warn = FALSE;
+gboolean exit_on_error = TRUE;
+gboolean got_error = FALSE;
-static void
+void
print_error(int is_warn, char *error,int line)
{
char *w;
if(is_warn)
w = "Warning:";
- else
+ else {
w = "Error:";
+ got_error = TRUE;
+ }
if(line>0)
fprintf(stderr,"%s:%d: %s %s\n",filename,line,w,error);
else
fprintf(stderr,"%s: %s %s\n",filename,w,error);
- if(!is_warn || exit_on_warn)
+ if((!is_warn || exit_on_warn) && exit_on_error)
exit(1);
}
}
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);
-
- }
- } else {
- out_printf(fp,"void");
- }
- out_printf(fp,")%s\n",postfix);
-}
-
static void
put_vs_method(Method *m)
{
if(m->scope != SIGNAL_LAST_METHOD &&
m->scope != SIGNAL_FIRST_METHOD &&
- m->scope != VIRTUAL_METHOD)
+ m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
+ m->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
+ m->scope != VIRTUAL_METHOD &&
+ m->scope != PRIVATE_VIRTUAL_METHOD)
return;
- print_method(outh,"\t","(* ",") ",";",m);
+ print_method(outh,"\t","(* ",") ",";\n",m,TRUE);
}
static void
if(m->scope == PRIVATE_SCOPE ||
m->scope == OVERRIDE_METHOD ||
m->scope == INIT_METHOD ||
- m->scope == CLASS_INIT_METHOD)
+ m->scope == CLASS_INIT_METHOD ||
+ m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_VIRTUAL_METHOD)
return;
- print_method(outh,"","\t","\t",";",m);
+ print_method(outh,"","\t","\t",";\n",m,FALSE);
}
static void
if(m->scope == PUBLIC_SCOPE)
return;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD ||
- m->scope == VIRTUAL_METHOD) {
+ if(m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_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_"," ",";",m);
+ print_method(out,"static ","_real_"," ",";\n",m,FALSE);
} else {
- print_method(out,"static ",""," ",";",m);
+ print_method(out,"static ",""," ",";\n",m,FALSE);
}
}
(Type *)new_type(0,g_strdup("void")),
NULL,NULL,g_strdup("class_init"),
make_init_args(cl,g_strdup("c"),TRUE),
- NULL, NULL,0,0);
+ NULL, NULL,0,0,FALSE);
cl->nodes = g_list_prepend(cl->nodes,node);
}
if(!got_init) {
(Type *)new_type(0,g_strdup("void")),
NULL,NULL,g_strdup("init"),
make_init_args(cl,g_strdup("o"),FALSE),
- NULL, NULL,0,0);
+ NULL, NULL,0,0,FALSE);
cl->nodes = g_list_prepend(cl->nodes,node);
}
}
char *s;
if(m->scope != SIGNAL_LAST_METHOD &&
- m->scope != SIGNAL_FIRST_METHOD)
+ m->scope != SIGNAL_FIRST_METHOD &&
+ m->scope != PRIVATE_SIGNAL_LAST_METHOD &&
+ m->scope != PRIVATE_SIGNAL_FIRST_METHOD)
return;
if(!marsh)
"\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(n->type == METHOD_NODE) {
Method *m = (Method *)n;
if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD) {
+ m->scope == SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD) {
char *s = g_strdup(m->id);
g_strup(s);
out_printf(out,"\t%s_SIGNAL,\n",s);
}
static void
-add_overrides(Class *c, char *oname)
+add_overrides(Class *c, char *oname, gboolean did_gtk_obj)
{
GList *li;
GHashTable *done;
char *s;
done = g_hash_table_new(g_str_hash,g_str_equal);
- s = g_strdup("GtkObject"); /* This was already done */
- g_hash_table_insert(done,s,s);
+ if(did_gtk_obj) {
+ s = g_strdup("GtkObject"); /* This was already done */
+ g_hash_table_insert(done,s,s);
+ }
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
char *f;
char *mar;
char *sig;
int is_none;
+ int last = FALSE;
if(n->type != METHOD_NODE ||
(((Method *)n)->scope != SIGNAL_FIRST_METHOD &&
- ((Method *)n)->scope != SIGNAL_LAST_METHOD))
+ ((Method *)n)->scope != SIGNAL_LAST_METHOD &&
+ ((Method *)n)->scope != PRIVATE_SIGNAL_FIRST_METHOD &&
+ ((Method *)n)->scope != PRIVATE_SIGNAL_LAST_METHOD))
continue;
m = (Method *)n;
+
+ if(m->scope == SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ last = FALSE;
+ else
+ last = TRUE;
if(g_hash_table_lookup(marsh,m))
mar = g_strconcat("marshal_",
"\t\t\t%s,\n"
"\t\t\tGTK_TYPE_%s, %d",
sig,m->id,
- m->scope==SIGNAL_LAST_METHOD?"LAST":"FIRST",
+ last?"LAST":"FIRST",
typebase,m->id,mar,(char *)m->gtktypes->data,
is_none?0:g_list_length(m->gtktypes->next));
g_free(mar);
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))
continue;
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"
- "\tGtkObjectClass *gtk_object_class = "
- "(GtkObjectClass*) %s;\n",
- ((FuncArg *)m->args->data)->name);
-
- add_overrides(c, ((FuncArg *)m->args->data)->name);
+ out_printf(out,"{\n");
+ if(signals>0 ||
+ arguments>0)
+ out_printf(out,
+ "\tGtkObjectClass *"
+ "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 *this;\n\n"
- "\tthis = %s (object);\n\n"
+ "\t%s *self;\n\n"
+ "\tself = %s (object);\n\n"
"\tswitch (arg_id) {\n",
is_set?"set":"get",typebase,macrobase);
put_method(Method *m)
{
char *s;
+ int private = FALSE;
out_printf(out,"\n");
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 PRIVATE_SIGNAL_LAST_METHOD:
+ private = TRUE;
case SIGNAL_FIRST_METHOD:
case SIGNAL_LAST_METHOD:
out_addline_infile(out,m->line_no);
- print_method(out,"","\n"," ","",m);
+ print_method(out,private?"static ":"","\n"," ","\n",m,FALSE);
out_addline_outfile(out);
out_printf(out,"{\n");
s = g_strdup(m->id);
m->mtype->stars==0) {
GList *li;
print_preconditions(m);
- out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
- "\t\tobject_signals[%s_SIGNAL]",s);
+ 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);
print_type(out,m->mtype);
out_printf(out,"return_val;\n");
print_preconditions(m);
- out_printf(out,"\tgtk_signal_emit (GTK_OBJECT (this),\n"
- "\t\tobject_signals[%s_SIGNAL]",s);
+ 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);
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,"","\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(this)->klass);\n\n"
- "\tif(class->%s)\n",
- macrobase,m->id);
+ 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)(this",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,",%s",fa->name);
out_printf(out,");\n}\n");
} else {
GList *li;
- out_printf(out,"\t\treturn (*class->%s)(this",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;
out_printf(out,",%s",fa->name);
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:
}
}
+static void
+check_duplicate(Class *c,Node *node,char *id, int line_no)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ char *nid;
+ int nline_no;
+ char *s;
+ if(n->type == METHOD_NODE) {
+ Method *m = (Method *)n;
+ nid = m->id;
+ nline_no = m->line_no;
+ } else if(n->type == VARIABLE_NODE) {
+ Variable *v = (Variable *)n;
+ nid = v->id;
+ nline_no = v->line_no;
+ } else
+ continue;
+ if(n==node ||
+ line_no>=nline_no ||
+ strcmp(nid,id)!=0)
+ continue;
+ s = g_strdup_printf("symbol '%s' redefined, "
+ "first defined on line %d",
+ id,line_no);
+ print_error(FALSE,s,nline_no);
+ }
+}
+
+static void
+check_duplicate_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;
+ check_duplicate(c,n,m->id,m->line_no);
+ } else if(n->type == VARIABLE_NODE) {
+ Variable *v = (Variable *)n;
+ check_duplicate(c,n,v->id,v->line_no);
+ }
+ }
+}
+
+static void
+check_duplicate_named(Class *c,Node *node,char *id, int line_no)
+{
+ GList *l;
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ char *nid;
+ int nline_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) {
+ nid = m->id;
+ nline_no = m->line_no;
+ } else
+ continue;
+ } else if(n->type == ARGUMENT_NODE) {
+ Argument *a = (Argument *)n;
+ nid = a->name;
+ nline_no = a->line_no;
+ } else
+ continue;
+ if(n==node ||
+ line_no>=nline_no ||
+ strcmp(nid,id)!=0)
+ continue;
+ s = g_strdup_printf("named symbol (argument or signal) '%s' "
+ "redefined, first defined on line %d",
+ id,line_no);
+ print_error(FALSE,s,nline_no);
+ }
+}
+
+static void
+check_duplicate_signals_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;
+ if(m->scope == SIGNAL_LAST_METHOD ||
+ m->scope == SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ check_duplicate_named(c,n,m->id,m->line_no);
+ } else if(n->type == ARGUMENT_NODE) {
+ Argument *a = (Argument *)n;
+ check_duplicate_named(c,n,a->name,a->line_no);
+ }
+ }
+}
+
+static void
+check_public_new(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!=PUBLIC_SCOPE &&
+ strcmp(m->id,"new")==0)
+ print_error(TRUE,
+ "'new' should be a public method",
+ m->line_no);
+ }
+ }
+}
+
+static void
+check_vararg(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->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) {
+ print_error(FALSE,
+ "signals, overrides and virtuals, "
+ "can't have variable argument "
+ "lists",
+ m->line_no);
+ }
+ }
+ }
+}
+
static int
count_signals(Class *c)
{
if(n->type == METHOD_NODE) {
Method *m = (Method *)n;
if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD)
+ m->scope == SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
num++;
}
}
return num;
}
+static int
+count_overrides(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 == OVERRIDE_METHOD)
+ num++;
+ }
+ }
+ return num;
+}
static void
{
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);
if(node->type == CCODE_NODE) {
CCode *cc = (CCode *)node;
FILE *fp;
- if(cc->header)
+ if(cc->header) {
fp = outh;
- else {
+ out_printf(fp,"\n");
+ } else {
fp = out;
+ out_printf(fp,"\n");
out_addline_infile(fp,cc->line_no);
}
- out_printf(fp,"\n%s\n",cc->cbuf->str);
+ out_printf(fp,"%s\n",cc->cbuf->str);
if(!cc->header)
out_addline_outfile(fp);
} else if(node->type == CLASS_NODE) {
signals = count_signals(c);
arguments = count_arguments(c);
+ overrides = count_overrides(c);
out_printf(outh,"\n#define %s(obj)\t"
"GTK_CHECK_CAST((obj),%s_get_type(),%s)\n",
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
static void
usage(poptContext optCon, int exitcode, char *error, char *addl)
{
if (error) fprintf(stderr, "%s: %s", error, addl);
exit(exitcode);
}
+#endif
+
+static void
+print_help(void)
+{
+ 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");
+}
+
+static void
+parse_options(int argc, char *argv[])
+{
+ int i;
+ int got_file = FALSE;
+ int no_opts = FALSE;
+
+ filename = NULL;
+
+ 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");
+ print_help();
+ exit(1);
+ }
+ filename = argv[i];
+ got_file = TRUE;
+ } else if(strcmp(argv[i],"--help")==0) {
+ print_help();
+ 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) {
+ 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;
+ } else if(strncmp(argv[i],"--",2)==0) {
+ /*unknown long option*/
+ fprintf(stderr,"Unknown option '%s'!\n",argv[i]);
+ print_help();
+ exit(1);
+ } 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++) {
+ switch(*p) {
+ case 'w':
+ exit_on_warn=TRUE;
+ break;
+ case 'h':
+ case '?':
+ print_help();
+ exit(0);
+ default:
+ fprintf(stderr,
+ "Unknown option '%c'!\n",*p);
+ print_help();
+ exit(1);
+ }
+ }
+ }
+ }
+}
+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[])
{
+#if 0
int c;
poptContext optCon;
poptStrerror(c));
return 1;
}
+#endif
+
+ parse_options(argc,argv);
if(filename) {
yyin = fopen(filename,"r");
make_bases();
+ exit_on_error = FALSE;
make_inits((Class *)class);
+ check_duplicate_symbols((Class *)class);
+ check_duplicate_signals_args((Class *)class);
+ check_public_new((Class *)class);
+ check_vararg((Class *)class);
+ exit_on_error = TRUE;
+ if(got_error)
+ exit(1);
+
open_files();
generate_outfiles();
fclose(out);
fclose(outh);
+
+ if(no_touch_headers)
+ compare_and_move_header();
+#if 0
poptFreeContext(optCon);
+#endif
return 0;
}
projects / gob-dx.git / blobdiff