From 6e77e91bbb048a0ee1a072715c0ce808c169ab38 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Mon, 6 Sep 1999 07:14:00 -0800 Subject: [PATCH] Release 0.90.2 --- ChangeLog | 25 ++ Makefile.in | 1 + NEWS | 4 + configure | 8 +- configure.in | 5 +- doc/Makefile.in | 1 + doc/gob.1 | 16 +- doc/gob.1.in | 14 +- gob.spec | 2 +- src/Makefile.am | 2 +- src/Makefile.in | 3 +- src/main.c | 73 ++++-- src/parse.c | 658 +++++++++++++++++++++++++----------------------- src/parse.y | 102 ++++---- src/test.gob | 18 ++ src/tree.h | 3 + 16 files changed, 550 insertions(+), 385 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb458d5..cddb2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Sun Sep 05 22:08:40 1999 George Lebl + + * Release 0.90.2 + +Sun Sep 05 22:08:33 1999 George Lebl + + * doc/gob.1.in: updated for private virtual and signal wrappers + +Sun Sep 05 21:50:19 1999 George Lebl + + * configure.in: raise version and actually set POPT_LIB correctly + + * src/Makefile.am: use POPT_LIB + +Sun Sep 05 21:45:54 1999 George Lebl + + * src/tree.h,src/main.c,src/parse.y: add support for private signals + and virtuals + + * src/parse.y: fix bug with bogus vararg methods + +Sun Sep 04 17:44:37 1999 George Lebl + + * Released 0.90.1 + Sat Sep 04 17:18:22 1999 George Lebl * src/lexer.l,src/parse.y,src/main.c,src/tree.[ch]: support diff --git a/Makefile.in b/Makefile.in index ef517bc..85ebb52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MV = @MV@ PACKAGE = @PACKAGE@ +POPT_LIB = @POPT_LIB@ RM = @RM@ TAR = @TAR@ VERSION = @VERSION@ diff --git a/NEWS b/NEWS index 28d8895..1b09790 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +0.90.2 + * add support for private signals and virtuals + * fix bug with varargs + 0.90.1 * accept 'const' in argument lists * accept '...' in public and private method argument lists diff --git a/configure b/configure index 2d83de5..e077fee 100755 --- a/configure +++ b/configure @@ -703,7 +703,7 @@ fi PACKAGE=gob -VERSION=0.90.1 +VERSION=0.90.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1959,7 +1959,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - POPT_LIB="-lreadline" + POPT_LIB="-lpopt" else echo "$ac_t""no" 1>&6 { echo "configure: error: Popt library not found" 1>&2; exit 1; } @@ -1967,10 +1967,11 @@ fi + #AM_PROG_LIBTOOL echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1974: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1975: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2158,6 +2159,7 @@ s%@TAR@%$TAR%g s%@GLIB_CONFIG@%$GLIB_CONFIG%g s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@GLIB_LIBS@%$GLIB_LIBS%g +s%@POPT_LIB@%$POPT_LIB%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g diff --git a/configure.in b/configure.in index 4d7b6fd..1dc72a0 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.2) AC_INIT(src/tree.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gob,0.90.1) +AM_INIT_AUTOMAKE(gob,0.90.2) dnl Checks for programs. AC_PROG_CC @@ -15,8 +15,9 @@ AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) AM_PATH_GLIB(1.2.0,,,) -AC_CHECK_LIB(popt,poptGetContext, [POPT_LIB="-lreadline"], +AC_CHECK_LIB(popt,poptGetContext, [POPT_LIB="-lpopt"], AC_MSG_ERROR(Popt library not found)) +AC_SUBST(POPT_LIB) #AM_PROG_LIBTOOL diff --git a/doc/Makefile.in b/doc/Makefile.in index de5f9a1..e257a0a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -70,6 +70,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MV = @MV@ PACKAGE = @PACKAGE@ +POPT_LIB = @POPT_LIB@ RM = @RM@ TAR = @TAR@ VERSION = @VERSION@ diff --git a/doc/gob.1 b/doc/gob.1 index c7bc0f8..73c5385 100644 --- a/doc/gob.1 +++ b/doc/gob.1 @@ -5,7 +5,7 @@ .\" This manual page is covered by the terms of the GNU General .\" Public License. .\" -.TH GOB 1 "GOB 0.90.1" +.TH GOB 1 "GOB 0.90.2" .SH NAME GOB \- The GTK+ Object Builder .SH SYNOPSIS @@ -181,7 +181,8 @@ so that one can override the method in derived methods. They can be empty which makes calling the methods he same as public methods. This type of method is just a little bit "slower" then normal functions, but not as slow as signals. You define them by using "virtual" keyword before the -prototype. +prototype. If you put the keyword "private" right after the "virtual" +keyword, the wrapper will not be a public method, but a private one. .PP Signals: .PP @@ -214,6 +215,13 @@ or .fi .PP +If you don't want the wrapper that emits the signal to be public, you can +include the keyword "private" after the "signal" keyword. This will make +the wrapper a normal private method. +.PP +If you don't define a "first" or a "last", the default will be taken as +"last". +.PP Override methods: .PP If you need to override some method (a signal or a virtual method @@ -271,8 +279,8 @@ will fetch a new object, so a fairly standard new method would look like: .SH BUGS .PP The generated header file is included as the first file in the .c file, no -matter what. This means that you will have to put things that need to be included -before that, into an %h{ } section. +matter what. This means that you will have to put things that need to be +included before that, into an %h{ } section. .SH AUTHOR .PP diff --git a/doc/gob.1.in b/doc/gob.1.in index ee42dd9..afd3bf5 100644 --- a/doc/gob.1.in +++ b/doc/gob.1.in @@ -181,7 +181,8 @@ so that one can override the method in derived methods. They can be empty which makes calling the methods he same as public methods. This type of method is just a little bit "slower" then normal functions, but not as slow as signals. You define them by using "virtual" keyword before the -prototype. +prototype. If you put the keyword "private" right after the "virtual" +keyword, the wrapper will not be a public method, but a private one. .PP Signals: .PP @@ -214,6 +215,13 @@ or .fi .PP +If you don't want the wrapper that emits the signal to be public, you can +include the keyword "private" after the "signal" keyword. This will make +the wrapper a normal private method. +.PP +If you don't define a "first" or a "last", the default will be taken as +"last". +.PP Override methods: .PP If you need to override some method (a signal or a virtual method @@ -271,8 +279,8 @@ will fetch a new object, so a fairly standard new method would look like: .SH BUGS .PP The generated header file is included as the first file in the .c file, no -matter what. This means that you will have to put things that need to be included -before that, into an %h{ } section. +matter what. This means that you will have to put things that need to be +included before that, into an %h{ } section. .SH AUTHOR .PP diff --git a/gob.spec b/gob.spec index b05743b..5a91ffd 100644 --- a/gob.spec +++ b/gob.spec @@ -1,4 +1,4 @@ -%define ver 0.90.1 +%define ver 0.90.2 %define rel 1 %define prefix /usr diff --git a/src/Makefile.am b/src/Makefile.am index b8a6baf..3754187 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ gob_SOURCES = \ gob_LDADD = \ -lm \ - -lpopt \ + @POPT_LIB@ \ $(GLIB_LIBS) \ @LEXLIB@ diff --git a/src/Makefile.in b/src/Makefile.in index 3252f31..4b076bd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -72,6 +72,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MV = @MV@ PACKAGE = @PACKAGE@ +POPT_LIB = @POPT_LIB@ RM = @RM@ TAR = @TAR@ VERSION = @VERSION@ @@ -86,7 +87,7 @@ bin_PROGRAMS = gob gob_SOURCES = main.c main.h tree.c tree.h out.c out.h parse.y lexer.l -gob_LDADD = -lm -lpopt $(GLIB_LIBS) @LEXLIB@ +gob_LDADD = -lm @POPT_LIB@ $(GLIB_LIBS) @LEXLIB@ BUILT_SOURCES = parse.h parse.c lexer.c diff --git a/src/main.c b/src/main.c index 0ed34ee..1b2b19c 100644 --- a/src/main.c +++ b/src/main.c @@ -270,7 +270,10 @@ 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); @@ -282,7 +285,10 @@ put_pub_method(Method *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); @@ -294,9 +300,15 @@ put_priv_method_prot(Method *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); @@ -372,7 +384,9 @@ add_signal_prots(Method *m) 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) @@ -452,7 +466,9 @@ add_enums(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) { char *s = g_strdup(m->id); g_strup(s); out_printf(out,"\t%s_SIGNAL,\n",s); @@ -561,12 +577,21 @@ add_signals(Class *c) 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_", @@ -587,7 +612,7 @@ add_signals(Class *c) "\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); @@ -618,7 +643,10 @@ set_def_handlers(Class *c, char *oname) 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; @@ -884,6 +912,7 @@ static void put_method(Method *m) { char *s; + int private = FALSE; out_printf(out,"\n"); switch(m->scope) { case PUBLIC_SCOPE: @@ -896,10 +925,13 @@ put_method(Method *m) 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); @@ -940,9 +972,11 @@ put_method(Method *m) 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); @@ -1050,7 +1084,9 @@ check_duplicate_named(Class *c,Node *node,char *id, int line_no) 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 @@ -1081,7 +1117,9 @@ check_duplicate_signals_args(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) check_duplicate_named(c,n,m->id,m->line_no); } else if(n->type == ARGUMENT_NODE) { Argument *a = (Argument *)n; @@ -1120,7 +1158,10 @@ check_vararg(Class *c) if(m->scope == OVERRIDE_METHOD || 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) { print_error(FALSE, "signals, overrides and virtuals, " "can't have variable argument " @@ -1141,7 +1182,9 @@ 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++; } } diff --git a/src/parse.c b/src/parse.c index 83fc42c..665f536 100644 --- a/src/parse.c +++ b/src/parse.c @@ -179,6 +179,7 @@ typedef union { GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -194,11 +195,11 @@ typedef union { -#define YYFINAL 192 +#define YYFINAL 198 #define YYFLAG -32768 #define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 72) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 73) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -239,18 +240,19 @@ static const short yyprhs[] = { 0, 78, 82, 83, 87, 89, 91, 94, 96, 99, 102, 105, 107, 110, 113, 115, 117, 119, 121, 124, 126, 128, 131, 133, 136, 138, 140, 142, 144, 146, 149, - 151, 156, 160, 162, 165, 167, 178, 188, 197, 210, - 220, 230, 236, 243, 246, 250, 253, 254, 256, 258, - 262, 264, 268, 270, 274, 276, 279, 286, 289, 291, - 293, 296, 299, 303, 307, 311, 315, 317, 320 + 151, 155, 159, 162, 165, 167, 172, 176, 178, 181, + 183, 193, 203, 212, 225, 235, 245, 251, 254, 258, + 261, 262, 264, 266, 270, 272, 276, 278, 282, 284, + 287, 294, 297, 299, 301, 304, 307, 311, 315, 319, + 323, 325, 328 }; static const short yyrhs[] = { 46, 47, 46, 0, 47, 46, 0, 46, 47, 0, 47, 0, 46, 23, 0, 46, 24, 0, 23, 0, 24, 0, 48, 31, 49, 32, 0, 3, 22, 4, 22, - 0, 49, 63, 0, 49, 50, 0, 49, 51, 0, - 63, 0, 50, 0, 51, 0, 25, 54, 20, 33, + 0, 49, 64, 0, 49, 50, 0, 49, 51, 0, + 64, 0, 50, 0, 51, 0, 25, 54, 20, 33, 0, 26, 54, 20, 33, 0, 27, 52, 20, 20, 20, 31, 23, 20, 31, 23, 33, 0, 27, 52, 20, 20, 20, 31, 23, 33, 0, 34, 53, 35, @@ -261,39 +263,40 @@ static const short yyrhs[] = { 46, 58, 20, 0, 22, 0, 6, 0, 13, 15, 0, 13, 0, 14, 15, 0, 14, 0, 15, 0, 9, 0, 8, 0, 7, 0, 37, 59, 0, 37, 0, - 20, 34, 61, 35, 0, 61, 38, 20, 0, 20, - 0, 31, 23, 0, 33, 0, 29, 20, 60, 54, - 20, 34, 65, 35, 64, 62, 0, 29, 60, 54, - 20, 34, 65, 35, 64, 62, 0, 28, 54, 20, - 34, 65, 35, 64, 62, 0, 30, 34, 22, 35, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 25, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 26, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 20, - 34, 20, 35, 33, 0, 20, 34, 20, 35, 31, - 23, 0, 19, 71, 0, 19, 31, 23, 0, 39, - 40, 0, 0, 6, 0, 20, 0, 20, 38, 66, - 0, 66, 0, 67, 38, 10, 0, 67, 0, 67, - 38, 68, 0, 68, 0, 54, 20, 0, 54, 20, - 34, 20, 69, 35, 0, 69, 70, 0, 70, 0, - 20, 0, 41, 71, 0, 42, 71, 0, 41, 39, - 71, 0, 42, 39, 71, 0, 39, 39, 71, 0, - 43, 39, 71, 0, 21, 0, 44, 21, 0, 20, - 0 + 26, 20, 61, 0, 20, 26, 61, 0, 26, 61, + 0, 20, 61, 0, 61, 0, 20, 34, 62, 35, + 0, 62, 38, 20, 0, 20, 0, 31, 23, 0, + 33, 0, 29, 60, 54, 20, 34, 66, 35, 65, + 63, 0, 28, 26, 54, 20, 34, 66, 35, 65, + 63, 0, 28, 54, 20, 34, 66, 35, 65, 63, + 0, 30, 34, 22, 35, 54, 20, 34, 66, 35, + 65, 31, 23, 0, 25, 54, 20, 34, 66, 35, + 65, 31, 23, 0, 26, 54, 20, 34, 66, 35, + 65, 31, 23, 0, 20, 34, 20, 35, 63, 0, + 19, 72, 0, 19, 31, 23, 0, 39, 40, 0, + 0, 6, 0, 20, 0, 20, 38, 67, 0, 67, + 0, 68, 38, 10, 0, 68, 0, 68, 38, 69, + 0, 69, 0, 54, 20, 0, 54, 20, 34, 20, + 70, 35, 0, 70, 71, 0, 71, 0, 20, 0, + 41, 72, 0, 42, 72, 0, 41, 39, 72, 0, + 42, 39, 72, 0, 39, 39, 72, 0, 43, 39, + 72, 0, 21, 0, 44, 21, 0, 20, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 178, 179, 180, 181, 184, 188, 192, 196, 202, 209, - 214, 215, 216, 217, 218, 219, 222, 225, 229, 258, - 284, 285, 288, 291, 297, 298, 306, 310, 317, 320, - 323, 326, 329, 332, 335, 338, 341, 344, 348, 351, - 356, 359, 362, 365, 368, 373, 376, 379, 384, 385, - 388, 393, 396, 401, 402, 406, 428, 438, 448, 454, - 459, 464, 482, 503, 504, 508, 509, 512, 513, 528, - 543, 546, 547, 550, 551, 554, 557, 567, 568, 571, - 584, 588, 592, 596, 600, 604, 610, 611, 615 + 179, 180, 181, 182, 185, 189, 193, 197, 203, 210, + 215, 216, 217, 218, 219, 220, 223, 226, 230, 259, + 285, 286, 289, 292, 298, 299, 307, 311, 318, 321, + 324, 327, 330, 333, 336, 339, 342, 345, 349, 352, + 357, 360, 363, 366, 369, 374, 377, 380, 385, 386, + 389, 401, 413, 416, 428, 433, 438, 441, 446, 447, + 451, 461, 471, 481, 487, 492, 497, 518, 519, 523, + 524, 527, 528, 544, 559, 562, 563, 566, 567, 570, + 573, 583, 584, 587, 600, 604, 608, 612, 616, 620, + 626, 627, 631 }; #endif @@ -306,9 +309,9 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE", "'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'", "'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags", -"flaglist","type","type1","type2","integer","tspecifier","stars","sigtype","tokenlist", -"codenocode","method","onerror","funcargs","arglist","arglist1","arg","checklist", -"check","numtok", NULL +"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype", +"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1", +"arg","checklist","check","numtok", NULL }; #endif @@ -318,10 +321,11 @@ static const short yyr1[] = { 0, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 58, 58, 58, 59, 59, - 60, 61, 61, 62, 62, 63, 63, 63, 63, 63, - 63, 63, 63, 64, 64, 64, 64, 65, 65, 65, - 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, - 70, 70, 70, 70, 70, 70, 71, 71, 71 + 60, 60, 60, 60, 60, 61, 62, 62, 63, 63, + 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, + 65, 66, 66, 66, 66, 67, 67, 68, 68, 69, + 69, 70, 70, 71, 71, 71, 71, 71, 71, 71, + 72, 72, 72 }; static const short yyr2[] = { 0, @@ -330,10 +334,11 @@ static const short yyr2[] = { 0, 3, 0, 3, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, - 4, 3, 1, 2, 1, 10, 9, 8, 12, 9, - 9, 5, 6, 2, 3, 2, 0, 1, 1, 3, - 1, 3, 1, 3, 1, 2, 6, 2, 1, 1, - 2, 2, 3, 3, 3, 3, 1, 2, 1 + 3, 3, 2, 2, 1, 4, 3, 1, 2, 1, + 9, 9, 8, 12, 9, 9, 5, 2, 3, 2, + 0, 1, 1, 3, 1, 3, 1, 3, 1, 2, + 6, 2, 1, 1, 2, 2, 3, 3, 3, 3, + 1, 2, 1 }; static const short yydefact[] = { 0, @@ -342,116 +347,120 @@ static const short yydefact[] = { 0, 0, 0, 15, 16, 14, 10, 0, 0, 40, 48, 47, 46, 0, 0, 42, 44, 45, 36, 35, 34, 37, 39, 0, 25, 27, 31, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 12, 13, 11, 0, 26, - 33, 30, 32, 29, 41, 43, 0, 50, 28, 38, - 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 17, 0, 49, 18, 0, 0, 21, 0, 0, - 53, 0, 0, 0, 0, 0, 62, 40, 37, 0, - 0, 71, 73, 75, 0, 23, 0, 0, 51, 0, - 0, 0, 0, 63, 0, 76, 67, 0, 67, 0, - 67, 52, 0, 0, 0, 70, 0, 0, 0, 0, - 72, 74, 0, 0, 0, 0, 67, 0, 0, 89, - 87, 0, 0, 64, 66, 0, 0, 0, 20, 0, - 55, 58, 67, 0, 0, 80, 0, 0, 0, 0, - 0, 79, 65, 88, 60, 61, 0, 54, 0, 57, - 67, 0, 0, 81, 0, 82, 0, 77, 78, 0, - 56, 0, 85, 83, 84, 86, 19, 0, 59, 0, - 0, 0 + 0, 0, 0, 0, 0, 55, 0, 9, 12, 13, + 11, 0, 26, 33, 30, 32, 29, 41, 43, 0, + 50, 28, 38, 0, 24, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 53, 0, 0, 0, 17, 0, + 49, 18, 0, 0, 21, 0, 0, 0, 52, 58, + 0, 51, 0, 0, 0, 60, 67, 40, 37, 0, + 0, 75, 77, 79, 0, 23, 0, 0, 0, 56, + 0, 0, 0, 59, 0, 80, 71, 0, 71, 0, + 0, 71, 57, 0, 0, 74, 0, 0, 0, 0, + 76, 78, 0, 0, 71, 0, 71, 0, 0, 93, + 91, 0, 0, 68, 70, 0, 0, 0, 20, 0, + 63, 0, 0, 84, 0, 0, 0, 0, 0, 83, + 69, 92, 65, 66, 0, 62, 61, 71, 0, 0, + 85, 0, 86, 0, 81, 82, 0, 0, 89, 87, + 88, 90, 19, 0, 64, 0, 0, 0 }; -static const short yydefgoto[] = { 190, - 4, 5, 6, 22, 23, 24, 50, 73, 100, 44, - 45, 46, 47, 69, 53, 92, 152, 25, 130, 101, - 102, 103, 104, 161, 162, 144 +static const short yydefgoto[] = { 196, + 4, 5, 6, 22, 23, 24, 50, 76, 110, 44, + 45, 46, 47, 72, 55, 56, 101, 107, 25, 140, + 111, 112, 113, 114, 169, 170, 154 }; -static const short yypact[] = { 32, - 81,-32768,-32768, 36, 53, -15, 108,-32768,-32768, 53, - 137, 138, 92, 137, 87, 93, 93, 96, 93, 3, - 98, 127,-32768,-32768,-32768,-32768, 118, 128,-32768,-32768, --32768,-32768, 60, 156, 134, 136,-32768,-32768,-32768,-32768, --32768,-32768, 157,-32768, 125,-32768, 158, 159, 160, 161, - 162, -2, 93, 163,-32768,-32768,-32768,-32768, 148,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 19, 125,-32768,-32768, - 139, 150, 149, 167, 154, 155, 170, 93, 171, 164, - 10,-32768, 111,-32768,-32768, 111, 160,-32768, 172, 111, --32768, 23, 173, 166, 93, 174,-32768, 168, 28, 175, - 169,-32768, 176,-32768, 177,-32768, 165, 178,-32768, 181, - 182, 111, 185,-32768, 93, 183, -11, 75, -11, 179, - -11,-32768, 111, 180, 184,-32768, 186, -14, 187, 188, --32768,-32768, 189, -7, 63, 190, -11, 111, 29,-32768, --32768, 198, 201,-32768,-32768, 200, 203, 193,-32768, 205, --32768,-32768, -11, 63, 194,-32768, 191, -10, -6, 192, - 5,-32768,-32768,-32768,-32768,-32768, 209,-32768, 63,-32768, - -11, 1, 1,-32768, 1,-32768, 1,-32768,-32768, 202, --32768, 206,-32768,-32768,-32768,-32768,-32768, 210,-32768, 207, - 208,-32768 +static const short yypact[] = { 21, + -18,-32768,-32768, 68, 66, 20, 54,-32768,-32768, 66, + 155, 171, 0, 155, 48, 116, 116, 52, 61, -14, + 59, 160,-32768,-32768,-32768,-32768, 29, 151,-32768,-32768, +-32768,-32768, 81, 189, 111, 120,-32768,-32768,-32768,-32768, +-32768,-32768, 117,-32768, 64,-32768, 124, 133, 135, 152, + 116, 154, 150, 163, 116,-32768, 186,-32768,-32768,-32768, +-32768, 158,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 148, + 64,-32768,-32768, 161, 173, 175, 191, 192, 179, 180, + 195, 196,-32768, 28,-32768, 197, 183, 86,-32768, 134, +-32768,-32768, 134, 135,-32768, 199, 187, 134,-32768,-32768, + -22,-32768, 188, 116, 200,-32768,-32768, 185, 18, 204, + 190,-32768, 193,-32768, 194,-32768, 201, 134, 198,-32768, + 206, 134, 207,-32768, 116, 202, 41, 98, 41, 205, + 203, 41,-32768, 208, 210,-32768, 214, -6, 209, 211, +-32768,-32768, 215, 26, 41, 86, 41, 134, 22,-32768, +-32768, 212, 216,-32768,-32768, 217, 218, 219,-32768, 86, +-32768, 86, 213,-32768, 220, -3, 8, 221, -9,-32768, +-32768,-32768,-32768,-32768, 222,-32768,-32768, 41, -1, -1, +-32768, -1,-32768, -1,-32768,-32768, 223, 224,-32768,-32768, +-32768,-32768,-32768, 228,-32768, 230, 239,-32768 }; static const short yypgoto[] = {-32768, - 14, 230,-32768,-32768, 214, 216,-32768, 107, -16, 211, --32768, 142,-32768, 130, 195,-32768, -142, 218, -117, -81, - 94,-32768, 123,-32768, 49, -108 + 45, 243,-32768,-32768, 231, 232,-32768, 164, -16, 229, +-32768, 172,-32768, 181,-32768, -44,-32768, 15, 240, -124, + -91, 136,-32768, 137,-32768, 94, -82 }; -#define YYLAST 247 +#define YYLAST 265 static const short yytable[] = { 43, - 48, 133, 51, 135, 105, 140, 141, 128, 108, 140, - 141, 170, 148, 140, 141, 12, 142, 76, 11, 154, - 140, 141, 52, 14, 156, 149, 181, 129, 173, 143, - 124, 77, 175, 143, 1, 169, 79, 143, 1, 178, - 96, 136, 97, 157, 143, 158, 159, 160, 156, 174, - 176, 82, 83, 182, 2, 3, 155, 109, 8, 9, - 110, 93, -69, 183, 184, 115, 185, 157, 186, 158, - 159, 160, 35, 36, 37, 2, 3, 61, 113, 28, - 29, 30, 31, 32, 131, 33, 34, 35, 36, 37, - 38, 39, 40, 150, 41, 151, 42, 28, 29, 30, - 31, 32, 7, 33, 34, 35, 36, 37, 38, 39, - 40, 13, 41, 26, 42, 28, 98, 30, 31, 32, - 27, 33, 34, 35, 36, 37, 38, 39, 40, 49, - 99, 54, 42, 29, 30, 31, 32, 59, 33, 34, - 35, 36, 37, 38, 39, 40, 15, 41, 65, 42, - 66, 16, 17, 18, 19, 20, 21, 15, 55, 8, - 9, 68, 16, 17, 18, 19, 20, 21, 35, 36, - 37, 85, 86, 63, 62, 64, 67, 70, 71, 72, - 74, 75, 81, 88, 80, 87, 89, 90, 77, 91, - 94, 107, 111, 106, 116, 120, 114, 84, 95, 112, - 122, 134, -68, 117, 125, 139, 191, 192, 126, 179, - 0, 119, 121, 118, 137, 123, 127, 138, 146, 147, - 163, 164, 165, 167, 153, 166, 145, 168, 171, 172, - 177, 180, 189, 10, 187, 56, 188, 57, 60, 58, - 132, 0, 0, 0, 0, 0, 78 + 48, 115, 52, 7, 143, 53, 119, 146, 83, 85, + 164, 54, 120, 150, 151, 121, 150, 151, 150, 151, + 160, 26, 162, 1, 152, 185, 131, 150, 151, 165, + 134, 166, 167, 168, 78, 180, 99, 153, 86, 102, + 153, 164, 153, 2, 3, 158, 182, 80, 62, 11, + 12, 153, -73, 188, 14, 125, 163, 13, 159, 138, + 165, 82, 166, 167, 168, 28, 29, 30, 31, 32, + 1, 33, 34, 35, 36, 37, 38, 39, 40, 139, + 41, 27, 42, 181, 183, 49, 51, 123, 2, 3, + 8, 9, 57, 35, 36, 37, 189, 190, 64, 191, + 71, 192, 28, 29, 30, 31, 32, 141, 33, 34, + 35, 36, 37, 38, 39, 40, 105, 41, 106, 42, + 28, 29, 30, 31, 32, 68, 33, 34, 35, 36, + 37, 38, 39, 40, 69, 41, 70, 42, 28, 108, + 30, 31, 32, 73, 33, 34, 35, 36, 37, 38, + 39, 40, 74, 109, 75, 42, 29, 30, 31, 32, + 161, 33, 34, 35, 36, 37, 38, 39, 40, 80, + 41, 77, 42, 79, 176, 81, 177, 8, 9, 15, + 89, 90, 84, 82, 16, 17, 18, 19, 20, 21, + 15, 58, 88, 92, 93, 16, 17, 18, 19, 20, + 21, 35, 36, 37, 65, 67, 66, 87, 94, 95, + 96, 97, 98, 82, 80, 100, 103, 104, 117, -72, + 118, 122, 124, 126, 127, 133, 135, 144, 129, 197, + 128, 130, 132, 149, 171, 137, 172, 145, 198, 173, + 174, 156, 147, 148, 187, 157, 10, 178, 155, 175, + 195, 91, 59, 60, 194, 193, 63, 116, 179, 184, + 136, 61, 186, 0, 142 }; static const short yycheck[] = { 16, - 17, 119, 19, 121, 86, 20, 21, 19, 90, 20, - 21, 154, 20, 20, 21, 31, 31, 20, 5, 137, - 20, 21, 20, 10, 20, 33, 169, 39, 39, 44, - 112, 34, 39, 44, 3, 153, 53, 44, 3, 35, - 31, 123, 33, 39, 44, 41, 42, 43, 20, 158, - 159, 33, 34, 171, 23, 24, 138, 35, 23, 24, - 38, 78, 35, 172, 173, 38, 175, 39, 177, 41, - 42, 43, 13, 14, 15, 23, 24, 18, 95, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 31, 20, 33, 22, 5, 6, 7, - 8, 9, 22, 11, 12, 13, 14, 15, 16, 17, - 18, 4, 20, 22, 22, 5, 6, 7, 8, 9, - 34, 11, 12, 13, 14, 15, 16, 17, 18, 34, - 20, 34, 22, 6, 7, 8, 9, 20, 11, 12, - 13, 14, 15, 16, 17, 18, 20, 20, 15, 22, - 15, 25, 26, 27, 28, 29, 30, 20, 32, 23, - 24, 37, 25, 26, 27, 28, 29, 30, 13, 14, - 15, 33, 34, 18, 33, 34, 20, 20, 20, 20, - 20, 20, 35, 35, 22, 36, 20, 34, 34, 20, - 20, 20, 20, 87, 20, 31, 23, 68, 35, 34, - 20, 23, 35, 35, 20, 20, 0, 0, 115, 161, - -1, 35, 35, 38, 35, 34, 34, 34, 31, 31, - 23, 21, 23, 31, 35, 23, 40, 23, 35, 39, - 39, 23, 23, 4, 33, 22, 31, 22, 28, 22, - 118, -1, -1, -1, -1, -1, 52 + 17, 93, 19, 22, 129, 20, 98, 132, 53, 54, + 20, 26, 35, 20, 21, 38, 20, 21, 20, 21, + 145, 22, 147, 3, 31, 35, 118, 20, 21, 39, + 122, 41, 42, 43, 51, 39, 81, 44, 55, 84, + 44, 20, 44, 23, 24, 20, 39, 20, 20, 5, + 31, 44, 35, 178, 10, 38, 148, 4, 33, 19, + 39, 34, 41, 42, 43, 5, 6, 7, 8, 9, + 3, 11, 12, 13, 14, 15, 16, 17, 18, 39, + 20, 34, 22, 166, 167, 34, 26, 104, 23, 24, + 23, 24, 34, 13, 14, 15, 179, 180, 18, 182, + 37, 184, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 31, 20, 33, 22, + 5, 6, 7, 8, 9, 15, 11, 12, 13, 14, + 15, 16, 17, 18, 15, 20, 20, 22, 5, 6, + 7, 8, 9, 20, 11, 12, 13, 14, 15, 16, + 17, 18, 20, 20, 20, 22, 6, 7, 8, 9, + 146, 11, 12, 13, 14, 15, 16, 17, 18, 20, + 20, 20, 22, 20, 160, 26, 162, 23, 24, 20, + 33, 34, 20, 34, 25, 26, 27, 28, 29, 30, + 20, 32, 35, 33, 34, 25, 26, 27, 28, 29, + 30, 13, 14, 15, 33, 34, 18, 22, 36, 35, + 20, 20, 34, 34, 20, 20, 20, 35, 20, 35, + 34, 34, 23, 20, 35, 20, 20, 23, 35, 0, + 38, 31, 35, 20, 23, 34, 21, 35, 0, 23, + 23, 31, 35, 34, 23, 31, 4, 35, 40, 31, + 23, 71, 22, 22, 31, 33, 28, 94, 39, 39, + 125, 22, 169, -1, 128 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -952,51 +961,51 @@ yyreduce: switch (yyn) { case 1: -#line 178 "parse.y" +#line 179 "parse.y" { ; ; break;} case 2: -#line 179 "parse.y" +#line 180 "parse.y" { ; ; break;} case 3: -#line 180 "parse.y" +#line 181 "parse.y" { ; ; break;} case 4: -#line 181 "parse.y" +#line 182 "parse.y" { ; ; break;} case 5: -#line 184 "parse.y" +#line 185 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 6: -#line 188 "parse.y" +#line 189 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 7: -#line 192 "parse.y" +#line 193 "parse.y" { Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 8: -#line 196 "parse.y" +#line 197 "parse.y" { Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); nodes = g_list_append(nodes,node); ; break;} case 9: -#line 202 "parse.y" +#line 203 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1004,49 +1013,49 @@ case 9: ; break;} case 10: -#line 209 "parse.y" +#line 210 "parse.y" { class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); ; break;} case 11: -#line 214 "parse.y" +#line 215 "parse.y" { ; ; break;} case 12: -#line 215 "parse.y" +#line 216 "parse.y" { ; ; break;} case 13: -#line 216 "parse.y" +#line 217 "parse.y" { ; ; break;} case 14: -#line 217 "parse.y" +#line 218 "parse.y" { ; ; break;} case 15: -#line 218 "parse.y" +#line 219 "parse.y" { ; ; break;} case 16: -#line 219 "parse.y" +#line 220 "parse.y" { ; ; break;} case 17: -#line 222 "parse.y" +#line 223 "parse.y" { push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); ; break;} case 18: -#line 225 "parse.y" +#line 226 "parse.y" { push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); ; break;} case 19: -#line 229 "parse.y" +#line 230 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -1078,7 +1087,7 @@ case 19: ; break;} case 20: -#line 258 "parse.y" +#line 259 "parse.y" { if(strcmp(yyvsp[-3].id,"get")==0) { Node *node; @@ -1105,31 +1114,31 @@ case 20: ; break;} case 21: -#line 284 "parse.y" +#line 285 "parse.y" { yyval.list = yyvsp[-1].list; ; break;} case 22: -#line 285 "parse.y" +#line 286 "parse.y" { yyval.list = NULL; ; break;} case 23: -#line 288 "parse.y" +#line 289 "parse.y" { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 24: -#line 291 "parse.y" +#line 292 "parse.y" { yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 25: -#line 297 "parse.y" +#line 298 "parse.y" { ; ; break;} case 26: -#line 298 "parse.y" +#line 299 "parse.y" { Type *type = typestack->data; char *oldname = type->name; @@ -1138,14 +1147,14 @@ case 26: ; break;} case 27: -#line 306 "parse.y" +#line 307 "parse.y" { Node *node = new_type(0,yyvsp[0].id); typestack = g_list_prepend(typestack,node); ; break;} case 28: -#line 310 "parse.y" +#line 311 "parse.y" { Node *node = new_type(stars,yyvsp[-1].id); stars = 0; @@ -1153,200 +1162,245 @@ case 28: ; break;} case 29: -#line 317 "parse.y" +#line 318 "parse.y" { yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); ; break;} case 30: -#line 320 "parse.y" +#line 321 "parse.y" { yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); ; break;} case 31: -#line 323 "parse.y" +#line 324 "parse.y" { yyval.id = g_strdup(yyvsp[0].id); ; break;} case 32: -#line 326 "parse.y" +#line 327 "parse.y" { yyval.id = g_strdup("unsigned char"); ; break;} case 33: -#line 329 "parse.y" +#line 330 "parse.y" { yyval.id = g_strdup("signed char"); ; break;} case 34: -#line 332 "parse.y" +#line 333 "parse.y" { yyval.id = g_strdup("char"); ; break;} case 35: -#line 335 "parse.y" +#line 336 "parse.y" { yyval.id = g_strdup("double"); ; break;} case 36: -#line 338 "parse.y" +#line 339 "parse.y" { yyval.id = g_strdup("float"); ; break;} case 37: -#line 341 "parse.y" +#line 342 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 38: -#line 344 "parse.y" +#line 345 "parse.y" { yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} case 39: -#line 348 "parse.y" +#line 349 "parse.y" { yyval.id = yyvsp[0].id; ; break;} case 40: -#line 351 "parse.y" +#line 352 "parse.y" { yyval.id = g_strdup("void"); ; break;} case 41: -#line 356 "parse.y" +#line 357 "parse.y" { yyval.id = "long int"; ; break;} case 42: -#line 359 "parse.y" +#line 360 "parse.y" { yyval.id = "long"; ; break;} case 43: -#line 362 "parse.y" +#line 363 "parse.y" { yyval.id = "short int"; ; break;} case 44: -#line 365 "parse.y" +#line 366 "parse.y" { yyval.id = "short"; ; break;} case 45: -#line 368 "parse.y" +#line 369 "parse.y" { yyval.id = "int"; ; break;} case 46: -#line 373 "parse.y" +#line 374 "parse.y" { yyval.id = "enum "; ; break;} case 47: -#line 376 "parse.y" +#line 377 "parse.y" { yyval.id = "union "; ; break;} case 48: -#line 379 "parse.y" +#line 380 "parse.y" { yyval.id = "struct "; ; break;} case 49: -#line 384 "parse.y" +#line 385 "parse.y" { stars++; ; break;} case 50: -#line 385 "parse.y" +#line 386 "parse.y" { stars++; ; break;} case 51: -#line 388 "parse.y" +#line 389 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 52: +#line 401 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"first")==0) + yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-2].id,"last")==0) + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-2].id); + YYERROR; + } + g_free(yyvsp[-2].id); + ; + break;} +case 53: +#line 413 "parse.y" +{ + yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + ; + break;} +case 54: +#line 416 "parse.y" +{ + if(strcmp(yyvsp[-1].id,"first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id,"last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 55: +#line 428 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 56: +#line 433 "parse.y" { gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); ; break;} -case 52: -#line 393 "parse.y" +case 57: +#line 438 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 53: -#line 396 "parse.y" +case 58: +#line 441 "parse.y" { gtktypes = g_list_append(gtktypes,yyvsp[0].id); ; break;} -case 54: -#line 401 "parse.y" +case 59: +#line 446 "parse.y" { yyval.cbuf=yyvsp[0].cbuf; ; break;} -case 55: -#line 402 "parse.y" +case 60: +#line 447 "parse.y" { yyval.cbuf = NULL; ; break;} -case 56: -#line 406 "parse.y" +case 61: +#line 451 "parse.y" { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp(yyvsp[-8].id,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-8].id,"last")==0) - sigtype = SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-8].id); - YYERROR; - } - g_free(yyvsp[-8].id); - if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + push_function(yyvsp[-7].sigtype,NULL, + yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, ccode_line,vararg); ; break;} -case 57: -#line 428 "parse.y" +case 62: +#line 461 "parse.y" { if(!has_self) { - yyerror(_("signal without 'self' as " + yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, + push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, ccode_line,vararg); ; break;} -case 58: -#line 438 "parse.y" +case 63: +#line 471 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1358,8 +1412,8 @@ case 58: ccode_line,vararg); ; break;} -case 59: -#line 448 "parse.y" +case 64: +#line 481 "parse.y" { push_function(OVERRIDE_METHOD, yyvsp[-9].id, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, @@ -1367,91 +1421,71 @@ case 59: vararg); ; break;} -case 60: -#line 454 "parse.y" +case 65: +#line 487 "parse.y" { push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, vararg); ; break;} -case 61: -#line 459 "parse.y" +case 66: +#line 492 "parse.y" { push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, vararg); ; break;} -case 62: -#line 464 "parse.y" +case 67: +#line 497 "parse.y" { if(strcmp(yyvsp[-4].id,"init")==0) { push_init_arg(yyvsp[-2].id,FALSE); - push_function(INIT_METHOD, NULL, yyvsp[-4].id, - NULL, NULL,yyvsp[-3].line,0, - FALSE); + push_function(INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, + ccode_line,FALSE); } else if(strcmp(yyvsp[-4].id,"class_init")==0) { push_init_arg(yyvsp[-2].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0, - FALSE); + push_function(CLASS_INIT_METHOD, NULL, + yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, + ccode_line,FALSE); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); + g_string_free(yyvsp[-2].cbuf,TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 63: -#line 482 "parse.y" -{ - if(strcmp(yyvsp[-5].id,"init")==0) { - push_init_arg(yyvsp[-3].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line,FALSE); - } else if(strcmp(yyvsp[-5].id,"class_init")==0) { - push_init_arg(yyvsp[-3].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line,FALSE); - } else { - g_free(yyvsp[-5].id); - g_free(yyvsp[-3].id); - g_string_free(yyvsp[-3].cbuf,TRUE); - yyerror(_("parse error")); - YYERROR; - } - ; - break;} -case 64: -#line 503 "parse.y" +case 68: +#line 518 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 65: -#line 504 "parse.y" +case 69: +#line 519 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} -case 66: -#line 508 "parse.y" +case 70: +#line 523 "parse.y" { ; ; break;} -case 67: -#line 509 "parse.y" +case 71: +#line 524 "parse.y" { yyval.id = NULL; ; break;} -case 68: -#line 512 "parse.y" -{ has_self = FALSE; ; +case 72: +#line 527 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 69: -#line 513 "parse.y" +case 73: +#line 528 "parse.y" { + vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"this")==0) { push_self(yyvsp[0].id); @@ -1467,8 +1501,8 @@ case 69: } ; break;} -case 70: -#line 528 "parse.y" +case 74: +#line 544 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"this")==0) { @@ -1485,34 +1519,34 @@ case 70: } ; break;} -case 71: -#line 543 "parse.y" +case 75: +#line 559 "parse.y" { has_self = FALSE; ; break;} -case 72: -#line 546 "parse.y" +case 76: +#line 562 "parse.y" { vararg = TRUE; ; break;} -case 73: -#line 547 "parse.y" +case 77: +#line 563 "parse.y" { vararg = FALSE; ; break;} -case 74: -#line 550 "parse.y" +case 78: +#line 566 "parse.y" { ; ; break;} -case 75: -#line 551 "parse.y" +case 79: +#line 567 "parse.y" { ; ; break;} -case 76: -#line 554 "parse.y" +case 80: +#line 570 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 77: -#line 557 "parse.y" +case 81: +#line 573 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1522,16 +1556,16 @@ case 77: push_funcarg(yyvsp[-4].id); ; break;} -case 78: -#line 567 "parse.y" +case 82: +#line 583 "parse.y" { ; ; break;} -case 79: -#line 568 "parse.y" +case 83: +#line 584 "parse.y" { ; ; break;} -case 80: -#line 571 "parse.y" +case 84: +#line 587 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1546,61 +1580,61 @@ case 80: g_free(yyvsp[0].id); ; break;} -case 81: -#line 584 "parse.y" +case 85: +#line 600 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 82: -#line 588 "parse.y" +case 86: +#line 604 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 83: -#line 592 "parse.y" +case 87: +#line 608 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 84: -#line 596 "parse.y" +case 88: +#line 612 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 85: -#line 600 "parse.y" +case 89: +#line 616 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 604 "parse.y" +case 90: +#line 620 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 610 "parse.y" +case 91: +#line 626 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 88: -#line 611 "parse.y" +case 92: +#line 627 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 89: -#line 615 "parse.y" +case 93: +#line 631 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1801,5 +1835,5 @@ yyerrhandle: yystate = yyn; goto yynewstate; } -#line 618 "parse.y" +#line 634 "parse.y" diff --git a/src/parse.y b/src/parse.y index 449ef3c..7648232 100644 --- a/src/parse.y +++ b/src/parse.y @@ -162,6 +162,7 @@ push_self(char *id) GString *cbuf; GList *list; int line; + int sigtype; } %token CLASS FROM @@ -384,6 +385,50 @@ tspecifier: ENUM { stars: '*' stars { stars++; } | '*' { stars++; } ; + +fullsigtype: PRIVATE TOKEN sigtype { + if(strcmp($2,"first")==0) + $$ = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp($2,"last")==0) + $$ = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free($2); + YYERROR; + } + g_free($2); + } + | TOKEN PRIVATE sigtype { + if(strcmp($1,"first")==0) + $$ = PRIVATE_SIGNAL_FIRST_METHOD; + else if(strcmp($1,"last")==0) + $$ = PRIVATE_SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free($1); + YYERROR; + } + g_free($1); + } + | PRIVATE sigtype { + $$ = PRIVATE_SIGNAL_LAST_METHOD; + } + | TOKEN sigtype { + if(strcmp($1,"first")==0) + $$ = SIGNAL_FIRST_METHOD; + else if(strcmp($1,"last")==0) + $$ = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free($1); + YYERROR; + } + g_free($1); + } + | sigtype { + $$ = SIGNAL_LAST_METHOD; + } + ; sigtype: TOKEN '(' tokenlist ')' { gtktypes = g_list_prepend(gtktypes,$1); @@ -403,36 +448,24 @@ codenocode: '{' CCODE { $$=$2; } ; /*here CCODE will include the ending '}' */ -method: SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp($2,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp($2,"last")==0) - sigtype = SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free($2); - YYERROR; - } - g_free($2); - +method: SIGNAL fullsigtype type TOKEN '(' funcargs ')' onerror codenocode { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); YYERROR; } - push_function(sigtype,NULL, - $5, $9, $10,$1, + push_function($2,NULL, + $4, $8, $9,$1, ccode_line,vararg); } - | SIGNAL sigtype type TOKEN '(' funcargs ')' onerror codenocode { + | VIRTUAL PRIVATE type TOKEN '(' funcargs ')' onerror codenocode { if(!has_self) { - yyerror(_("signal without 'self' as " + yyerror(_("virtual method without 'self' as " "first parameter")); YYERROR; } - push_function(SIGNAL_LAST_METHOD, NULL, - $4, $8, $9,$1, + push_function(PRIVATE_VIRTUAL_METHOD, NULL, $4, + $8, $9,$1, ccode_line,vararg); } | VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode { @@ -461,35 +494,17 @@ method: SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode { $7, $9,$1,$8, vararg); } - | TOKEN '(' TOKEN ')' ';' { - if(strcmp($1,"init")==0) { - push_init_arg($3,FALSE); - push_function(INIT_METHOD, NULL, $1, - NULL, NULL,$2,0, - FALSE); - } else if(strcmp($1,"class_init")==0) { - push_init_arg($3,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - $1, NULL, NULL,$2,0, - FALSE); - } else { - g_free($1); - g_free($3); - yyerror(_("parse error")); - YYERROR; - } - } - | TOKEN '(' TOKEN ')' '{' CCODE { + | TOKEN '(' TOKEN ')' codenocode { if(strcmp($1,"init")==0) { push_init_arg($3,FALSE); push_function(INIT_METHOD, NULL, - $1, NULL, $6,$2, - $5,FALSE); + $1, NULL, $5,$2, + ccode_line,FALSE); } else if(strcmp($1,"class_init")==0) { push_init_arg($3,TRUE); push_function(CLASS_INIT_METHOD, NULL, - $1, NULL, $6,$2, - $5,FALSE); + $1, NULL, $5,$2, + ccode_line,FALSE); } else { g_free($1); g_free($3); @@ -509,8 +524,9 @@ onerror: ONERROR numtok { $$ = $2; } | { $$ = NULL; } ; -funcargs: VOID { has_self = FALSE; } +funcargs: VOID { vararg = FALSE; has_self = FALSE; } | TOKEN { + vararg = FALSE; has_self = TRUE; if(strcmp($1,"this")==0) { push_self($1); diff --git a/src/test.gob b/src/test.gob index bac330a..1c522a6 100644 --- a/src/test.gob +++ b/src/test.gob @@ -53,6 +53,24 @@ class Gtk:Weird:Button from Gtk:Button { { return 25; } + signal private first NONE (NONE) + void googlegoogle(self) + { + puts("TEST1"); + googlegoogle2(self); + } + signal first private NONE (NONE) + void googlegoogle2(self) + { + puts("TEST2"); + testprivvirtual(self); + } + virtual private + void testprivvirtual(self) + { + puts("TEST3"); + googlegoogle(self); + } } %{ diff --git a/src/tree.h b/src/tree.h index 5df83d9..f6b8caf 100644 --- a/src/tree.h +++ b/src/tree.h @@ -106,8 +106,11 @@ enum { INIT_METHOD, CLASS_INIT_METHOD, VIRTUAL_METHOD, + PRIVATE_VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD, + PRIVATE_SIGNAL_LAST_METHOD, + PRIVATE_SIGNAL_FIRST_METHOD, OVERRIDE_METHOD }; -- 2.43.0