From: George Lebl Date: Wed, 25 Aug 1999 13:58:00 +0000 (-0800) Subject: Release 0.0.4 X-Git-Tag: v0.0.4 X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/commitdiff_plain/f319f19a8ef9c6d076359ed4bbbc42cdecefc0f0 Release 0.0.4 --- diff --git a/ChangeLog b/ChangeLog index aa20937..d3e4713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Tue Aug 24 20:37:26 1999 George Lebl + + * Release 0.0.4 + +Thu Aug 19 03:18:03 1999 George Lebl + + * src/main.c: also count overrides to avoid an unused variable on + class_init + +Thu Aug 19 03:08:49 1999 George Lebl + + * src/parse.y: in a check, we can check not only about nubmers + but for tokens as well + Wed Aug 18 12:54:17 1999 George Lebl * Released 0.0.3 diff --git a/Makefile.in b/Makefile.in index e9e3a40..ef517bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -268,7 +267,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -311,7 +310,7 @@ uninstall: uninstall-recursive all-am: Makefile config.h all-redirect: all-recursive-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: diff --git a/aclocal.m4 b/aclocal.m4 index d19fd10..3a5eda4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -44,8 +44,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] diff --git a/configure b/configure index 098d407..9deca69 100755 --- a/configure +++ b/configure @@ -701,10 +701,9 @@ else fi - PACKAGE=gob -VERSION=0.0.3 +VERSION=0.0.4 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; } @@ -721,7 +720,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:725: checking for working aclocal" >&5 +echo "configure:724: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -734,7 +733,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:738: checking for working autoconf" >&5 +echo "configure:737: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -747,7 +746,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:751: checking for working automake" >&5 +echo "configure:750: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -760,7 +759,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:764: checking for working autoheader" >&5 +echo "configure:763: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -773,7 +772,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:777: checking for working makeinfo" >&5 +echo "configure:776: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -790,7 +789,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:794: checking for $ac_word" >&5 +echo "configure:793: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -820,7 +819,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:824: checking for $ac_word" >&5 +echo "configure:823: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +870,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:875: checking for $ac_word" >&5 +echo "configure:874: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -903,7 +902,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:906: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -914,12 +913,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 918 "configure" +#line 917 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -945,12 +944,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:954: checking whether we are using GNU C" >&5 +echo "configure:953: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -959,7 +958,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -978,7 +977,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:982: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:981: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1010,7 +1009,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1014: checking how to run the C preprocessor" >&5 +echo "configure:1013: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1025,13 +1024,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1042,13 +1041,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1059,13 +1058,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1090,12 +1089,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1094: checking for ANSI C header files" >&5 +echo "configure:1093: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1103,7 +1102,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1120,7 +1119,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1138,7 +1137,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1159,7 +1158,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1170,7 +1169,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1198,7 +1197,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1202: checking for $ac_word" >&5 +echo "configure:1201: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1234,7 +1233,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1238: checking for $ac_word" >&5 +echo "configure:1237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1267,7 +1266,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex"" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1271: checking for $ac_word" >&5 +echo "configure:1270: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1301,7 +1300,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1305: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1304: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1309,7 +1308,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1343,7 +1342,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1347: checking lex output file root" >&5 +echo "configure:1346: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1364,7 +1363,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:1368: checking whether yytext is a pointer" >&5 +echo "configure:1367: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1376,14 +1375,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1416,7 +1415,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1420: checking for a BSD compatible install" >&5 +echo "configure:1419: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1469,7 +1468,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1473: checking how to run the C preprocessor" >&5 +echo "configure:1472: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1484,13 +1483,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1501,13 +1500,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1518,13 +1517,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1551,7 +1550,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1555: checking for $ac_word" >&5 +echo "configure:1554: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1587,7 +1586,7 @@ fi # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1591: checking for $ac_word" >&5 +echo "configure:1590: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1623,7 +1622,7 @@ fi # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1627: checking for $ac_word" >&5 +echo "configure:1626: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1709,7 +1708,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1713: checking for $ac_word" >&5 +echo "configure:1712: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1744,7 +1743,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:1748: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:1747: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -1767,7 +1766,7 @@ echo "configure:1748: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1843,7 +1842,7 @@ main () } EOF -if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1877,7 +1876,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -1887,7 +1886,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -1926,7 +1925,7 @@ rm -f conftest* rm -f conf.glibtest echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6 -echo "configure:1930: checking for poptGetContext in -lpopt" >&5 +echo "configure:1929: checking for poptGetContext in -lpopt" >&5 ac_lib_var=`echo popt'_'poptGetContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1934,7 +1933,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1971,7 +1970,7 @@ fi #AM_PROG_LIBTOOL echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1975: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1974: 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" diff --git a/configure.in b/configure.in index 1ed04d1..8a65fd8 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.0.3) +AM_INIT_AUTOMAKE(gob,0.0.4) dnl Checks for programs. AC_PROG_CC diff --git a/doc/Makefile.in b/doc/Makefile.in index 28dc964..de5f9a1 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -154,7 +153,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -183,7 +182,7 @@ uninstall: uninstall-am all-am: Makefile $(MANS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 diff --git a/doc/gob.1 b/doc/gob.1 index f7502e3..2e1b157 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.0.3" +.TH GOB 1 "GOB 0.0.4" .SH NAME GOB \- The GTK+ Object Builder .SH SYNOPSIS diff --git a/gob.spec b/gob.spec index 24552b3..38eefc9 100644 --- a/gob.spec +++ b/gob.spec @@ -1,4 +1,4 @@ -%define ver 0.0.3 +%define ver 0.0.4 %define rel 1 %define prefix /usr diff --git a/src/Makefile.in b/src/Makefile.in index dd27c6b..09de471 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -145,8 +144,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -225,7 +224,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -260,7 +259,7 @@ uninstall: uninstall-am all-am: Makefile $(PROGRAMS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/src/main.c b/src/main.c index be842c6..e418b4e 100644 --- a/src/main.c +++ b/src/main.c @@ -49,6 +49,7 @@ static char *ptypebase; static int signals = 0; static int arguments = 0; +static int overrides = 0; FILE *out; FILE *outh; @@ -699,12 +700,19 @@ add_inits(Class *c) print_method(out,"static ","\n"," ","",m); 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); + out_printf(out,"{\n"); + if(signals>0 || + arguments>0 || + overrides>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); out_printf(out,"\n\tparent_class = " "gtk_type_class (%s_get_type ());\n", @@ -1003,6 +1011,21 @@ count_arguments(Class *c) 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 @@ -1069,6 +1092,7 @@ generate_outfiles(void) 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", diff --git a/src/parse.c b/src/parse.c index 708486f..eeafa03 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,38 +1,38 @@ /* A Bison parser, made from parse.y - by GNU Bison version 1.27 + by GNU Bison version 1.25 */ #define YYBISON 1 /* Identify Bison output. */ -#define CLASS 257 -#define FROM 258 -#define VOID 259 -#define STRUCT 260 -#define UNION 261 -#define ENUM 262 -#define SIGNED 263 -#define UNSIGNED 264 -#define LONG 265 -#define SHORT 266 -#define INT 267 -#define FLOAT 268 -#define DOUBLE 269 -#define CHAR 270 -#define FIRST 271 -#define LAST 272 -#define ONERROR 273 -#define TOKEN 274 -#define NUMBER 275 -#define TYPETOKEN 276 -#define CCODE 277 -#define HCODE 278 -#define PUBLIC 279 -#define PRIVATE 280 -#define ARGUMENT 281 -#define VIRTUAL 282 -#define SIGNAL 283 -#define OVERRIDE 284 +#define CLASS 258 +#define FROM 259 +#define VOID 260 +#define STRUCT 261 +#define UNION 262 +#define ENUM 263 +#define SIGNED 264 +#define UNSIGNED 265 +#define LONG 266 +#define SHORT 267 +#define INT 268 +#define FLOAT 269 +#define DOUBLE 270 +#define CHAR 271 +#define FIRST 272 +#define LAST 273 +#define ONERROR 274 +#define TOKEN 275 +#define NUMBER 276 +#define TYPETOKEN 277 +#define CCODE 278 +#define HCODE 279 +#define PUBLIC 280 +#define PRIVATE 281 +#define ARGUMENT 282 +#define VIRTUAL 283 +#define SIGNAL 284 +#define OVERRIDE 285 #line 21 "parse.y" @@ -196,7 +196,7 @@ typedef union { #define YYFLAG -32768 #define YYNTBASE 45 -#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 69) +#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 69) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -224,10 +224,10 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30 + 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30 }; #if YYDEBUG != 0 @@ -238,9 +238,9 @@ static const short yyprhs[] = { 0, 105, 108, 110, 112, 114, 116, 119, 121, 123, 126, 128, 131, 133, 135, 137, 139, 141, 144, 146, 151, 155, 157, 169, 180, 191, 201, 211, 220, 233, 243, - 253, 259, 266, 269, 272, 276, 279, 280, 282, 284, - 288, 290, 294, 296, 299, 306, 309, 311, 313, 316, - 319, 323, 327, 331, 335, 337 + 253, 259, 266, 269, 273, 276, 277, 279, 281, 285, + 287, 291, 293, 296, 303, 306, 308, 310, 313, 316, + 320, 324, 328, 332, 334, 337 }; static const short yyrhs[] = { 46, @@ -270,14 +270,14 @@ static const short yyrhs[] = { 46, 23, 0, 25, 54, 20, 34, 63, 35, 62, 31, 23, 0, 26, 54, 20, 34, 63, 35, 62, 31, 23, 0, 20, 34, 20, 35, 33, 0, 20, 34, - 20, 35, 31, 23, 0, 19, 20, 0, 19, 68, - 0, 19, 31, 23, 0, 39, 40, 0, 0, 5, - 0, 20, 0, 20, 38, 64, 0, 64, 0, 64, - 38, 65, 0, 65, 0, 54, 20, 0, 54, 20, - 34, 20, 66, 35, 0, 66, 67, 0, 67, 0, - 20, 0, 41, 68, 0, 42, 68, 0, 41, 39, - 68, 0, 42, 39, 68, 0, 39, 39, 68, 0, - 43, 39, 68, 0, 21, 0, 44, 21, 0 + 20, 35, 31, 23, 0, 19, 68, 0, 19, 31, + 23, 0, 39, 40, 0, 0, 5, 0, 20, 0, + 20, 38, 64, 0, 64, 0, 64, 38, 65, 0, + 65, 0, 54, 20, 0, 54, 20, 34, 20, 66, + 35, 0, 66, 67, 0, 67, 0, 20, 0, 41, + 68, 0, 42, 68, 0, 41, 39, 68, 0, 42, + 39, 68, 0, 39, 39, 68, 0, 43, 39, 68, + 0, 21, 0, 44, 21, 0, 20, 0 }; #endif @@ -290,9 +290,9 @@ static const short yyrline[] = { 0, 314, 317, 320, 323, 326, 329, 333, 336, 341, 344, 347, 350, 353, 358, 361, 364, 369, 370, 373, 378, 381, 387, 408, 428, 437, 446, 450, 454, 458, 462, - 466, 482, 503, 504, 505, 509, 510, 515, 516, 526, - 536, 539, 540, 543, 546, 556, 557, 560, 573, 577, - 581, 585, 589, 593, 599, 600 + 466, 482, 503, 504, 508, 509, 514, 515, 525, 535, + 538, 539, 542, 545, 555, 556, 559, 572, 576, 580, + 584, 588, 592, 598, 599, 603 }; #endif @@ -306,7 +306,7 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'", "'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags", "flaglist","type","type1","integer","tspecifier","stars","sigtype","tokenlist", -"method","onerror","funcargs","arglist","arg","checklist","check","number", NULL +"method","onerror","funcargs","arglist","arg","checklist","check","numtok", NULL }; #endif @@ -317,9 +317,9 @@ static const short yyr1[] = { 0, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 57, 57, 57, 58, 58, 59, 60, 60, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, - 63, 64, 64, 65, 65, 66, 66, 67, 67, 67, - 67, 67, 67, 67, 68, 68 + 61, 61, 62, 62, 62, 62, 63, 63, 63, 63, + 64, 64, 65, 65, 66, 66, 67, 67, 67, 67, + 67, 67, 67, 68, 68, 68 }; static const short yyr2[] = { 0, @@ -329,9 +329,9 @@ static const short yyr2[] = { 0, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, 4, 3, 1, 11, 10, 10, 9, 9, 8, 12, 9, 9, - 5, 6, 2, 2, 3, 2, 0, 1, 1, 3, - 1, 3, 1, 2, 6, 2, 1, 1, 2, 2, - 3, 3, 3, 3, 1, 2 + 5, 6, 2, 3, 2, 0, 1, 1, 3, 1, + 3, 1, 2, 6, 2, 1, 1, 2, 2, 3, + 3, 3, 3, 1, 2, 1 }; static const short yydefact[] = { 0, @@ -344,16 +344,16 @@ static const short yydefact[] = { 0, 27, 39, 41, 0, 48, 26, 36, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 47, 18, 0, 0, 21, 0, 0, 51, 0, 0, - 0, 0, 0, 61, 38, 35, 0, 0, 71, 73, + 0, 0, 0, 61, 38, 35, 0, 0, 70, 72, 0, 23, 0, 0, 49, 0, 0, 0, 0, 62, - 0, 74, 67, 0, 67, 0, 67, 50, 0, 0, - 0, 70, 0, 0, 0, 0, 72, 0, 0, 0, - 0, 67, 0, 0, 63, 85, 0, 0, 64, 66, - 0, 0, 0, 20, 0, 57, 67, 0, 0, 78, - 0, 0, 0, 0, 0, 77, 65, 86, 59, 60, - 0, 56, 0, 0, 55, 67, 0, 0, 79, 0, - 80, 0, 75, 76, 0, 0, 53, 54, 0, 83, - 81, 82, 84, 19, 52, 0, 58, 0, 0, 0 + 0, 73, 66, 0, 66, 0, 66, 50, 0, 0, + 0, 69, 0, 0, 0, 0, 71, 0, 0, 0, + 0, 66, 0, 0, 86, 84, 0, 0, 63, 65, + 0, 0, 0, 20, 0, 57, 66, 0, 0, 77, + 0, 0, 0, 0, 0, 76, 64, 85, 59, 60, + 0, 56, 0, 0, 55, 66, 0, 0, 78, 0, + 79, 0, 74, 75, 0, 0, 53, 54, 0, 82, + 80, 81, 83, 19, 52, 0, 58, 0, 0, 0 }; static const short yydefgoto[] = { 188, @@ -362,88 +362,89 @@ static const short yydefgoto[] = { 188, 155, 156, 139 }; -static const short yypact[] = { 20, - 34,-32768,-32768, 42, 37, -9, 60,-32768,-32768, 37, - 44, 100, 69, 44, 78, 73, 73, 88, 73, 74, - 97, 89,-32768,-32768,-32768,-32768, 120,-32768,-32768,-32768, --32768, 0, 58, 128, 129,-32768,-32768,-32768,-32768,-32768, --32768, 123, 107,-32768, 125, 126, 127, 130, 131, 28, - 73, 132,-32768,-32768,-32768,-32768, 113,-32768,-32768,-32768, --32768,-32768,-32768, 90, 107,-32768,-32768, 103, 116, 114, - 133, 121, 122, 137, 73, 138, 124, 59,-32768, 91, --32768,-32768, 91, 127,-32768, 140, 91,-32768, 14, 141, - 134, 73, 139,-32768, 135, 16, 143, 136, 142,-32768, - 144,-32768, 145, 146,-32768, 147, 148, 91, 149,-32768, - 73, 150, 7, 73, 7, 151, 7,-32768, 91, 152, - 154, 142, 153, -13, 155, 158,-32768, 159, 30, 77, - 156, 7, 91, -3,-32768,-32768, 160, 157,-32768,-32768, - 162, 163, 161,-32768, 170,-32768, 7, 101, 164,-32768, - 165, -7, 3, 166, -14,-32768,-32768,-32768,-32768,-32768, - 171,-32768, 102, 173,-32768, 7, -11, -11,-32768, -11, --32768, -11,-32768,-32768, 167, 174,-32768,-32768, 172,-32768, --32768,-32768,-32768,-32768,-32768, 175,-32768, 177, 201,-32768 +static const short yypact[] = { 33, + 11,-32768,-32768, 44, 51, -19, 18,-32768,-32768, 51, + 79, 52, 61, 79, 4, 85, 85, 70, 85, 9, + 72, 101,-32768,-32768,-32768,-32768, 32,-32768,-32768,-32768, +-32768, 123, 129, 107, 109,-32768,-32768,-32768,-32768,-32768, +-32768, 112, 87,-32768, 128, 130, 131, 132, 133, -10, + 85, 127,-32768,-32768,-32768,-32768, 119,-32768,-32768,-32768, +-32768,-32768,-32768, 104, 87,-32768,-32768, 110, 120, 122, + 135, 124, 125, 140, 85, 141, 134, 27,-32768, 103, +-32768,-32768, 103, 131,-32768, 142, 103,-32768, -12, 143, + 136, 85, 144,-32768, 137, 16, 145, 138, 126,-32768, + 139,-32768, 146, 147,-32768, 148, 149, 103, 151,-32768, + 85, 150, 6, 85, 6, 152, 6,-32768, 103, 153, + 155, 126, 156, -13, 154, 159,-32768, 160, -5, 30, + 157, 6, 103, 23,-32768,-32768, 158, 164,-32768,-32768, + 163, 170, 165,-32768, 172,-32768, 6, 40, 162,-32768, + 161, -7, 0, 166, 7,-32768,-32768,-32768,-32768,-32768, + 175,-32768, 55, 176,-32768, 6, -4, -4,-32768, -4, +-32768, -4,-32768,-32768, 168, 179,-32768,-32768, 173,-32768, +-32768,-32768,-32768,-32768,-32768, 180,-32768, 178, 187,-32768 }; static const short yypgoto[] = {-32768, - 10, 168,-32768,-32768, 180, 184,-32768, 80, -16,-32768, - 106,-32768, 110, 115,-32768, 185, -113, -78, 55, 94, --32768, 54, -95 + 1, 202,-32768,-32768, 185, 186,-32768, 82, -16,-32768, + 114,-32768, 115, 167,-32768, 188, -113, -78, 68, 95, +-32768, 56, -83 }; -#define YYLAST 209 +#define YYLAST 217 static const short yytable[] = { 42, - 46, 128, 49, 130, 101, 150, 135, 136, 104, 136, - 34, 35, 36, 136, 11, 58, 150, 137, 148, 14, - 173, 12, 1, 136, 151, 124, 152, 153, 154, 120, - 138, 168, 138, 163, 76, 151, 138, 152, 153, 154, - 131, 170, 2, 3, 1, 125, 138, 73, 105, 143, - -69, 106, 179, 111, 149, 7, 169, 171, 90, 2, - 3, 74, 144, 13, 8, 9, 8, 9, 34, 35, - 36, 180, 181, 60, 182, 109, 183, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 93, - 26, 94, 40, 50, 41, 95, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 145, 15, 146, - 96, 27, 41, 16, 17, 18, 19, 20, 21, 15, - 53, 47, 79, 80, 16, 17, 18, 19, 20, 21, - 52, 164, 176, 165, 177, 82, 83, 59, 61, 57, - 62, 63, 64, 65, 67, 68, 69, 78, 85, 71, - 72, 84, 86, 77, 87, 74, 88, 91, 92, 103, - 107, 110, 112, 102, 75, 122, 118, 108, 121, -68, - 113, 10, 134, 129, 81, 116, 189, 158, 115, 114, - 117, 119, 157, 123, 159, 160, 132, 133, 141, 142, - 147, 161, 162, 175, 140, 178, 185, 187, 166, 184, - 190, 54, 186, 167, 172, 55, 56, 127, 174 + 46, 128, 49, 130, 101, 11, 135, 136, 104, 73, + 14, 12, 135, 136, 143, 135, 136, 137, 148, 135, + 136, 13, 105, 74, 124, 106, 150, 144, 50, 120, + 138, 168, 7, 163, 76, 1, 138, 27, 170, 138, + 131, 173, 150, 138, 125, 151, 1, 152, 153, 154, + -68, 57, 179, 111, 149, 2, 3, 93, 90, 94, + 145, 151, 146, 152, 153, 154, 8, 9, 169, 171, + 164, 15, 165, 2, 3, 109, 16, 17, 18, 19, + 20, 21, 26, 180, 181, 176, 182, 177, 183, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 8, 9, 47, 40, 52, 41, 95, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 62, + 15, 63, 96, 65, 41, 16, 17, 18, 19, 20, + 21, 64, 53, 34, 35, 36, 79, 80, 58, 34, + 35, 36, 82, 83, 60, 59, 61, 67, 77, 68, + 69, 71, 72, 78, 86, 84, 85, 87, 74, 88, + 91, 103, 107, 114, 112, 102, 110, 118, 92, 108, + 121, -67, 113, 115, 129, 134, 116, 189, 122, 81, + 157, 117, 119, 123, 158, 159, 190, 132, 133, 141, + 142, 147, 160, 140, 162, 161, 166, 175, 178, 167, + 184, 185, 187, 186, 172, 10, 54, 55, 127, 56, + 174, 0, 0, 0, 0, 0, 75 }; static const short yycheck[] = { 16, - 17, 115, 19, 117, 83, 20, 20, 21, 87, 21, - 11, 12, 13, 21, 5, 16, 20, 31, 132, 10, - 35, 31, 3, 21, 39, 19, 41, 42, 43, 108, - 44, 39, 44, 147, 51, 39, 44, 41, 42, 43, - 119, 39, 23, 24, 3, 39, 44, 20, 35, 20, - 35, 38, 166, 38, 133, 22, 152, 153, 75, 23, - 24, 34, 33, 4, 23, 24, 23, 24, 11, 12, - 13, 167, 168, 16, 170, 92, 172, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 31, - 22, 33, 20, 20, 22, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 31, 20, 33, - 20, 34, 22, 25, 26, 27, 28, 29, 30, 20, - 32, 34, 33, 34, 25, 26, 27, 28, 29, 30, - 34, 31, 31, 33, 33, 33, 34, 32, 33, 20, - 13, 13, 20, 37, 20, 20, 20, 35, 35, 20, - 20, 36, 20, 22, 34, 34, 20, 20, 35, 20, - 20, 23, 20, 84, 50, 111, 20, 34, 20, 35, - 35, 4, 20, 23, 65, 31, 0, 21, 35, 38, - 35, 34, 23, 34, 23, 23, 35, 34, 31, 31, - 35, 31, 23, 23, 40, 23, 23, 23, 35, 33, - 0, 22, 31, 39, 39, 22, 22, 114, 155 + 17, 115, 19, 117, 83, 5, 20, 21, 87, 20, + 10, 31, 20, 21, 20, 20, 21, 31, 132, 20, + 21, 4, 35, 34, 19, 38, 20, 33, 20, 108, + 44, 39, 22, 147, 51, 3, 44, 34, 39, 44, + 119, 35, 20, 44, 39, 39, 3, 41, 42, 43, + 35, 20, 166, 38, 133, 23, 24, 31, 75, 33, + 31, 39, 33, 41, 42, 43, 23, 24, 152, 153, + 31, 20, 33, 23, 24, 92, 25, 26, 27, 28, + 29, 30, 22, 167, 168, 31, 170, 33, 172, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 23, 24, 34, 20, 34, 22, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 13, + 20, 13, 20, 37, 22, 25, 26, 27, 28, 29, + 30, 20, 32, 11, 12, 13, 33, 34, 16, 11, + 12, 13, 33, 34, 16, 32, 33, 20, 22, 20, + 20, 20, 20, 35, 20, 36, 35, 34, 34, 20, + 20, 20, 20, 38, 20, 84, 23, 20, 35, 34, + 20, 35, 35, 35, 23, 20, 31, 0, 111, 65, + 23, 35, 34, 34, 21, 23, 0, 35, 34, 31, + 31, 35, 23, 40, 23, 31, 35, 23, 23, 39, + 33, 23, 23, 31, 39, 4, 22, 22, 114, 22, + 155, -1, -1, -1, -1, -1, 50 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" -/* This file comes from bison-1.27. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -460,66 +461,46 @@ static const short yycheck[] = { 16, You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ +#ifndef alloca #ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) #include #else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ +#if defined (MSDOS) && !defined (__TURBOC__) #include -#endif #else /* not MSDOS, or __TURBOC__ */ #if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ +#include #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca +#else /* not MSDOS, __TURBOC__, or _AIX */ +#ifdef __hpux +#ifdef __cplusplus +extern "C" { +void *alloca (unsigned int); +}; +#else /* not __cplusplus */ +void *alloca (); +#endif /* not __cplusplus */ #endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ +#endif /* not sparc. */ +#endif /* not GNU C. */ +#endif /* alloca not defined. */ -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -529,8 +510,8 @@ static const short yycheck[] = { 16, #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab +#define YYACCEPT return(0) +#define YYABORT return(1) #define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the @@ -611,12 +592,12 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +int yyparse (void); +#endif + #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ @@ -628,7 +609,7 @@ static void __yy_memcpy (to, from, count) char *to; char *from; - unsigned int count; + int count; { register char *f = from; register char *t = to; @@ -643,10 +624,10 @@ __yy_memcpy (to, from, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *to, char *from, unsigned int count) +__yy_memcpy (char *to, char *from, int count) { - register char *t = to; register char *f = from; + register char *t = to; register int i = count; while (i-- > 0) @@ -656,7 +637,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif -#line 216 "/usr/lib/bison.simple" +#line 196 "/usr/lib/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -677,15 +658,6 @@ __yy_memcpy (char *to, char *from, unsigned int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -#ifdef YYPARSE_PARAM -int yyparse (void *); -#else -int yyparse (void); -#endif -#endif - int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL @@ -714,7 +686,6 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -799,32 +770,18 @@ yynewstate: if (yystacksize >= YYMAXDEPTH) { yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } return 2; } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); + yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); + yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); #ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); + yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -1468,29 +1425,25 @@ case 63: break;} case 64: #line 504 "parse.y" -{ yyval.id = yyvsp[0].id; ; - break;} -case 65: -#line 505 "parse.y" { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf,FALSE); ; break;} +case 65: +#line 508 "parse.y" +{ ; ; + break;} case 66: #line 509 "parse.y" -{ ; ; +{ yyval.id = NULL; ; break;} case 67: -#line 510 "parse.y" -{ yyval.id = NULL; ; +#line 514 "parse.y" +{ has_this = FALSE; ; break;} case 68: #line 515 "parse.y" -{ has_this = FALSE; ; - break;} -case 69: -#line 516 "parse.y" { has_this = TRUE; if(strcmp(yyvsp[0].id,"this")==0) @@ -1502,8 +1455,8 @@ case 69: } ; break;} -case 70: -#line 526 "parse.y" +case 69: +#line 525 "parse.y" { has_this = TRUE; if(strcmp(yyvsp[-2].id,"this")==0) @@ -1515,26 +1468,26 @@ case 70: } ; break;} -case 71: -#line 536 "parse.y" +case 70: +#line 535 "parse.y" { has_this = FALSE; ; break;} +case 71: +#line 538 "parse.y" +{ ; ; + break;} case 72: #line 539 "parse.y" { ; ; break;} case 73: -#line 540 "parse.y" -{ ; ; - break;} -case 74: -#line 543 "parse.y" +#line 542 "parse.y" { push_funcarg(yyvsp[0].id); ; break;} -case 75: -#line 546 "parse.y" +case 74: +#line 545 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1544,16 +1497,16 @@ case 75: push_funcarg(yyvsp[-4].id); ; break;} +case 75: +#line 555 "parse.y" +{ ; ; + break;} case 76: #line 556 "parse.y" { ; ; break;} case 77: -#line 557 "parse.y" -{ ; ; - break;} -case 78: -#line 560 "parse.y" +#line 559 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1568,62 +1521,66 @@ case 78: g_free(yyvsp[0].id); ; break;} -case 79: -#line 573 "parse.y" +case 78: +#line 572 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 80: -#line 577 "parse.y" +case 79: +#line 576 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 81: -#line 581 "parse.y" +case 80: +#line 580 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 82: -#line 585 "parse.y" +case 81: +#line 584 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 83: -#line 589 "parse.y" +case 82: +#line 588 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 84: -#line 593 "parse.y" +case 83: +#line 592 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 85: -#line 599 "parse.y" +case 84: +#line 598 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 86: -#line 600 "parse.y" +case 85: +#line 599 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} +case 86: +#line 603 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} } /* the action file gets copied in in place of this dollarsign */ -#line 542 "/usr/lib/bison.simple" +#line 498 "/usr/lib/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1818,30 +1775,6 @@ yyerrhandle: yystate = yyn; goto yynewstate; - - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 1; } #line 606 "parse.y" diff --git a/src/parse.y b/src/parse.y index b718cdc..77e5692 100644 --- a/src/parse.y +++ b/src/parse.y @@ -500,8 +500,7 @@ method: SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE { } ; -onerror: ONERROR TOKEN { $$ = $2; } - | ONERROR number { $$ = $2; } +onerror: ONERROR numtok { $$ = $2; } | ONERROR '{' CCODE { $$ = ($3)->str; g_string_free($3,FALSE); @@ -570,37 +569,38 @@ check: TOKEN { } g_free($1); } - | '>' number { + | '>' numtok { Node *node = new_check(GT_CHECK,$2); checks = g_list_append(checks,node); } - | '<' number { + | '<' numtok { Node *node = new_check(LT_CHECK,$2); checks = g_list_append(checks,node); } - | '>' '=' number { + | '>' '=' numtok { Node *node = new_check(GE_CHECK,$3); checks = g_list_append(checks,node); } - | '<' '=' number { + | '<' '=' numtok { Node *node = new_check(LE_CHECK,$3); checks = g_list_append(checks,node); } - | '=' '=' number { + | '=' '=' numtok { Node *node = new_check(EQ_CHECK,$3); checks = g_list_append(checks,node); } - | '!' '=' number { + | '!' '=' numtok { Node *node = new_check(NE_CHECK,$3); checks = g_list_append(checks,node); } ; -number: NUMBER { $$ = $1; } +numtok: NUMBER { $$ = $1; } | '-' NUMBER { $$ = g_strconcat("-",$2,NULL); g_free($2); } + | TOKEN { $$ = $1; } ; %%