#include "config.h"
#include <glib.h>
+#if 0
#include <popt.h>
+#endif
#include <time.h>
#include <stdio.h>
#include <string.h>
#include "out.h"
#include "main.h"
-char *filename = "stdin";
+char *filename = NULL;
int yyparse(void);
out_printf(fp,"%s",arg->name);
}
+ if(m->vararg)
+ out_printf(fp,", ...");
} else {
out_printf(fp,"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);
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,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)
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;
out_addline_outfile(out);
out_printf(out,"{\n");
if(signals>0 ||
- arguments>0 ||
- overrides>0)
+ arguments>0)
out_printf(out,
"\tGtkObjectClass *"
"gtk_object_class = "
if(overrides>0)
add_overrides(c,
- ((FuncArg *)m->args->data)->name);
+ ((FuncArg *)m->args->data)->name,
+ (signals>0 || arguments>0));
out_printf(out,"\n\tparent_class = "
"gtk_type_class (%s_get_type ());\n",
put_method(Method *m)
{
char *s;
+ int private = FALSE;
out_printf(out,"\n");
switch(m->scope) {
case PUBLIC_SCOPE:
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:
out_addline_infile(out,m->line_no);
- print_method(out,"","\n"," ","",m);
+ print_method(out,private?"static ":"","\n"," ","",m);
out_addline_outfile(out);
out_printf(out,"{\n");
s = g_strdup(m->id);
print_method(out,"static ","\n_real_"," ","",m);
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"," ","",m);
out_addline_outfile(out);
out_printf(out,"{\n"
"\t%sClass *class;\n",typebase);
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) {
nid = m->id;
nline_no = m->line_no;
} else
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)
check_duplicate_named(c,n,m->id,m->line_no);
} else if(n->type == ARGUMENT_NODE) {
Argument *a = (Argument *)n;
}
}
+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++;
}
}
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) {
"#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");
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)
fclose(out);
fclose(outh);
+#if 0
poptFreeContext(optCon);
+#endif
return 0;
}
projects / gob-dx.git / blobdiff