* USA.
*/
+#include "config.h"
#include <glib.h>
+#if 0
#include <popt.h>
+#endif
#include <time.h>
#include <stdio.h>
#include <string.h>
#include "tree.h"
-#include "y.tab.h"
-
-#ifndef VERSION
-#define VERSION "0.0.1"
-#endif
+#include "parse.h"
+#include "out.h"
+#include "main.h"
-char *filename = "stdin";
+char *filename = NULL;
int yyparse(void);
extern Node *class;
extern GList *nodes;
-static char *filebase;
+char *filebase;
static char *funcbase;
static char *pfuncbase;
static char *macrobase;
static char *typebase;
static char *ptypebase;
-static FILE *out;
-static FILE *outh;
+static int signals = 0;
+static int arguments = 0;
+static int overrides = 0;
+
+FILE *out;
+FILE *outh;
int exit_on_warn = FALSE;
+int exit_on_error = TRUE;
+int 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);
}
{
GList *li;
- fprintf(out,"\n");
+ out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *node = li->data;
if(node->type == METHOD_NODE) {
m->scope == OVERRIDE_METHOD)
continue;
- fprintf(out,"#define %s %s_%s\n",m->id,funcbase,m->id);
+ out_printf(out,"#define %s %s_%s\n",m->id,funcbase,m->id);
}
}
- fprintf(out,"\n");
+ out_printf(out,"\n");
}
static void
{
GList *li;
- fprintf(out,"\n");
+ out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *node = li->data;
if(node->type == METHOD_NODE) {
m->scope == OVERRIDE_METHOD)
continue;
- fprintf(out,"#undef %s\n",m->id);
+ out_printf(out,"#undef %s\n",m->id);
}
}
- fprintf(out,"\n");
+ out_printf(out,"\n");
}
static void
char *s;
int i;
s = remove_sep(t->name);
- fprintf(fp,"%s ",s);
+ out_printf(fp,"%s ",s);
g_free(s);
for(i=0;i<t->stars;i++)
- fprintf(fp,"*");
+ out_printf(fp,"*");
}
static void
put_variable(Variable *v)
{
- fprintf(outh,"\t");
+ out_printf(outh,"\t");
if(v->scope == PRIVATE_SCOPE)
- fprintf(outh,"/* private */ ");
+ out_printf(outh,"/* private */ ");
print_type(outh,v->vtype);
- fprintf(outh,"%s;\n",v->id);
+ out_printf(outh,"%s;\n",v->id);
}
static void
{
GList *li;
- fprintf(fp,"%s",typeprefix);
+ out_printf(fp,"%s",typeprefix);
print_type(fp,m->mtype);
- fprintf(fp,"%s%s_%s%s(",
+ out_printf(fp,"%s%s_%s%s(",
nameprefix,funcbase,m->id,namepostfix);
- for(li=m->args;li;li=g_list_next(li)) {
- FuncArg *arg = li->data;
- print_type(fp,arg->atype);
- if(li->next)
- fprintf(fp,"%s, ",arg->name);
- else
- fprintf(fp,"%s",arg->name);
+ 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");
}
- fprintf(fp,")%s\n",postfix);
+ out_printf(fp,")%s\n",postfix);
}
static void
{
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);
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",";",m);
}
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_"," ",";",m);
+ print_method(out,"static ",""," ",";",m);
+ } 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);
(Type *)new_type(0,g_strdup("void")),
NULL,NULL,g_strdup("class_init"),
make_init_args(cl,g_strdup("c"),TRUE),
- NULL, NULL,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);
+ 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)
g_hash_table_insert(marsh,m,s);
- fprintf(out,"\ntypedef ");
+ out_printf(out,"\ntypedef ");
print_type(out,m->mtype);
- fprintf(out,"(*%s) (",s);
+ out_printf(out,"(*%s) (",s);
for(li=m->args;li;li=g_list_next(li)) {
FuncArg *arg = li->data;
print_type(out,arg->atype);
- fprintf(out,", ");
+ out_printf(out,", ");
}
- fprintf(out,"gpointer);\n");
+ out_printf(out,"gpointer);\n");
- fprintf(out,"\nstatic void\n"
+ out_printf(out,"\nstatic void\n"
"marshal_%s (GtkObject * object,\n"
"\tGtkSignalFunc func,\n"
"\tgpointer func_data,\n"
if(strcmp(m->gtktypes->data,"NONE")==0) {
int i;
- fprintf(out, "\t%s rfunc;\n\n"
+ 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) {
for(i=0,li=m->gtktypes->next;li;
i++,li=g_list_next(li)) {
- fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+ out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
(char *)li->data,i);
}
}
- fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+ out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
} else {
int i;
- fprintf(out, "\t%s rfunc;\n\t",s);
+ out_printf(out, "\t%s rfunc;\n\t",s);
print_type(out,m->mtype);
- fprintf(out, " *retval;\n\n"
+ out_printf(out, " *retval;\n\n"
"\trfunc = (%s)func;\n\n"
"\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
"\t*retval = (*rfunc)((%s *)object",
if(strcmp(m->gtktypes->next->data,"NONE")!=0) {
for(i=0,li=m->gtktypes->next;li;
i++,li=g_list_next(li)) {
- fprintf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
+ out_printf(out, ",\n\t\tGTK_VALUE_%s(args[%d])",
(char *)li->data,i);
}
}
- fprintf(out, ",\n\t\tfunc_data);\n}\n\n");
+ out_printf(out, ",\n\t\tfunc_data);\n}\n\n");
}
}
add_enums(Class *c)
{
GList *li;
- fprintf(out,"\nenum {\n");
- for(li=c->nodes;li;li=g_list_next(li)) {
- Node *n = li->data;
- if(n->type == METHOD_NODE) {
- Method *m = (Method *)n;
- if(m->scope == SIGNAL_LAST_METHOD ||
- m->scope == SIGNAL_FIRST_METHOD) {
- char *s = g_strdup(m->id);
- g_strup(s);
- fprintf(out,"\t%s_SIGNAL,\n",s);
- g_free(s);
+ out_printf(out,"\n");
+ if(signals>0) {
+ out_printf(out,"enum {\n");
+ for(li=c->nodes;li;li=g_list_next(li)) {
+ 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) {
+ char *s = g_strdup(m->id);
+ g_strup(s);
+ out_printf(out,"\t%s_SIGNAL,\n",s);
+ g_free(s);
+ }
}
}
+ out_printf(out,"\tLAST_SIGNAL\n};\n\n");
}
- fprintf(out,"\tLAST_SIGNAL\n"
- "};\n\n"
- "enum {\n"
- "\tARG_0,\n");
- for(li=c->nodes;li;li=g_list_next(li)) {
- Node *n = li->data;
- if(n->type == ARGUMENT_NODE) {
- Argument *a = (Argument *)n;
- char *s = g_strdup(a->name);
- g_strup(s);
- fprintf(out,"\tARG_%s,\n",s);
- g_free(s);
+ if(arguments>0) {
+ out_printf(out,"enum {\n\tARG_0,\n");
+ for(li=c->nodes;li;li=g_list_next(li)) {
+ Node *n = li->data;
+ if(n->type == ARGUMENT_NODE) {
+ Argument *a = (Argument *)n;
+ char *s = g_strdup(a->name);
+ g_strup(s);
+ out_printf(out,"\tARG_%s,\n",s);
+ g_free(s);
+ }
}
+ out_printf(out, "};\n\n");
}
- fprintf(out, "};\n\n"
- "static guint object_signals[LAST_SIGNAL] = {0};\n\n"
- "static %sClass *parent_class = NULL;\n\n",ptypebase);
+
+ if(signals>0)
+ out_printf(out,
+ "static guint object_signals[LAST_SIGNAL] = {0};\n\n");
+
+ out_printf(out, "static %sClass *parent_class = NULL;\n\n",ptypebase);
}
static void
add_get_type(void)
{
- fprintf(out, "guint\n"
+ out_printf(out, "guint\n"
"%s_get_type (void)\n"
"{\n"
"\tstatic guint type = 0;\n\n"
}
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;
f = replace_sep(m->otype,'_');
g_strdown(f);
- fprintf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
+ out_printf(out,"\t%sClass *%s_class = (%sClass *)%s;\n",
s,f,s,oname);
g_free(f);
{
GList *li;
- fprintf(out,"\n");
+ 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;
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_",
sig = g_strdup(m->id);
g_strup(sig);
- fprintf(out,"\tobject_signals[%s_SIGNAL] =\n"
+ out_printf(out,"\tobject_signals[%s_SIGNAL] =\n"
"\t\tgtk_signal_new (\"%s\",\n"
"\t\t\tGTK_RUN_%s,\n"
"\t\t\tgtk_object_class->type,\n"
"\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(!is_none) {
GList *l;
for(l=m->gtktypes->next;l;l=g_list_next(l))
- fprintf(out,",\n\t\t\tGTK_TYPE_%s",
+ out_printf(out,",\n\t\t\tGTK_TYPE_%s",
(char *)l->data);
}
- fprintf(out,");\n");
+ out_printf(out,");\n");
}
- fprintf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
+ out_printf(out,"\tgtk_object_class_add_signals (gtk_object_class,\n"
"\t\tobject_signals, LAST_SIGNAL);\n\n");
}
{
GList *li;
- fprintf(out,"\n");
+ out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
Method *m;
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;
char *s;
s = replace_sep(m->otype,'_');
g_strdown(s);
- fprintf(out,"\t%s_class->%s = %s_%s;\n",
+ out_printf(out,"\t%s_class->%s = %s_%s;\n",
s,m->id,funcbase,m->id);
} else {
if(m->cbuf)
- fprintf(out,"\t%s->%s = _real_%s_%s;\n",
+ out_printf(out,"\t%s->%s = _real_%s_%s;\n",
oname,m->id,funcbase,m->id);
else
- fprintf(out,"\t%s->%s = NULL;\n",
+ out_printf(out,"\t%s->%s = NULL;\n",
oname,m->id);
}
}
{
GList *li;
- fprintf(out,"\n");
+ out_printf(out,"\n");
for(li=c->nodes;li;li=g_list_next(li)) {
Node *n = li->data;
Argument *a;
s = g_strdup(a->name);
g_strup(s);
- fprintf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
+ out_printf(out,"\tgtk_object_add_arg_type(\"%s::%s\",\n"
"\t\tGTK_TYPE_%s,\n"
"\t\t%s,\n"
"\t\tARG_%s);\n",
g_string_free(flags,TRUE);
}
- fprintf(out,"\n\tgtk_object_class->set_arg = __object_set_arg;\n"
- "\tgtk_object_class->get_arg = __object_get_arg;\n");
+ out_printf(out,
+ "\n\tgtk_object_class->set_arg = __object_set_arg;\n"
+ "\tgtk_object_class->get_arg = __object_get_arg;\n");
}
static void
continue;
m = (Method *)n;
if(m->scope == INIT_METHOD) {
+ if(m->line_no>0)
+ out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","",m);
- if(m->cbuf)
- fprintf(out,"{\n%s\n}\n\n",m->cbuf->str);
- else
- fprintf(out,"{\n\treturn;\n}\n\n");
+ 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);
- fprintf(out,"{\n"
- "\tGtkObjectClass *gtk_object_class = "
- "(GtkObjectClass*) %s;\n",
- ((FuncArg *)m->args->data)->name);
+ if(m->line_no>0)
+ out_addline_outfile(out);
+ out_printf(out,"{\n");
+ if(signals>0 ||
+ arguments>0)
+ out_printf(out,
+ "\tGtkObjectClass *"
+ "gtk_object_class = "
+ "(GtkObjectClass*) %s;\n",
+ ((FuncArg *)m->args->data)->name);
- add_overrides(c, ((FuncArg *)m->args->data)->name);
+ if(overrides>0)
+ add_overrides(c,
+ ((FuncArg *)m->args->data)->name,
+ (signals>0 || arguments>0));
- fprintf(out,"\n\tparent_class = "
+ out_printf(out,"\n\tparent_class = "
"gtk_type_class (%s_get_type ());\n",
pfuncbase);
- add_signals(c);
+ if(signals>0)
+ add_signals(c);
set_def_handlers(c, ((FuncArg *)m->args->data)->name);
- make_arguments(c);
-
- if(m->cbuf)
- fprintf(out," {\n%s\n }\n",m->cbuf->str);
- fprintf(out,"}\n");
+ if(arguments>0)
+ make_arguments(c);
+ } else
+ continue;
+
+ if(m->cbuf) {
+ out_printf(out," {\n");
+ out_addline_infile(out,m->ccode_line);
+ out_printf(out,"%s\n",m->cbuf->str);
+ out_addline_outfile(out);
+ out_printf(out," }\n",m->cbuf->str);
+ } else {
+ out_printf(out,"return;\n");
}
+ out_printf(out,"}\n");
}
}
add_getset_arg(Class *c, int is_set)
{
GList *li;
- fprintf(out,"\nstatic void\n"
+ out_printf(out,"\nstatic void\n"
"__object_%s_arg (GtkObject *object,\n"
"\tGtkArg *arg,\n"
"\tguint arg_id)\n"
"{\n"
- "\t%s *this;\n\n"
- "\tthis = %s (object);\n\n"
+ "\t%s *self, *this;\n\n"
+ "\tself = this = %s (object);\n\n"
"\tswitch (arg_id) {\n",
is_set?"set":"get",typebase,macrobase);
Node *n = li->data;
Argument *a;
char *s;
+ GString *cbuf;
+ int line_no;
if(n->type != ARGUMENT_NODE)
continue;
a = (Argument *)n;
- if((is_set && !a->set) ||
- (!is_set && !a->get))
+ if(is_set) {
+ cbuf = a->set;
+ line_no = a->set_line;
+ } else {
+ cbuf = a->get;
+ line_no = a->get_line;
+ }
+ if(!cbuf)
continue;
s = g_strdup(a->name);
g_strup(s);
- fprintf(out,"\tcase ARG_%s:\n"
+ out_printf(out,"\tcase ARG_%s:\n"
"#define ARG (GTK_VALUE_%s(*arg))\n"
- "\t\t{\n%s\n\t\t}\n\t\tbreak;\n"
- "#undef ARG\n",
- s,a->gtktype,a->set->str);
+ "\t\t{\n",
+ s,a->gtktype);
g_free(s);
+ out_addline_infile(out,line_no);
+ out_printf(out,"%s\n",cbuf->str);
+ out_addline_outfile(out);
+ out_printf(out,"\t\t}\n\t\tbreak;\n"
+ "#undef ARG\n");
}
- fprintf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
+ out_printf(out,"\tdefault:\n\t\tbreak;\n\t}\n}\n");
}
static void
Check *ch = li->data;
char *s;
if(is_void)
- fprintf(out,"\tg_return_if_fail (");
+ out_printf(out,"\tg_return_if_fail (");
else
- fprintf(out,"\tg_return_val_if_fail (");
+ out_printf(out,"\tg_return_val_if_fail (");
switch(ch->chtype) {
case NULL_CHECK:
- fprintf(out,"%s != NULL",fa->name);
+ out_printf(out,"%s != NULL",fa->name);
break;
case TYPE_CHECK:
s = make_is_macro(fa->atype->name);
- fprintf(out,"%s (%s)",s,fa->name);
+ out_printf(out,"%s (%s)",s,fa->name);
g_free(s);
break;
case LT_CHECK:
- fprintf(out,"%s < %s",fa->name,ch->number);
+ out_printf(out,"%s < %s",fa->name,ch->number);
break;
case GT_CHECK:
- fprintf(out,"%s > %s",fa->name,ch->number);
+ out_printf(out,"%s > %s",fa->name,ch->number);
break;
case LE_CHECK:
- fprintf(out,"%s <= %s",fa->name,ch->number);
+ out_printf(out,"%s <= %s",fa->name,ch->number);
break;
case GE_CHECK:
- fprintf(out,"%s >= %s",fa->name,ch->number);
+ out_printf(out,"%s >= %s",fa->name,ch->number);
break;
case EQ_CHECK:
- fprintf(out,"%s == %s",fa->name,ch->number);
+ out_printf(out,"%s == %s",fa->name,ch->number);
break;
case NE_CHECK:
- fprintf(out,"%s != %s",fa->name,ch->number);
+ out_printf(out,"%s != %s",fa->name,ch->number);
break;
}
if(is_void)
- fprintf(out,");\n");
+ out_printf(out,");\n");
else {
- fprintf(out,", (");
+ out_printf(out,", (");
print_type(out,m->mtype);
- fprintf(out,")%s);\n",
+ out_printf(out,")%s);\n",
m->onerror?m->onerror:"0");
}
}
static void
print_method_body(Method *m, int pre)
{
- fprintf(out,"{\n");
+ out_printf(out,"{\n");
if(pre) {
print_preconditions(m);
- fprintf(out,"\t{\n");
+ out_printf(out,"\t{\n");
}
- fprintf(out,"\t\t%s\n",m->cbuf->str);
+ out_addline_infile(out,m->ccode_line);
+ out_printf(out,"\t\t%s\n",m->cbuf->str);
+ out_addline_outfile(out);
if(pre)
- fprintf(out,"\t}\n");
- fprintf(out,"}\n");
+ out_printf(out,"\t}\n");
+ out_printf(out,"}\n");
}
static void
put_method(Method *m)
{
char *s;
- fprintf(out,"\n");
- if(strcmp(m->id,"new")==0) {
- fprintf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
- funcbase);
- }
+ 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_body(m,TRUE);
break;
case PRIVATE_SCOPE:
+ out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","",m);
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:
- print_method(out,"","\n"," ","",m);
- fprintf(out,"{\n");
+ out_addline_infile(out,m->line_no);
+ print_method(out,private?"static ":"","\n"," ","",m);
+ 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);
- fprintf(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;
- fprintf(out,",\n\t\t%s",fa->name);
+ out_printf(out,",\n\t\t%s",fa->name);
}
- fprintf(out,");\n}\n");
+ out_printf(out,");\n}\n");
} else {
GList *li;
- fprintf(out,"\t");
+ out_printf(out,"\t");
print_type(out,m->mtype);
- fprintf(out,"return_val;\n");
+ out_printf(out,"return_val;\n");
print_preconditions(m);
- fprintf(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;
- fprintf(out,",\n\t\t%s",fa->name);
+ out_printf(out,",\n\t\t%s",fa->name);
}
- fprintf(out,",\n\t\t&return_val);\n"
+ out_printf(out,",\n\t\t&return_val);\n"
"\treturn return_val;\n}\n");
}
if(!m->cbuf)
break;
+ out_addline_infile(out,m->line_no);
print_method(out,"static ","\n_real_"," ","",m);
print_method_body(m,FALSE);
break;
+ case PRIVATE_VIRTUAL_METHOD:
+ private = TRUE;
case VIRTUAL_METHOD:
- print_method(out,"","\n"," ","",m);
- fprintf(out,"{\n"
+ out_addline_infile(out,m->line_no);
+ print_method(out,private?"static ":"","\n"," ","",m);
+ out_addline_outfile(out);
+ out_printf(out,"{\n"
"\t%sClass *class;\n",typebase);
print_preconditions(m);
- fprintf(out,"\tclass = %s_CLASS(GTK_OBJECT(this)->klass);\n\n"
+ out_printf(out,"\tclass = %s_CLASS(GTK_OBJECT(%s)->klass);\n\n"
"\tif(class->%s)\n",
- macrobase,m->id);
+ macrobase, ((FuncArg *)m->args->data)->name, m->id);
if(strcmp(m->mtype->name,"void")==0 &&
m->mtype->stars==0) {
GList *li;
- fprintf(out,"\t\t(*class->%s)(this",m->id);
+ out_printf(out,"\t\t(*class->%s)(%s",m->id,
+ ((FuncArg *)m->args->data)->name);
for(li=m->args->next;li;li=g_list_next(li)) {
FuncArg *fa = li->data;
- fprintf(out,",%s",fa->name);
+ out_printf(out,",%s",fa->name);
}
- fprintf(out,");\n}\n");
+ out_printf(out,");\n}\n");
} else {
GList *li;
- fprintf(out,"\t\treturn (*class->%s)(this",m->id);
+ out_printf(out,"\t\treturn (*class->%s)(%s",m->id,
+ ((FuncArg *)m->args->data)->name);
for(li=m->args->next;li;li=g_list_next(li)) {
FuncArg *fa = li->data;
- fprintf(out,",%s",fa->name);
+ out_printf(out,",%s",fa->name);
}
- fprintf(out,");\n"
+ out_printf(out,");\n"
"\telse\n"
"\t\treturn (");
print_type(out,m->mtype);
- fprintf(out,")(%s);\n}\n",
+ out_printf(out,")(%s);\n}\n",
m->onerror?m->onerror:"0");
}
if(!m->cbuf)
break;
+ out_addline_infile(out,m->line_no);
print_method(out,"static ","\n_real_"," ","",m);
print_method_body(m,FALSE);
break;
case OVERRIDE_METHOD:
+ out_addline_infile(out,m->line_no);
print_method(out,"static ","\n"," ","",m);
print_method_body(m,TRUE);
break;
default:
break;
}
- if(strcmp(m->id,"new")==0)
- fprintf(out,"#undef GET_NEW\n");
}
+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)
+{
+ 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 == SIGNAL_LAST_METHOD ||
+ m->scope == SIGNAL_FIRST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_LAST_METHOD ||
+ m->scope == PRIVATE_SIGNAL_FIRST_METHOD)
+ num++;
+ }
+ }
+ return num;
+}
+
+static int
+count_arguments(Class *c)
+{
+ int num = 0;
+ GList *li;
+
+ for(li=c->nodes;li;li=g_list_next(li)) {
+ Node *n = li->data;
+ if(n->type == ARGUMENT_NODE)
+ 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
open_files(void)
{
time_t curtime;
time(&curtime);
- fprintf(outh,"/* Generated by GOB (v%s) on %s"
+ out_printf(outh,"/* Generated by GOB (v%s) on %s"
" (do not edit directly) */\n\n",VERSION,ctime(&curtime));
- fprintf(out,"/* Generated by GOB (v%s) on %s"
+ out_printf(out,"/* Generated by GOB (v%s) on %s"
" (do not edit directly) */\n\n",VERSION,ctime(&curtime));
p = replace_sep(((Class *)class)->otype,'_');
g_strup(p);
- fprintf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
+ out_printf(outh,"#ifndef __%s_H__\n#define __%s_H__\n\n"
"#include <gtk/gtk.h>\n\n",p,p);
g_free(p);
- fprintf(outh,"#ifdef __cplusplus\n"
+ out_printf(outh,"#ifdef __cplusplus\n"
"extern \"C\" {\n"
"#endif /* __cplusplus */\n\n");
- fprintf(out,"#include \"%s.h\"\n\n",filebase);
+ out_printf(out,"#include \"%s.h\"\n\n",filebase);
for(li=nodes;li;li=g_list_next(li)) {
Node *node = li->data;
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;
- fprintf(fp,"\n%s\n",cc->cbuf->str);
+ out_printf(fp,"\n");
+ out_addline_infile(fp,cc->line_no);
+ }
+ out_printf(fp,"%s\n",cc->cbuf->str);
+ 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);
- fprintf(outh,"\n#define %s(obj)\t"
+ out_printf(outh,"\n#define %s(obj)\t"
"GTK_CHECK_CAST((obj),%s_get_type(),%s)\n",
macrobase,funcbase,typebase);
- fprintf(outh,"#define %s_CLASS(klass)\t"
+ out_printf(outh,"#define %s_CLASS(klass)\t"
"GTK_CHECK_CLASS_CAST((klass),%s_get_type(),%sClass)\n",
macrobase,funcbase,typebase);
- fprintf(outh,"#define %s(obj)\t"
+ out_printf(outh,"#define %s(obj)\t"
"GTK_CHECK_TYPE((obj), %s_get_type ())\n\n",
macrois,funcbase);
otype = remove_sep(c->otype);
ptype = remove_sep(c->ptype);
- fprintf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
- fprintf(outh,"struct _%s {\n\t%s __parent__;\n",
- otype,ptype);
+ out_printf(outh,"\ntypedef struct _%s %s;\n",otype,otype);
+ out_printf(outh,"struct _%s {\n\t%s __parent__;\n",
+ otype,ptype);
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
if(n->type == VARIABLE_NODE)
put_variable((Variable *)n);
}
- fprintf(outh,"};\n");
+ out_printf(outh,"};\n");
- fprintf(outh,"\ntypedef struct _%sClass %sClass;\n",
+ out_printf(outh,"\ntypedef struct _%sClass %sClass;\n",
otype,otype);
- fprintf(outh,
+ out_printf(outh,
"struct _%sClass {\n\t%sClass __parent__;\n",
otype,ptype);
for(l=c->nodes;l;l=g_list_next(l)) {
if(n->type == METHOD_NODE)
put_vs_method((Method *)n);
}
- fprintf(outh,"};\n\n");
+ out_printf(outh,"};\n\n");
- fprintf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
+ out_printf(outh,"guint\t%s_get_type\t(void);\n",funcbase);
- fprintf(out,"static void __object_set_arg "
- "(GtkObject *object, GtkArg *arg, "
- "guint arg_id);\n"
- "static void __object_get_arg "
- "(GtkObject *object, GtkArg *arg, "
- "guint arg_id);\n");
+ if(arguments>0) {
+ out_printf(out,"static void __object_set_arg "
+ "(GtkObject *object, GtkArg *arg, "
+ "guint arg_id);\n"
+ "static void __object_get_arg "
+ "(GtkObject *object, GtkArg *arg, "
+ "guint arg_id);\n");
+ }
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
}
}
- for(l=c->nodes;l;l=g_list_next(l)) {
- Node *n = l->data;
- if(n->type == METHOD_NODE) {
- add_signal_prots((Method *)n);
+ if(signals>0) {
+ for(l=c->nodes;l;l=g_list_next(l)) {
+ Node *n = l->data;
+ if(n->type == METHOD_NODE) {
+ add_signal_prots((Method *)n);
+ }
}
}
add_get_type();
def_methods(c);
+
+ out_printf(out,"#define GET_NEW (gtk_type_new(%s_get_type()))\n",
+ funcbase);
add_inits(c);
- add_getset_arg(c, TRUE);
- add_getset_arg(c, FALSE);
+ if(arguments>0) {
+ add_getset_arg(c, TRUE);
+ add_getset_arg(c, FALSE);
+ }
for(l=c->nodes;l;l=g_list_next(l)) {
Node *n = l->data;
}
}
+ out_printf(out,"#undef GET_NEW\n");
+
undef_methods(c);
g_free(otype);
g_assert_not_reached();
}
- fprintf(outh,"\n#ifdef __cplusplus\n"
+ out_printf(outh,"\n#ifdef __cplusplus\n"
"}\n"
"#endif /* __cplusplus */\n\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");
+}
+
+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],"--")==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);
+ }
+ }
+ }
+ }
+}
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 0
poptFreeContext(optCon);
+#endif
return 0;
}
projects / gob-dx.git / blobdiff