From 573256d3bc21896c54c511d5c0e6927f09b4209e Mon Sep 17 00:00:00 2001 From: George Lebl Date: Mon, 19 Jul 2004 18:45:00 -0800 Subject: [PATCH] Release 2.0.9 --- ChangeLog | 24 + Makefile.in | 36 +- NEWS | 4 + aclocal.m4 | 41 +- configure | 42 +- configure.in | 2 +- doc/Makefile.in | 32 +- examples/Makefile.in | 16 +- gob2.spec | 2 +- src/Makefile.am | 4 +- src/Makefile.in | 36 +- src/main.c | 308 ++-- src/parse.c | 3383 +++++++++++++++++++++++------------------- src/parse.h | 204 ++- src/parse.y | 22 +- src/test.gob | 50 +- 16 files changed, 2413 insertions(+), 1793 deletions(-) diff --git a/ChangeLog b/ChangeLog index 454d272..84563a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +Mon Jul 19 09:37:21 2004 George Lebl + + * Release 2.0.9 + +Mon Jul 19 09:30:18 2004 George Lebl + + * src/main.c, src/test.gob, src/Makefile.am, src/parse.y: Fix for + -Wbad-function-cast which is kind of a moronic warning when it + comes to enums so in non-C++ mode just use the generic gint and + guint casts for enums and flags, on the other hand C++ really + requires the proper enum casts, go figure. + + * configure.in, NEWS: prepare for another release + +Thu Jul 08 16:22:56 2004 George Lebl + + * src/main.c: Rework the unused var warning avoidance since it was + causing different warnings. I sort of now assume we're using + gcc if we want no warnings, other compilers will likely get + warnings in places. But they probably got some warnings anyway. + Also fixup all kinds of other places that cause warnings to popup. + + * src/test.gob, src/Makefile.am: Test for all kinds of warnings. + Fri Jun 11 15:16:05 2004 George Lebl * Release 2.0.8 diff --git a/Makefile.in b/Makefile.in index bb11871..019664d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -57,7 +57,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__installdirs = $(DESTDIR)$(m4dir) +am__installdirs = "$(DESTDIR)$(m4dir)" m4DATA_INSTALL = $(INSTALL_DATA) DATA = $(m4_DATA) ETAGS = etags @@ -222,20 +222,20 @@ gob2.spec: $(top_builddir)/config.status $(srcdir)/gob2.spec.in uninstall-info-am: install-m4DATA: $(m4_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(m4dir) + test -z "$(m4dir)" || $(mkdir_p) "$(DESTDIR)$(m4dir)" @list='$(m4_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(m4DATA_INSTALL) $$d$$p $(DESTDIR)$(m4dir)/$$f"; \ - $(m4DATA_INSTALL) $$d$$p $(DESTDIR)$(m4dir)/$$f; \ + echo " $(m4DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4dir)/$$f'"; \ + $(m4DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4dir)/$$f"; \ done uninstall-m4DATA: @$(NORMAL_UNINSTALL) @list='$(m4_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(m4dir)/$$f"; \ - rm -f $(DESTDIR)$(m4dir)/$$f; \ + echo " rm -f '$(DESTDIR)$(m4dir)/$$f'"; \ + rm -f "$(DESTDIR)$(m4dir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -311,14 +311,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -328,9 +330,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -442,7 +446,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -465,7 +469,7 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkdir_p) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ @@ -502,7 +506,9 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(m4dir) + for dir in "$(DESTDIR)$(m4dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff --git a/NEWS b/NEWS index 75ad848..f5af94d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +2.0.9: + * Lots of fixes for gcc warnings, objects should now compile with + very pedantic warnings set. + 2.0.8: * Documentation fixes * Add support for -o and --output-dir diff --git a/aclocal.m4 b/aclocal.m4 index 6984190..15049af 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.8.2 -*- Autoconf -*- +# generated automatically by aclocal 1.8.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -98,7 +98,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.2])]) + [AM_AUTOMAKE_VERSION([1.8.5])]) # AM_AUX_DIR_EXPAND @@ -207,7 +207,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]) fi])]) -# serial 6 -*- Autoconf -*- +# serial 7 -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -294,7 +294,9 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -322,9 +324,14 @@ AC_CACHE_CHECK([dependency style of $depcc], grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -370,7 +377,7 @@ AC_SUBST([AMDEPBACKSLASH]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -409,14 +416,14 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` + U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' + for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop @@ -872,8 +879,16 @@ fi # # Do not use -m 0755 and let people choose whatever they expect by # setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p -- . 2>/dev/null; then +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -886,7 +901,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done diff --git a/configure b/configure index 9f5d3bd..8352cf3 100755 --- a/configure +++ b/configure @@ -1438,7 +1438,7 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p -- . 2>/dev/null; then +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -1451,7 +1451,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done @@ -1561,7 +1561,7 @@ fi # Define the identity of the package. PACKAGE=gob2 - VERSION=2.0.8 + VERSION=2.0.9 cat >>confdefs.h <<_ACEOF @@ -2766,7 +2766,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -2794,9 +2796,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -3724,7 +3731,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -3752,9 +3761,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6399,14 +6413,14 @@ echo X"$mf" | grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` + U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' + for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop diff --git a/configure.in b/configure.in index ab05205..d513a47 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/treefuncs.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gob2,2.0.8) +AM_INIT_AUTOMAKE(gob2,2.0.9) AM_MAINTAINER_MODE GLIB_REQUIRED=2.0.0 diff --git a/doc/Makefile.in b/doc/Makefile.in index 670a051..cfb4c75 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -52,7 +52,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive man1dir = $(mandir)/man1 -am__installdirs = $(DESTDIR)$(man1dir) +am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) ETAGS = etags @@ -184,7 +184,7 @@ gob2.1: $(top_builddir)/config.status $(srcdir)/gob2.1.in uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -203,8 +203,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -224,8 +224,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -301,14 +301,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -318,9 +320,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -389,7 +393,9 @@ check: check-recursive all-am: Makefile $(MANS) installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(man1dir) + for dir in "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff --git a/examples/Makefile.in b/examples/Makefile.in index e60a0f2..0ea5f33 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -254,14 +254,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -271,9 +273,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) diff --git a/gob2.spec b/gob2.spec index 87060e2..2549a2b 100644 --- a/gob2.spec +++ b/gob2.spec @@ -1,4 +1,4 @@ -%define ver 2.0.8 +%define ver 2.0.9 %define rel 1 %define prefix /usr diff --git a/src/Makefile.am b/src/Makefile.am index d69c879..74e60a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,7 +58,7 @@ EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def # test -f y.tab.h && mv -f y.tab.h parse.h test: test-object.c test-object.h - $(CC) -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c + $(CC) -g -O -W -Wall -Wunused -Wuninitialized -Wdeclaration-after-statement -Wshadow -Wwrite-strings -Wunreachable-code -Wbad-function-cast -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c test-object.c test-object.h: test.gob gob2 ./gob2 test.gob @@ -66,7 +66,7 @@ test-object.c test-object.h: test.gob gob2 # can't depend on the header file as that would break the above rule # since it's just for testing, who cares testcpp: test-object.cc - g++ -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc + g++ -g -O -W -Wall -Wunused -Wuninitialized -Wwrite-strings -Wunreachable-code -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc test-object.cc: test.gob gob2 ./gob2 --for-cpp test.gob diff --git a/src/Makefile.in b/src/Makefile.in index a22cf0b..72bc515 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -49,7 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = $(DESTDIR)$(bindir) +am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_gob2_OBJECTS = main.$(OBJEXT) treefuncs.$(OBJEXT) out.$(OBJEXT) \ @@ -250,14 +250,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -265,8 +265,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: @@ -412,14 +412,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -429,9 +431,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -501,7 +505,9 @@ check: $(BUILT_SOURCES) all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(bindir) + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive @@ -605,7 +611,7 @@ uninstall-info: uninstall-info-recursive # test -f y.tab.h && mv -f y.tab.h parse.h test: test-object.c test-object.h - $(CC) -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c + $(CC) -g -O -W -Wall -Wunused -Wuninitialized -Wdeclaration-after-statement -Wshadow -Wwrite-strings -Wunreachable-code -Wbad-function-cast -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c test-object.c test-object.h: test.gob gob2 ./gob2 test.gob @@ -613,7 +619,7 @@ test-object.c test-object.h: test.gob gob2 # can't depend on the header file as that would break the above rule # since it's just for testing, who cares testcpp: test-object.cc - g++ -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc + g++ -g -O -W -Wall -Wunused -Wuninitialized -Wwrite-strings -Wunreachable-code -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc test-object.cc: test.gob gob2 ./gob2 --for-cpp test.gob diff --git a/src/main.c b/src/main.c index c94c805..dfd87d0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,9 +1,9 @@ /* GOB C Preprocessor * Copyright (C) 1999,2000 the Free Software Foundation. * Copyright (C) 2000 Eazel, Inc. - * Copyright (C) 2001-2004 George Lebl + * Copyright (C) 2001-2004 George (Jiri) Lebl * - * Author: George Lebl + * Author: George (Jiri) Lebl * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -193,7 +193,9 @@ print_method (FILE *fp, const Method *m, gboolean one_arg_per_line, gboolean no_funcbase, - gboolean kill_underscore) + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) { GList *li; const char *id; @@ -214,16 +216,29 @@ print_method (FILE *fp, if(m->args) { for(li=m->args; li; li=g_list_next(li)) { FuncArg *arg = li->data; + const char *unused = ""; + + if ( ! no_gnu && + ! for_cpp && /* g++ has a cow with this */ + li == m->args && + first_unused) { + unused = " G_GNUC_UNUSED"; + } + print_type(fp, arg->atype, FALSE); + if (fake_names) + out_printf (fp, "___fake___"); if(li->next) - out_printf(fp, "%s%s,%s", arg->name, + out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", + unused, one_arg_per_line ? "\n\t\t\t\t\t" : " "); else - out_printf(fp, "%s%s", arg->name, + out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? - arg->atype->postfix : ""); + arg->atype->postfix : "", + unused); } if(m->vararg) out_printf(fp, ",%s...", @@ -256,9 +271,8 @@ any_method_to_alias(Class *c) } -/* just the vararg macros, we use the same func pointers for these as in non-gnu */ static void -make_method_gnu_aliases(Class *c) +make_method_aliases (Class *c) { GList *li; @@ -272,53 +286,14 @@ make_method_gnu_aliases(Class *c) m->method == OVERRIDE_METHOD) continue; - if(m->args != NULL) - out_printf(out, "#define self_%s(args...) " - "%s_%s(args)\n", m->id, - funcbase, m->id); - else - out_printf(out, "#define self_%s() " - "%s_%s()\n", m->id, - funcbase, m->id); + out_printf (out, "#define self_%s %s_%s\n", + m->id, + funcbase, + m->id); } } } -static void -make_method_nongnu_aliases(Class *c) -{ - GList *li; - - gboolean local_made_aliases = FALSE; - - for(li=c->nodes; li; li=g_list_next(li)) { - Node *node = li->data; - if(node->type == METHOD_NODE) { - Method *m = (Method *)node; - - if(m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD || - m->method == OVERRIDE_METHOD) - continue; - - if( ! local_made_aliases) - out_printf(out, "\n/* Short form pointers */\n"); - - print_method(out, "static ", "(* const self_", "", ") ", - "", "", - m, FALSE, TRUE, FALSE); - out_printf(out, " = %s_%s;\n", funcbase, - m->id); - - local_made_aliases = TRUE; - } - } - if(local_made_aliases) { - out_printf(out, "\n"); - made_aliases = TRUE; - } -} - static void add_bad_hack_to_avoid_unused_warnings(const Class *c) { @@ -389,10 +364,10 @@ put_vs_method(const Method *m) /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE); + m, FALSE, TRUE, TRUE, FALSE, FALSE); else print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE); + m, FALSE, TRUE, TRUE, FALSE, FALSE); } static void @@ -401,7 +376,8 @@ put_pub_method(const Method *m) if(m->scope != PUBLIC_SCOPE) return; - print_method(outh, "", "\t", "", "\t", "", ";\n", m, TRUE, FALSE, TRUE); + print_method(outh, "", "\t", "", "\t", "", ";\n", m, + TRUE, FALSE, TRUE, FALSE, FALSE); } static void @@ -434,35 +410,35 @@ put_signal_macro (const Method *m, gboolean gnu) /* connect */ out_printf (outh, "#define %s_connect__%s(object,func,data)\t" "g_signal_connect(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ out_printf (outh, "#define %s_connect_after__%s(object,func,data)\t" "g_signal_connect_after(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ out_printf (outh, "#define %s_connect_data__%s" "(object,func,data,destroy_data,flags)\t" "g_signal_connect_data(" - "%s(({%s *___object = (object); ___object; }))," + "%s(__extension__ ({%s *___object = (object); ___object; }))," "\"%s\"," - "(GCallback)({", + "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE); + " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -529,10 +505,10 @@ put_prot_method(const Method *m) if(outph) print_method(outph, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else print_method(out, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } static void @@ -544,7 +520,7 @@ put_priv_method_prot(const Method *m) if(m->cbuf) print_method(out, "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -555,14 +531,14 @@ put_priv_method_prot(const Method *m) char *s = g_strdup_printf("___%x_", (guint)m->unique_id); print_method(out, "static ", s, "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD) { print_method(out, "static ", "", "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -783,6 +759,11 @@ add_signal_prots(Method *m) gboolean ret_none = FALSE; gboolean arglist_none = FALSE; const char *retcast; + const char *unused = ""; + + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } if (m->method != SIGNAL_LAST_METHOD && m->method != SIGNAL_FIRST_METHOD) @@ -829,12 +810,15 @@ add_signal_prots(Method *m) out_printf (out, "\nstatic void\n" "___marshal_%s (GClosure *closure,\n" - "\tGValue *return_value,\n" + "\tGValue *return_value%s,\n" "\tguint n_param_values,\n" "\tconst GValue *param_values,\n" - "\tgpointer invocation_hint,\n" + "\tgpointer invocation_hint%s,\n" "\tgpointer marshal_data)\n" - "{\n", s); + "{\n", + s, + unused, + unused); if ( ! ret_none) out_printf (out, "\t%s v_return;\n", retcast); @@ -892,6 +876,12 @@ add_signal_prots(Method *m) g_free (set_func); } + if (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */) { + if (ret_none) + out_printf (out, "\n\treturn_value = NULL;\n"); + out_printf (out, "\tinvocation_hint = NULL;\n"); + + } out_printf (out, "}\n\n"); } @@ -1080,6 +1070,7 @@ add_get_type(void) "\t\t\tsizeof (%s),\n" "\t\t\t0 /* n_preallocs */,\n" "\t\t\t(GInstanceInitFunc) %s_init,\n" + "\t\t\tNULL\n" "\t\t};\n\n", funcbase, typebase, funcbase, typebase, funcbase); @@ -1323,18 +1314,15 @@ add_signals(Class *c) if(strcmp(m->gtktypes->data, "NONE") != 0 || ! is_none) { GList *gl, *al; - const char *sep = ""; out_printf(out, "\tif ___GOB_UNLIKELY("); if(strcmp(m->gtktypes->data, "NONE") != 0) { - out_printf(out, "%s sizeof(", sep); + out_printf(out, "sizeof("); print_type(out, m->mtype, FALSE); out_printf(out, "%s", m->mtype->postfix ? m->mtype->postfix : ""); - out_printf(out, ") != sizeof(%s)", + out_printf(out, ") != sizeof(%s) || ", get_cast(m->gtktypes->data, FALSE)); - - sep = " || "; } for(al = m->args->next, gl = m->gtktypes->next; @@ -1343,16 +1331,18 @@ add_signals(Class *c) FuncArg *arg = al->data; char *gtkarg = gl->data; - out_printf(out, "%ssizeof(", sep); + out_printf(out, "sizeof("); print_type(out, arg->atype, FALSE); out_printf(out, "%s", arg->atype->postfix ? arg->atype->postfix : ""); - out_printf(out, ") != sizeof(%s)", + out_printf(out, ") != sizeof(%s) || ", get_cast(gtkarg, FALSE)); - - sep = " || "; } + + out_printf (out, + "parent_class == NULL /* avoid warning */"); + out_printf(out, ") {\n" "\t\tg_error(\"%s line %d: Type mismatch " "of \\\"%s\\\" signal signature\");\n" @@ -2058,8 +2048,10 @@ add_dispose (Class *c) c->otype); if (unreftors > 0) { - out_printf (out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); + out_printf (out, "\t%s *self%s = %s (obj_self);\n", + typebase, + ! no_gnu ? " G_GNUC_UNUSED" : "", + macrobase); } if (dispose_handler != NULL) { @@ -2090,9 +2082,6 @@ add_dispose (Class *c) } } - out_printf (out, "\treturn;\n"); - if (unreftors > 0) - out_printf(out, "\tself = NULL;\n"); out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); } @@ -2110,8 +2099,11 @@ add_finalize (Class *c) if (privates > 0 || destructors > 0) { - out_printf(out, "\t%s *self = %s (obj_self);\n", - typebase, macrobase); + const char *unused = ""; + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + out_printf(out, "\t%s *self %s = %s (obj_self);\n", + typebase, unused, macrobase); } if (privates > 0) { out_printf(out, "\tgpointer priv = self->_priv;\n"); @@ -2148,10 +2140,6 @@ add_finalize (Class *c) if (privates > 0) { out_printf(out, "\tg_free (priv);\n"); } - out_printf (out, "\treturn;\n"); - if (destructors > 0 || - privates > 0) - out_printf (out, "\tself = NULL;\n"); out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n\n"); @@ -2190,13 +2178,16 @@ make_bonobo_object_epv (Class *c, const char *classname) static void add_inits(Class *c) { + const char *unused = ""; GList *li; + + if ( ! no_gnu) + unused = " G_GNUC_UNUSED"; + for(li=c->nodes;li;li=g_list_next(li)) { Node *n = li->data; Method *m; - gboolean add_unused_class = FALSE; - if(n->type != METHOD_NODE) continue; m = (Method *)n; @@ -2204,7 +2195,7 @@ add_inits(Class *c) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); if(m->line_no > 0) out_addline_outfile(out); out_printf(out, "{\n" @@ -2238,7 +2229,7 @@ add_inits(Class *c) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); if(m->line_no > 0) out_addline_outfile(out); out_printf(out, "{\n" @@ -2251,10 +2242,10 @@ add_inits(Class *c) need_finalize) { out_printf(out, "\tGObjectClass *" - "g_object_class = " + "g_object_class%s = " "(GObjectClass*) %s;\n", + unused, ((FuncArg *)m->args->data)->name); - add_unused_class = TRUE; did_base_obj = TRUE; } @@ -2312,13 +2303,6 @@ add_inits(Class *c) out_addline_outfile(out); out_printf(out, " }\n"); } - out_printf(out, "\treturn;\n"); - out_printf(out, - "\t%s = NULL;\n", - ((FuncArg *)m->args->data)->name); - if(add_unused_class) { - out_printf (out, "\tg_object_class = NULL;\n"); - } out_printf(out, "}\n" "#undef __GOB_FUNCTION__\n"); } @@ -2356,14 +2340,25 @@ add_argument (Argument *a, gboolean is_set) if (is_set) { char *cast; + const char *unused = ""; - if (a->atype != NULL) + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } + + if (a->atype != NULL && + /* gcc -Wbad-function-cast is wanking stupid, moronic + and otherwise evil so we should just use a (gint) + or (guint) cast, not the specific type cast */ + (for_cpp || + (strcmp (a->gtktype, "ENUM") != 0 && + strcmp (a->gtktype, "FLAGS") != 0))) cast = get_type (a->atype, TRUE); else cast = g_strdup (get_cast (a->gtktype, FALSE)); - out_printf (out, "\t%s ARG = (%s) g_value_get_%s (VAL);\n", - cast, cast, the_type_lower); + out_printf (out, "\t%s ARG%s = (%s) g_value_get_%s (VAL);\n", + cast, unused, cast, the_type_lower); g_free (cast); } else if ( ! is_set) { @@ -2398,8 +2393,9 @@ add_argument (Argument *a, gboolean is_set) } g_free (the_type_lower); - if (is_set) { - out_printf (out, "\t\tif (&ARG) ;\n"); + if (is_set && + (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */)) { + out_printf (out, "\t\tif (&ARG) break;\n"); } out_printf (out, "\t\tbreak;\n"); @@ -2450,20 +2446,34 @@ static void add_getset_arg(Class *c, gboolean is_set) { GList *li; + const char *unused = ""; + const char *hack_unused = ""; + + if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) { + unused = " G_GNUC_UNUSED"; + } else { + hack_unused = "if (&VAL || &pspec) break;\n\t\t"; + } + out_printf(out, "\nstatic void\n" "___object_%s_property (GObject *object,\n" "\tguint property_id,\n" - "\t%sGValue *VAL,\n" - "\tGParamSpec *pspec)\n" + "\t%sGValue *VAL%s,\n" + "\tGParamSpec *pspec%s)\n" "#define __GOB_FUNCTION__ \"%s::%s_property\"\n" "{\n" - "\t%s *self;\n\n" + "\t%s *self%s;\n\n" "\tself = %s (object);\n\n" "\tswitch (property_id) {\n", is_set ? "set" : "get", is_set ? "const " : "", - c->otype, is_set ? "set" : "get", - typebase, macrobase); + unused, + unused, + c->otype, + is_set ? "set" : "get", + typebase, + unused, + macrobase); for (li = c->nodes; li != NULL; li = li->next) { Node *n = li->data; @@ -2479,9 +2489,9 @@ add_getset_arg(Class *c, gboolean is_set) "# define G_STRLOC __FILE__ \":\" G_STRINGIFY (__LINE__)\n" "#endif\n" "\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n" - "\t\tbreak;\n\t}\n" - "\treturn;\n\tself = NULL;\n\tVAL = NULL;\n\tpspec = NULL;\n}\n" - "#undef __GOB_FUNCTION__\n"); + "\t\t%sbreak;\n\t}\n" + "}\n" + "#undef __GOB_FUNCTION__\n", hack_unused); } static void @@ -2563,7 +2573,7 @@ print_preconditions(Method *m) } static void -print_method_body(Method *m, int pre) +print_method_body (Method *m, gboolean pre, gboolean unused_self) { if (m->line_no > 0) out_addline_outfile(out); @@ -2571,9 +2581,18 @@ print_method_body(Method *m, int pre) "#define __GOB_FUNCTION__ \"%s::%s\"\n", ((Class *)class)->otype, m->id); - if(pre) + if (pre) print_preconditions(m); + if ( ! pre && + unused_self && + (no_gnu || for_cpp) && + m->args != NULL && + ((FuncArg *)(m->args->data))->name != NULL && + strcmp (((FuncArg *)(m->args->data))->name, "self") == 0) { + out_printf (out, "\tif (&self) { ; }\n"); + } + /* Note: the trailing }'s are on one line, this is so that we get the no return warning correctly and point to the correct line in the .gob file, yes this is slightly @@ -2701,11 +2720,11 @@ put_method(Method *m) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); - print_method_body(m, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; case SIGNAL_FIRST_METHOD: @@ -2714,17 +2733,21 @@ put_method(Method *m) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); out_addline_outfile (out); out_printf (out, "{\n"); out_printf (out, "\tGValue ___param_values[%d];\n" - "\tGValue ___return_val = {0};\n\n", + "\tGValue ___return_val;\n\n" + "memset (&___return_val, 0, " + "sizeof (___return_val));\n" + "memset (&___param_values, 0, " + "sizeof (___param_values));\n\n", g_list_length (m->args)); print_preconditions (m); @@ -2832,8 +2855,8 @@ put_method(Method *m) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); - print_method_body(m, FALSE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case VIRTUAL_METHOD: @@ -2841,10 +2864,10 @@ put_method(Method *m) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); + m, FALSE, FALSE, TRUE, FALSE, FALSE); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -2890,8 +2913,8 @@ put_method(Method *m) if(m->line_no > 0) out_addline_infile(out, m->line_no); print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE); - print_method_body(m, FALSE); + m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; case OVERRIDE_METHOD: @@ -2901,7 +2924,7 @@ put_method(Method *m) out_addline_infile(out, m->line_no); s = g_strdup_printf("\n___%x_", (guint)m->unique_id); print_method(out, "static ", s, "", " ", "", "\n", - m, FALSE, FALSE, FALSE); + m, FALSE, FALSE, FALSE, TRUE, FALSE); g_free(s); out_addline_outfile(out); s = replace_sep(m->otype, '_'); @@ -2925,7 +2948,7 @@ put_method(Method *m) } g_free(args); g_free(s); - print_method_body(m, TRUE); + print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; @@ -3097,11 +3120,11 @@ put_argument_gnu_wrappers(Class *c) if (cast != NULL) { if (set) out_printf (outh, "#define %s_PROP_%s(arg) \t" - "\"%s\",({%sz = (arg); z;})\n", + "\"%s\", __extension__ ({%sz = (arg); z;})\n", macrobase, aname, name, cast); if (get) out_printf (outh, "#define %s_GET_PROP_%s(arg)\t" - "\"%s\",({%s*z = (arg); z;})\n", + "\"%s\", __extension__ ({%s*z = (arg); z;})\n", macrobase, aname, name, cast); } else { if (set) @@ -3424,13 +3447,8 @@ print_class_block(Class *c) add_enums (c); if(any_method_to_alias(c)) { - if( ! no_gnu) { - out_printf(out, "/* Short form macros */\n"); - out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n"); - make_method_gnu_aliases(c); - out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n"); - } - make_method_nongnu_aliases(c); + out_printf (out, "/* Short form macros */\n"); + make_method_aliases (c); } add_interface_inits (c); @@ -3690,7 +3708,7 @@ print_enum (EnumDef *enode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", enode->prefix, value->name, enode->prefix, value->name, sname); @@ -3755,7 +3773,7 @@ print_flags (Flags *fnode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", fnode->prefix, name, fnode->prefix, name, sname); @@ -3818,7 +3836,7 @@ print_error (Error *enode) else out_printf (outh, "\n"); - out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n", + out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n", enode->prefix, name, enode->prefix, name, sname); diff --git a/src/parse.c b/src/parse.c index 79e5761..c9e2c5c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,60 +1,166 @@ -/* A Bison parser, made from parse.y - by GNU bison 1.35. */ - -#define YYBISON 1 /* Identify Bison output. */ - -# define CLASS 257 -# define FROM 258 -# define CONST 259 -# define VOID 260 -# define STRUCT 261 -# define UNION 262 -# define ENUM 263 -# define THREEDOTS 264 -# define SIGNED 265 -# define UNSIGNED 266 -# define LONG 267 -# define SHORT 268 -# define INT 269 -# define FLOAT 270 -# define DOUBLE 271 -# define CHAR 272 -# define TOKEN 273 -# define NUMBER 274 -# define TYPETOKEN 275 -# define ARRAY_DIM 276 -# define SINGLE_CHAR 277 -# define CCODE 278 -# define HTCODE 279 -# define PHCODE 280 -# define HCODE 281 -# define ACODE 282 -# define ATCODE 283 -# define STRING 284 -# define PUBLIC 285 -# define PRIVATE 286 -# define PROTECTED 287 -# define CLASSWIDE 288 -# define PROPERTY 289 -# define ARGUMENT 290 -# define VIRTUAL 291 -# define SIGNAL 292 -# define OVERRIDE 293 -# define NICK 294 -# define BLURB 295 -# define MAXIMUM 296 -# define MINIMUM 297 -# define DEFAULT_VALUE 298 -# define ERROR 299 -# define FLAGS 300 -# define TYPE 301 -# define FLAGS_TYPE 302 -# define ENUM_TYPE 303 -# define PARAM_TYPE 304 -# define BOXED_TYPE 305 -# define OBJECT_TYPE 306 - -#line 22 "parse.y" +/* A Bison parser, made by GNU Bison 1.875c. */ + +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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. */ + +/* 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. */ + +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + CLASS = 258, + FROM = 259, + CONST = 260, + VOID = 261, + STRUCT = 262, + UNION = 263, + ENUM = 264, + THREEDOTS = 265, + SIGNED = 266, + UNSIGNED = 267, + LONG = 268, + SHORT = 269, + INT = 270, + FLOAT = 271, + DOUBLE = 272, + CHAR = 273, + TOKEN = 274, + NUMBER = 275, + TYPETOKEN = 276, + ARRAY_DIM = 277, + SINGLE_CHAR = 278, + CCODE = 279, + HTCODE = 280, + PHCODE = 281, + HCODE = 282, + ACODE = 283, + ATCODE = 284, + STRING = 285, + PUBLIC = 286, + PRIVATE = 287, + PROTECTED = 288, + CLASSWIDE = 289, + PROPERTY = 290, + ARGUMENT = 291, + VIRTUAL = 292, + SIGNAL = 293, + OVERRIDE = 294, + NICK = 295, + BLURB = 296, + MAXIMUM = 297, + MINIMUM = 298, + DEFAULT_VALUE = 299, + ERROR = 300, + FLAGS = 301, + TYPE = 302, + FLAGS_TYPE = 303, + ENUM_TYPE = 304, + PARAM_TYPE = 305, + BOXED_TYPE = 306, + OBJECT_TYPE = 307 + }; +#endif +#define CLASS 258 +#define FROM 259 +#define CONST 260 +#define VOID 261 +#define STRUCT 262 +#define UNION 263 +#define ENUM 264 +#define THREEDOTS 265 +#define SIGNED 266 +#define UNSIGNED 267 +#define LONG 268 +#define SHORT 269 +#define INT 270 +#define FLOAT 271 +#define DOUBLE 272 +#define CHAR 273 +#define TOKEN 274 +#define NUMBER 275 +#define TYPETOKEN 276 +#define ARRAY_DIM 277 +#define SINGLE_CHAR 278 +#define CCODE 279 +#define HTCODE 280 +#define PHCODE 281 +#define HCODE 282 +#define ACODE 283 +#define ATCODE 284 +#define STRING 285 +#define PUBLIC 286 +#define PRIVATE 287 +#define PROTECTED 288 +#define CLASSWIDE 289 +#define PROPERTY 290 +#define ARGUMENT 291 +#define VIRTUAL 292 +#define SIGNAL 293 +#define OVERRIDE 294 +#define NICK 295 +#define BLURB 296 +#define MAXIMUM 297 +#define MINIMUM 298 +#define DEFAULT_VALUE 299 +#define ERROR 300 +#define FLAGS 301 +#define TYPE 302 +#define FLAGS_TYPE 303 +#define ENUM_TYPE 304 +#define PARAM_TYPE 305 +#define BOXED_TYPE 306 +#define OBJECT_TYPE 307 + + + + +/* Copy the first part of user declarations. */ +#line 23 "parse.y" #include "config.h" @@ -113,6 +219,7 @@ int yylex(void); extern int ccode_line; extern int line_no; +extern gboolean for_cpp; extern char *yytext; @@ -587,14 +694,16 @@ property_link_and_export (Node *node) get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype); g_strdown (get_func); - if (strcmp (prop->gtktype, "FLAGS") == 0) { - setcast = "(guint) "; - getcast = to_free = - get_prop_enum_flag_cast (prop); - } else if (strcmp (prop->gtktype, "ENUM") == 0) { - setcast = "(gint) "; - getcast = to_free = - get_prop_enum_flag_cast (prop); + if (for_cpp) { + if (strcmp (prop->gtktype, "FLAGS") == 0) { + setcast = "(guint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } else if (strcmp (prop->gtktype, "ENUM") == 0) { + setcast = "(gint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } } set = g_strdup_printf("%s->%s = %s%s (VAL);", @@ -651,33 +760,168 @@ ensure_property (void) } -#line 619 "parse.y" -#ifndef YYSTYPE -typedef union { + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#line 623 "parse.y" +typedef union YYSTYPE { char *id; GString *cbuf; GList *list; int line; int sigtype; -} yystype; -# define YYSTYPE yystype +} YYSTYPE; +/* Line 191 of yacc.c. */ +#line 788 "parse.c" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -#ifndef YYDEBUG -# define YYDEBUG 1 + + + +/* Copy the second part of user declarations. */ + + +/* Line 214 of yacc.c. */ +#line 800 "parse.c" + +#if ! defined (yyoverflow) || YYERROR_VERBOSE + +# ifndef YYFREE +# define YYFREE free +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# endif + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif +# else +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# else +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# endif +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ + + +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + short yyss; + YYSTYPE yyvs; + }; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined (__GNUC__) && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + register YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (0) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + #endif +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short yysigned_char; +#endif +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 23 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 572 -#define YYFINAL 398 -#define YYFLAG -32768 -#define YYNTBASE 66 +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 66 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 53 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 189 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 398 -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 306 ? yytranslate[x] : 118) +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 307 -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ -static const char yytranslate[] = +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -704,597 +948,522 @@ static const char yytranslate[] = 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, 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, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52 + 2, 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, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52 }; #if YYDEBUG -static const short yyprhs[] = -{ - 0, 0, 4, 7, 10, 12, 14, 16, 18, 20, - 22, 24, 27, 30, 33, 36, 38, 40, 42, 44, - 49, 53, 59, 60, 66, 72, 78, 81, 83, 85, - 88, 92, 94, 96, 98, 100, 102, 104, 106, 108, - 111, 115, 118, 122, 125, 128, 130, 132, 133, 139, - 146, 159, 169, 176, 180, 181, 193, 202, 208, 212, - 213, 217, 219, 221, 226, 228, 230, 234, 238, 242, - 246, 250, 254, 258, 262, 266, 270, 274, 278, 282, - 286, 290, 294, 298, 300, 306, 308, 312, 313, 317, - 319, 322, 324, 326, 328, 331, 334, 337, 341, 345, - 348, 351, 354, 356, 359, 361, 364, 366, 368, 370, - 372, 374, 376, 378, 380, 382, 384, 386, 388, 390, - 393, 396, 400, 403, 405, 409, 413, 416, 418, 423, - 427, 429, 432, 434, 445, 457, 467, 477, 486, 498, - 507, 513, 516, 521, 522, 524, 527, 529, 531, 534, - 537, 541, 546, 551, 553, 557, 559, 563, 565, 568, - 572, 579, 587, 590, 592, 594, 597, 600, 604, 608, - 612, 616, 624, 633, 637, 639, 643, 645, 653, 662, - 666, 668, 676, 685, 689, 691, 693, 696, 698 -}; -static const short yyrhs[] = -{ - 68, 69, 68, 0, 69, 68, 0, 68, 69, 0, - 69, 0, 24, 0, 27, 0, 25, 0, 26, 0, - 28, 0, 29, 0, 68, 67, 0, 68, 110, 0, - 68, 113, 0, 68, 115, 0, 67, 0, 110, 0, - 113, 0, 115, 0, 70, 53, 72, 54, 0, 70, - 53, 54, 0, 3, 21, 4, 21, 71, 0, 0, - 55, 19, 19, 56, 71, 0, 55, 19, 21, 56, - 71, 0, 55, 19, 20, 56, 71, 0, 72, 73, - 0, 73, 0, 101, 0, 19, 101, 0, 19, 21, - 101, 0, 78, 0, 79, 0, 81, 0, 57, 0, - 31, 0, 32, 0, 33, 0, 34, 0, 19, 19, - 0, 19, 53, 24, 0, 58, 117, 0, 58, 53, - 24, 0, 75, 76, 0, 76, 75, 0, 76, 0, - 75, 0, 0, 74, 90, 19, 77, 57, 0, 74, - 90, 19, 22, 77, 57, 0, 36, 88, 87, 19, - 80, 19, 53, 24, 19, 53, 24, 57, 0, 36, - 88, 87, 19, 80, 19, 53, 24, 57, 0, 36, - 88, 87, 19, 80, 19, 0, 55, 19, 56, 0, - 0, 35, 19, 19, 82, 19, 53, 24, 19, 53, - 24, 57, 0, 35, 19, 19, 82, 19, 53, 24, - 57, 0, 35, 19, 19, 82, 57, 0, 55, 83, - 56, 0, 0, 83, 59, 86, 0, 86, 0, 30, - 0, 19, 55, 30, 56, 0, 117, 0, 84, 0, - 40, 58, 84, 0, 41, 58, 84, 0, 42, 58, - 117, 0, 43, 58, 117, 0, 44, 58, 85, 0, - 46, 58, 89, 0, 47, 58, 90, 0, 48, 58, - 21, 0, 48, 58, 19, 0, 49, 58, 21, 0, - 49, 58, 19, 0, 50, 58, 21, 0, 50, 58, - 19, 0, 51, 58, 21, 0, 51, 58, 19, 0, - 52, 58, 21, 0, 52, 58, 19, 0, 19, 0, - 19, 55, 19, 90, 56, 0, 19, 0, 55, 89, - 56, 0, 0, 19, 60, 89, 0, 19, 0, 91, - 95, 0, 91, 0, 92, 0, 19, 0, 5, 19, - 0, 19, 5, 0, 94, 19, 0, 5, 94, 19, - 0, 94, 19, 5, 0, 93, 92, 0, 21, 92, - 0, 5, 92, 0, 21, 0, 21, 5, 0, 93, - 0, 93, 5, 0, 6, 0, 18, 0, 14, 0, - 15, 0, 13, 0, 16, 0, 17, 0, 11, 0, - 12, 0, 7, 0, 8, 0, 9, 0, 61, 0, - 61, 5, 0, 61, 95, 0, 61, 5, 95, 0, - 19, 98, 0, 98, 0, 74, 19, 98, 0, 19, - 74, 98, 0, 74, 98, 0, 96, 0, 19, 55, - 99, 56, 0, 99, 59, 19, 0, 19, 0, 53, - 24, 0, 57, 0, 38, 88, 97, 90, 19, 55, - 104, 56, 102, 100, 0, 74, 38, 88, 96, 90, - 19, 55, 104, 56, 102, 100, 0, 37, 74, 90, - 19, 55, 104, 56, 102, 100, 0, 74, 37, 90, - 19, 55, 104, 56, 102, 100, 0, 37, 90, 19, - 55, 104, 56, 102, 100, 0, 39, 55, 21, 56, - 90, 19, 55, 104, 56, 102, 100, 0, 74, 90, - 19, 55, 104, 56, 102, 100, 0, 19, 55, 19, - 56, 100, 0, 19, 103, 0, 19, 103, 19, 103, - 0, 0, 117, 0, 53, 24, 0, 6, 0, 19, - 0, 19, 5, 0, 5, 19, 0, 19, 59, 105, - 0, 19, 5, 59, 105, 0, 5, 19, 59, 105, - 0, 105, 0, 106, 59, 10, 0, 106, 0, 106, - 59, 107, 0, 107, 0, 90, 19, 0, 90, 19, - 22, 0, 90, 19, 55, 19, 108, 56, 0, 90, - 19, 22, 55, 19, 108, 56, 0, 108, 109, 0, - 109, 0, 19, 0, 62, 117, 0, 63, 117, 0, - 62, 58, 117, 0, 63, 58, 117, 0, 58, 58, - 117, 0, 64, 58, 117, 0, 9, 19, 53, 111, - 54, 21, 57, 0, 9, 19, 53, 111, 59, 54, - 21, 57, 0, 111, 59, 112, 0, 112, 0, 19, - 58, 117, 0, 19, 0, 46, 19, 53, 114, 54, - 21, 57, 0, 46, 19, 53, 114, 59, 54, 21, - 57, 0, 114, 59, 19, 0, 19, 0, 45, 19, - 53, 116, 54, 21, 57, 0, 45, 19, 53, 116, - 59, 54, 21, 57, 0, 116, 59, 19, 0, 19, - 0, 20, 0, 65, 20, 0, 23, 0, 19, 0 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const unsigned short yyprhs[] = +{ + 0, 0, 3, 7, 10, 13, 15, 17, 19, 21, + 23, 25, 27, 30, 33, 36, 39, 41, 43, 45, + 47, 52, 56, 62, 63, 69, 75, 81, 84, 86, + 88, 91, 95, 97, 99, 101, 103, 105, 107, 109, + 111, 114, 118, 121, 125, 128, 131, 133, 135, 136, + 142, 149, 162, 172, 179, 183, 184, 196, 205, 211, + 215, 216, 220, 222, 224, 229, 231, 233, 237, 241, + 245, 249, 253, 257, 261, 265, 269, 273, 277, 281, + 285, 289, 293, 297, 301, 303, 309, 311, 315, 316, + 320, 322, 325, 327, 329, 331, 334, 337, 340, 344, + 348, 351, 354, 357, 359, 362, 364, 367, 369, 371, + 373, 375, 377, 379, 381, 383, 385, 387, 389, 391, + 393, 396, 399, 403, 406, 408, 412, 416, 419, 421, + 426, 430, 432, 435, 437, 448, 460, 470, 480, 489, + 501, 510, 516, 519, 524, 525, 527, 530, 532, 534, + 537, 540, 544, 549, 554, 556, 560, 562, 566, 568, + 571, 575, 582, 590, 593, 595, 597, 600, 603, 607, + 611, 615, 619, 627, 636, 640, 642, 646, 648, 656, + 665, 669, 671, 679, 688, 692, 694, 696, 699, 701 }; -#endif +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yysigned_char yyrhs[] = +{ + 67, 0, -1, 69, 70, 69, -1, 70, 69, -1, + 69, 70, -1, 70, -1, 24, -1, 27, -1, 25, + -1, 26, -1, 28, -1, 29, -1, 69, 68, -1, + 69, 111, -1, 69, 114, -1, 69, 116, -1, 68, + -1, 111, -1, 114, -1, 116, -1, 71, 53, 73, + 54, -1, 71, 53, 54, -1, 3, 21, 4, 21, + 72, -1, -1, 55, 19, 19, 56, 72, -1, 55, + 19, 21, 56, 72, -1, 55, 19, 20, 56, 72, + -1, 73, 74, -1, 74, -1, 102, -1, 19, 102, + -1, 19, 21, 102, -1, 79, -1, 80, -1, 82, + -1, 57, -1, 31, -1, 32, -1, 33, -1, 34, + -1, 19, 19, -1, 19, 53, 24, -1, 58, 118, + -1, 58, 53, 24, -1, 76, 77, -1, 77, 76, + -1, 77, -1, 76, -1, -1, 75, 91, 19, 78, + 57, -1, 75, 91, 19, 22, 78, 57, -1, 36, + 89, 88, 19, 81, 19, 53, 24, 19, 53, 24, + 57, -1, 36, 89, 88, 19, 81, 19, 53, 24, + 57, -1, 36, 89, 88, 19, 81, 19, -1, 55, + 19, 56, -1, -1, 35, 19, 19, 83, 19, 53, + 24, 19, 53, 24, 57, -1, 35, 19, 19, 83, + 19, 53, 24, 57, -1, 35, 19, 19, 83, 57, + -1, 55, 84, 56, -1, -1, 84, 59, 87, -1, + 87, -1, 30, -1, 19, 55, 30, 56, -1, 118, + -1, 85, -1, 40, 58, 85, -1, 41, 58, 85, + -1, 42, 58, 118, -1, 43, 58, 118, -1, 44, + 58, 86, -1, 46, 58, 90, -1, 47, 58, 91, + -1, 48, 58, 21, -1, 48, 58, 19, -1, 49, + 58, 21, -1, 49, 58, 19, -1, 50, 58, 21, + -1, 50, 58, 19, -1, 51, 58, 21, -1, 51, + 58, 19, -1, 52, 58, 21, -1, 52, 58, 19, + -1, 19, -1, 19, 55, 19, 91, 56, -1, 19, + -1, 55, 90, 56, -1, -1, 19, 60, 90, -1, + 19, -1, 92, 96, -1, 92, -1, 93, -1, 19, + -1, 5, 19, -1, 19, 5, -1, 95, 19, -1, + 5, 95, 19, -1, 95, 19, 5, -1, 94, 93, + -1, 21, 93, -1, 5, 93, -1, 21, -1, 21, + 5, -1, 94, -1, 94, 5, -1, 6, -1, 18, + -1, 14, -1, 15, -1, 13, -1, 16, -1, 17, + -1, 11, -1, 12, -1, 7, -1, 8, -1, 9, + -1, 61, -1, 61, 5, -1, 61, 96, -1, 61, + 5, 96, -1, 19, 99, -1, 99, -1, 75, 19, + 99, -1, 19, 75, 99, -1, 75, 99, -1, 97, + -1, 19, 55, 100, 56, -1, 100, 59, 19, -1, + 19, -1, 53, 24, -1, 57, -1, 38, 89, 98, + 91, 19, 55, 105, 56, 103, 101, -1, 75, 38, + 89, 97, 91, 19, 55, 105, 56, 103, 101, -1, + 37, 75, 91, 19, 55, 105, 56, 103, 101, -1, + 75, 37, 91, 19, 55, 105, 56, 103, 101, -1, + 37, 91, 19, 55, 105, 56, 103, 101, -1, 39, + 55, 21, 56, 91, 19, 55, 105, 56, 103, 101, + -1, 75, 91, 19, 55, 105, 56, 103, 101, -1, + 19, 55, 19, 56, 101, -1, 19, 104, -1, 19, + 104, 19, 104, -1, -1, 118, -1, 53, 24, -1, + 6, -1, 19, -1, 19, 5, -1, 5, 19, -1, + 19, 59, 106, -1, 19, 5, 59, 106, -1, 5, + 19, 59, 106, -1, 106, -1, 107, 59, 10, -1, + 107, -1, 107, 59, 108, -1, 108, -1, 91, 19, + -1, 91, 19, 22, -1, 91, 19, 55, 19, 109, + 56, -1, 91, 19, 22, 55, 19, 109, 56, -1, + 109, 110, -1, 110, -1, 19, -1, 62, 118, -1, + 63, 118, -1, 62, 58, 118, -1, 63, 58, 118, + -1, 58, 58, 118, -1, 64, 58, 118, -1, 9, + 19, 53, 112, 54, 21, 57, -1, 9, 19, 53, + 112, 59, 54, 21, 57, -1, 112, 59, 113, -1, + 113, -1, 19, 58, 118, -1, 19, -1, 46, 19, + 53, 115, 54, 21, 57, -1, 46, 19, 53, 115, + 59, 54, 21, 57, -1, 115, 59, 19, -1, 19, + -1, 45, 19, 53, 117, 54, 21, 57, -1, 45, + 19, 53, 117, 59, 54, 21, 57, -1, 117, 59, + 19, -1, 19, -1, 20, -1, 65, 20, -1, 23, + -1, 19, -1 +}; -#if YYDEBUG -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const short yyrline[] = -{ - 0, 640, 641, 642, 643, 646, 655, 664, 673, 682, - 691, 702, 703, 704, 705, 706, 707, 708, 709, 712, - 717, 724, 738, 739, 751, 760, 774, 775, 778, 779, - 788, 800, 801, 802, 803, 806, 807, 808, 809, 812, - 832, 856, 860, 868, 869, 870, 871, 872, 878, 881, - 886, 954, 1008, 1097, 1105, 1110, 1158, 1194, 1210, 1211, - 1214, 1215, 1218, 1219, 1231, 1232, 1235, 1241, 1247, 1253, - 1259, 1265, 1271, 1278, 1284, 1290, 1296, 1302, 1308, 1314, - 1320, 1326, 1332, 1338, 1358, 1367, 1373, 1374, 1377, 1380, - 1386, 1393, 1402, 1405, 1408, 1412, 1416, 1420, 1425, 1433, - 1437, 1442, 1446, 1449, 1453, 1456, 1461, 1462, 1463, 1464, - 1465, 1466, 1467, 1468, 1469, 1472, 1473, 1474, 1477, 1478, - 1479, 1483, 1490, 1502, 1508, 1520, 1532, 1535, 1541, 1546, - 1549, 1554, 1555, 1559, 1575, 1591, 1607, 1623, 1634, 1640, - 1650, 1673, 1684, 1703, 1709, 1710, 1716, 1717, 1728, 1739, - 1750, 1760, 1770, 1780, 1783, 1784, 1787, 1788, 1791, 1794, - 1797, 1805, 1815, 1816, 1819, 1836, 1843, 1850, 1857, 1864, - 1871, 1880, 1889, 1900, 1901, 1904, 1924, 1934, 1943, 1954, - 1957, 1962, 1971, 1982, 1985, 1991, 1992, 1996, 1997 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const unsigned short yyrline[] = +{ + 0, 644, 644, 645, 646, 647, 650, 659, 668, 677, + 686, 695, 706, 707, 708, 709, 710, 711, 712, 713, + 716, 721, 728, 742, 743, 755, 764, 778, 779, 782, + 783, 792, 804, 805, 806, 807, 810, 811, 812, 813, + 816, 836, 860, 864, 872, 873, 874, 875, 876, 882, + 885, 890, 958, 1012, 1101, 1109, 1114, 1162, 1198, 1214, + 1215, 1218, 1219, 1222, 1223, 1235, 1236, 1239, 1245, 1251, + 1257, 1263, 1269, 1275, 1282, 1288, 1294, 1300, 1306, 1312, + 1318, 1324, 1330, 1336, 1342, 1362, 1371, 1377, 1378, 1381, + 1384, 1390, 1397, 1406, 1409, 1412, 1416, 1420, 1424, 1429, + 1437, 1441, 1446, 1450, 1453, 1457, 1460, 1465, 1466, 1467, + 1468, 1469, 1470, 1471, 1472, 1473, 1476, 1477, 1478, 1481, + 1482, 1483, 1487, 1494, 1506, 1512, 1524, 1536, 1539, 1545, + 1550, 1553, 1558, 1559, 1563, 1579, 1595, 1611, 1627, 1638, + 1644, 1654, 1677, 1688, 1707, 1713, 1714, 1720, 1721, 1732, + 1743, 1754, 1764, 1774, 1784, 1787, 1788, 1791, 1792, 1795, + 1798, 1801, 1809, 1819, 1820, 1823, 1840, 1847, 1854, 1861, + 1868, 1875, 1884, 1893, 1904, 1905, 1908, 1928, 1938, 1947, + 1958, 1961, 1966, 1975, 1986, 1989, 1995, 1996, 2000, 2001 }; #endif - -#if (YYDEBUG) || defined YYERROR_VERBOSE - -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$", "error", "$undefined.", "CLASS", "FROM", "CONST", "VOID", "STRUCT", - "UNION", "ENUM", "THREEDOTS", "SIGNED", "UNSIGNED", "LONG", "SHORT", - "INT", "FLOAT", "DOUBLE", "CHAR", "TOKEN", "NUMBER", "TYPETOKEN", - "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "HTCODE", "PHCODE", "HCODE", - "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", "PROTECTED", - "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", "SIGNAL", "OVERRIDE", - "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", "ERROR", - "FLAGS", "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", "BOXED_TYPE", - "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", "','", "'|'", - "'*'", "'>'", "'<'", "'!'", "'-'", "prog", "ccode", "ccodes", "class", - "classdec", "classflags", "classcode", "thing", "scope", "destructor", - "initializer", "varoptions", "variable", "argument", "export", - "property", "param_spec", "param_spec_list", "string", "anyval", - "param_spec_value", "argtype", "flags", "flaglist", "type", - "specifier_list", "spec_list", "specifier", "strunionenum", "pointer", - "simplesigtype", "fullsigtype", "sigtype", "tokenlist", "codenocode", - "method", "returnvals", "retcode", "funcargs", "arglist", "arglist1", - "arg", "checklist", "check", "enumcode", "enumvals", "enumval", + "$end", "error", "$undefined", "CLASS", "FROM", "CONST", "VOID", + "STRUCT", "UNION", "ENUM", "THREEDOTS", "SIGNED", "UNSIGNED", "LONG", + "SHORT", "INT", "FLOAT", "DOUBLE", "CHAR", "TOKEN", "NUMBER", + "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "HTCODE", "PHCODE", + "HCODE", "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", "PROTECTED", + "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", "SIGNAL", "OVERRIDE", + "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", "ERROR", "FLAGS", + "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", "BOXED_TYPE", + "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", "','", "'|'", + "'*'", "'>'", "'<'", "'!'", "'-'", "$accept", "prog", "ccode", "ccodes", + "class", "classdec", "classflags", "classcode", "thing", "scope", + "destructor", "initializer", "varoptions", "variable", "argument", + "export", "property", "param_spec", "param_spec_list", "string", + "anyval", "param_spec_value", "argtype", "flags", "flaglist", "type", + "specifier_list", "spec_list", "specifier", "strunionenum", "pointer", + "simplesigtype", "fullsigtype", "sigtype", "tokenlist", "codenocode", + "method", "returnvals", "retcode", "funcargs", "arglist", "arglist1", + "arg", "checklist", "check", "enumcode", "enumvals", "enumval", "flagcode", "flagvals", "errorcode", "errorvals", "numtok", 0 }; #endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const short yyr1[] = -{ - 0, 66, 66, 66, 66, 67, 67, 67, 67, 67, - 67, 68, 68, 68, 68, 68, 68, 68, 68, 69, - 69, 70, 71, 71, 71, 71, 72, 72, 73, 73, - 73, 73, 73, 73, 73, 74, 74, 74, 74, 75, - 75, 76, 76, 77, 77, 77, 77, 77, 78, 78, - 79, 79, 79, 80, 80, 81, 81, 81, 82, 82, - 83, 83, 84, 84, 85, 85, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 87, 87, 88, 88, 89, 89, - 90, 90, 91, 91, 91, 91, 91, 91, 91, 92, - 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, - 93, 93, 93, 93, 93, 94, 94, 94, 95, 95, - 95, 95, 96, 96, 97, 97, 97, 97, 98, 99, - 99, 100, 100, 101, 101, 101, 101, 101, 101, 101, - 101, 102, 102, 102, 103, 103, 104, 104, 104, 104, - 104, 104, 104, 104, 105, 105, 106, 106, 107, 107, - 107, 107, 108, 108, 109, 109, 109, 109, 109, 109, - 109, 110, 110, 111, 111, 112, 112, 113, 113, 114, - 114, 115, 115, 116, 116, 117, 117, 117, 117 +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const unsigned short yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 123, 125, 40, 41, 59, 61, 44, + 124, 42, 62, 60, 33, 45 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const unsigned char yyr1[] = +{ + 0, 66, 67, 67, 67, 67, 68, 68, 68, 68, + 68, 68, 69, 69, 69, 69, 69, 69, 69, 69, + 70, 70, 71, 72, 72, 72, 72, 73, 73, 74, + 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, + 76, 76, 77, 77, 78, 78, 78, 78, 78, 79, + 79, 80, 80, 80, 81, 81, 82, 82, 82, 83, + 83, 84, 84, 85, 85, 86, 86, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 88, 88, 89, 89, 90, + 90, 91, 91, 92, 92, 92, 92, 92, 92, 92, + 93, 93, 93, 93, 93, 93, 93, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 95, 95, 95, 96, + 96, 96, 96, 97, 97, 98, 98, 98, 98, 99, + 100, 100, 101, 101, 102, 102, 102, 102, 102, 102, + 102, 102, 103, 103, 103, 104, 104, 105, 105, 105, + 105, 105, 105, 105, 105, 106, 106, 107, 107, 108, + 108, 108, 108, 109, 109, 110, 110, 110, 110, 110, + 110, 110, 111, 111, 112, 112, 113, 113, 114, 114, + 115, 115, 116, 116, 117, 117, 118, 118, 118, 118 }; -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const short yyr2[] = +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const unsigned char yyr2[] = { - 0, 3, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 2, 1, 1, 1, 1, 4, - 3, 5, 0, 5, 5, 5, 2, 1, 1, 2, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 3, 2, 3, 2, 2, 1, 1, 0, 5, 6, - 12, 9, 6, 3, 0, 11, 8, 5, 3, 0, - 3, 1, 1, 4, 1, 1, 3, 3, 3, 3, + 0, 2, 3, 2, 2, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, + 4, 3, 5, 0, 5, 5, 5, 2, 1, 1, + 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 3, 2, 3, 2, 2, 1, 1, 0, 5, + 6, 12, 9, 6, 3, 0, 11, 8, 5, 3, + 0, 3, 1, 1, 4, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 1, 5, 1, 3, 0, 3, 1, - 2, 1, 1, 1, 2, 2, 2, 3, 3, 2, - 2, 2, 1, 2, 1, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 3, 2, 1, 3, 3, 2, 1, 4, 3, - 1, 2, 1, 10, 11, 9, 9, 8, 11, 8, - 5, 2, 4, 0, 1, 2, 1, 1, 2, 2, - 3, 4, 4, 1, 3, 1, 3, 1, 2, 3, - 6, 7, 2, 1, 1, 2, 2, 3, 3, 3, - 3, 7, 8, 3, 1, 3, 1, 7, 8, 3, - 1, 7, 8, 3, 1, 1, 2, 1, 1 + 3, 3, 3, 3, 1, 5, 1, 3, 0, 3, + 1, 2, 1, 1, 1, 2, 2, 2, 3, 3, + 2, 2, 2, 1, 2, 1, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 3, 2, 1, 3, 3, 2, 1, 4, + 3, 1, 2, 1, 10, 11, 9, 9, 8, 11, + 8, 5, 2, 4, 0, 1, 2, 1, 1, 2, + 2, 3, 4, 4, 1, 3, 1, 3, 1, 2, + 3, 6, 7, 2, 1, 1, 2, 2, 3, 3, + 3, 3, 7, 8, 3, 1, 3, 1, 7, 8, + 3, 1, 7, 8, 3, 1, 1, 2, 1, 1 }; -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE - doesn't specify something else to do. Zero means the default is an - error. */ -static const short yydefact[] = -{ - 0, 0, 0, 5, 7, 8, 6, 9, 10, 0, - 0, 15, 0, 4, 0, 16, 17, 18, 0, 0, - 0, 0, 11, 3, 12, 13, 14, 2, 0, 0, - 0, 0, 0, 1, 0, 35, 36, 37, 38, 0, - 87, 0, 87, 0, 20, 34, 0, 27, 0, 31, - 32, 33, 28, 22, 176, 0, 174, 184, 0, 180, - 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, - 106, 115, 116, 117, 113, 114, 110, 108, 109, 111, - 112, 107, 93, 102, 0, 0, 91, 92, 104, 0, - 0, 0, 19, 26, 0, 87, 0, 0, 21, 0, - 0, 0, 0, 0, 0, 0, 30, 0, 0, 59, - 89, 0, 85, 0, 0, 94, 101, 0, 95, 103, - 100, 0, 0, 118, 90, 105, 99, 96, 0, 0, - 127, 0, 123, 0, 0, 0, 47, 0, 188, 185, - 187, 0, 175, 0, 0, 173, 0, 183, 0, 0, - 179, 0, 0, 0, 0, 0, 0, 86, 0, 54, - 97, 0, 0, 119, 120, 98, 0, 0, 0, 122, - 0, 126, 0, 0, 0, 0, 0, 0, 47, 0, - 0, 46, 45, 0, 0, 0, 0, 186, 171, 0, - 181, 0, 177, 0, 0, 132, 140, 83, 0, 0, +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const unsigned char yydefact[] = +{ + 0, 0, 0, 6, 8, 9, 7, 10, 11, 0, + 0, 0, 16, 0, 5, 0, 17, 18, 19, 0, + 0, 0, 0, 1, 12, 4, 13, 14, 15, 3, + 0, 0, 0, 0, 0, 2, 0, 36, 37, 38, + 39, 0, 88, 0, 88, 0, 21, 35, 0, 28, + 0, 32, 33, 34, 29, 23, 177, 0, 175, 185, + 0, 181, 0, 0, 0, 0, 0, 30, 0, 0, + 0, 0, 107, 116, 117, 118, 114, 115, 111, 109, + 110, 112, 113, 108, 94, 103, 0, 0, 92, 93, + 105, 0, 0, 0, 20, 27, 0, 88, 0, 0, + 22, 0, 0, 0, 0, 0, 0, 0, 31, 0, + 0, 60, 90, 0, 86, 0, 0, 95, 102, 0, + 96, 104, 101, 0, 0, 119, 91, 106, 100, 97, + 0, 0, 128, 0, 124, 0, 0, 0, 48, 0, + 189, 186, 188, 0, 176, 0, 0, 174, 0, 184, + 0, 0, 180, 0, 0, 0, 0, 0, 0, 87, + 0, 55, 98, 0, 0, 120, 121, 99, 0, 0, + 0, 123, 0, 127, 0, 0, 0, 0, 0, 0, + 48, 0, 0, 47, 46, 0, 0, 0, 0, 187, + 172, 0, 182, 0, 178, 0, 0, 133, 141, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 61, 0, 57, 88, 0, 0, 0, 0, 0, - 106, 93, 0, 0, 153, 155, 157, 121, 130, 0, - 125, 124, 0, 0, 0, 0, 39, 0, 0, 0, - 0, 41, 43, 44, 48, 22, 22, 22, 172, 182, - 178, 131, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 58, 0, 0, 0, 0, 52, - 0, 94, 95, 0, 158, 143, 0, 128, 0, 0, - 0, 0, 0, 40, 49, 143, 42, 23, 25, 24, - 0, 62, 66, 67, 68, 69, 188, 65, 70, 64, - 71, 72, 74, 73, 76, 75, 78, 77, 80, 79, - 82, 81, 60, 0, 84, 53, 0, 143, 0, 0, - 150, 159, 0, 0, 0, 154, 156, 129, 0, 0, - 143, 0, 0, 0, 0, 56, 0, 0, 152, 151, - 0, 0, 0, 141, 144, 137, 143, 0, 0, 0, - 139, 0, 0, 0, 51, 135, 0, 164, 0, 0, - 0, 0, 0, 163, 145, 0, 0, 143, 136, 143, - 63, 0, 0, 0, 0, 0, 165, 0, 166, 0, - 160, 162, 142, 133, 0, 0, 55, 0, 161, 169, - 167, 168, 170, 138, 134, 50, 0, 0, 0 + 0, 0, 0, 62, 0, 58, 89, 0, 0, 0, + 0, 0, 107, 94, 0, 0, 154, 156, 158, 122, + 131, 0, 126, 125, 0, 0, 0, 0, 40, 0, + 0, 0, 0, 42, 44, 45, 49, 23, 23, 23, + 173, 183, 179, 132, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, + 0, 53, 0, 95, 96, 0, 159, 144, 0, 129, + 0, 0, 0, 0, 0, 41, 50, 144, 43, 24, + 26, 25, 0, 63, 67, 68, 69, 70, 189, 66, + 71, 65, 72, 73, 75, 74, 77, 76, 79, 78, + 81, 80, 83, 82, 61, 0, 85, 54, 0, 144, + 0, 0, 151, 160, 0, 0, 0, 155, 157, 130, + 0, 0, 144, 0, 0, 0, 0, 57, 0, 0, + 153, 152, 0, 0, 0, 142, 145, 138, 144, 0, + 0, 0, 140, 0, 0, 0, 52, 136, 0, 165, + 0, 0, 0, 0, 0, 164, 146, 0, 0, 144, + 137, 144, 64, 0, 0, 0, 0, 0, 166, 0, + 167, 0, 161, 163, 143, 134, 0, 0, 56, 0, + 162, 170, 168, 169, 171, 139, 135, 51 }; +/* YYDEFGOTO[NTERM-NUM]. */ static const short yydefgoto[] = { - 396, 11, 12, 13, 14, 98, 46, 47, 48, 181, - 182, 183, 49, 50, 217, 51, 155, 210, 292, 298, - 211, 113, 68, 111, 222, 86, 87, 88, 89, 124, - 130, 131, 132, 229, 196, 52, 324, 343, 223, 224, - 225, 226, 362, 363, 15, 55, 56, 16, 60, 17, - 58, 344 + -1, 11, 12, 13, 14, 15, 100, 48, 49, 50, + 183, 184, 185, 51, 52, 219, 53, 157, 212, 294, + 300, 213, 115, 70, 113, 224, 88, 89, 90, 91, + 126, 132, 133, 134, 231, 198, 54, 326, 345, 225, + 226, 227, 228, 364, 365, 16, 57, 58, 17, 62, + 18, 60, 346 }; +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -317 static const short yypact[] = { - 137, 16, 24,-32768,-32768,-32768,-32768,-32768,-32768, 45, - 99,-32768, 137, 170, 72,-32768,-32768,-32768, 106, 73, - 81, 98,-32768, 170,-32768,-32768,-32768, 170, 154, 111, - 151, 183, 186, 170, 215,-32768,-32768,-32768,-32768, 187, - 158, 310, 158, 182,-32768,-32768, 188,-32768, 276,-32768, - -32768,-32768,-32768, 195, 210, 69,-32768,-32768, 113,-32768, - 115, 214, 301, 190, 276,-32768, 248, 252, 254, 357, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768, 269, 425, 374, 267, 235,-32768, 439, 284, - 444, 290,-32768,-32768, 374, 158, 293, 311,-32768, 74, - 315, 76, 316, 84, 339, 90,-32768, 321, 348, 329, - 334, 345, 356, 399, 453,-32768,-32768, 409,-32768, 453, - -32768, 413, 378, 2,-32768, 453,-32768, 429, 224, 416, - -32768, 374,-32768, 392, 428, 430, 126, 220,-32768,-32768, - -32768, 441,-32768, 405, 451,-32768, 422,-32768, 452, 423, - -32768, 460, -32, 427, 258, 21, 252,-32768, 464, 431, - -32768, 432, 391, 235,-32768,-32768, 433, 465, 466,-32768, - -6,-32768, 470, 374, 435, -6, 374, 26, 0, 391, - 7, 434, 472, 436, 438, 440, 442,-32768,-32768, 443, - -32768, 445,-32768, 446, 471,-32768,-32768,-32768, 447, 448, - 449, 450, 454, 455, 456, 457, 458, 459, 461, 462, - 91,-32768, 468,-32768,-32768, 374, 478, 480, 391, 408, - 467, 6, 482, 469,-32768, 463,-32768,-32768,-32768, 112, - -32768,-32768, 473, 485, 391, 490,-32768, 486, 474, 476, - 487,-32768,-32768,-32768,-32768, 195, 195, 195,-32768,-32768, - -32768,-32768, 1, 1, 74, 74, 9, 252, 374, 139, - 157, 191, 209, 212,-32768, 258, 494, 477, 479, 481, - 483, 121, 144, 374, 94, 505, 340,-32768, 507, 391, - 475, 484, 488,-32768,-32768, 505,-32768,-32768,-32768,-32768, - 489,-32768,-32768,-32768,-32768,-32768, 489,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, 47,-32768,-32768, 503, 505, 374, 374, - -32768, 491, 510, 27, -32,-32768,-32768,-32768, 492, 391, - 505, 391, -32, 506, 496,-32768, 54, -32,-32768,-32768, - 518, 57, 514, 522,-32768,-32768, 505, 495, -32, 497, - -32768, 498, 521, 499,-32768,-32768, 57,-32768, 500, 64, - 66, 501, 50,-32768,-32768, 27, -32, 505,-32768, 505, - -32768, 493, 523, 79, 74, 74,-32768, 74,-32768, 74, - -32768,-32768,-32768,-32768, -32, -32,-32768, 504,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768, 542, 555,-32768 + 137, 4, 45, -317, -317, -317, -317, -317, -317, 99, + 106, 134, -317, 137, 170, 98, -317, -317, -317, 156, + 124, 125, 157, -317, -317, 170, -317, -317, -317, 170, + 154, 181, 209, 214, 222, 170, 215, -317, -317, -317, + -317, 225, 196, 310, 196, 204, -317, -317, 188, -317, + 276, -317, -317, -317, -317, 217, 216, 113, -317, -317, + 117, -317, 146, 241, 301, 267, 276, -317, 284, 292, + 293, 357, -317, -317, -317, -317, -317, -317, -317, -317, + -317, -317, -317, -317, 325, 425, 374, 317, 299, -317, + 439, 318, 231, 346, -317, -317, 374, 196, 358, 365, + -317, 74, 373, 76, 380, 84, 390, 90, -317, 362, + 409, 377, 375, 378, 392, 414, 453, -317, -317, 429, + -317, 453, -317, 430, 406, 2, -317, 453, -317, 457, + 224, 444, -317, 374, -317, 416, 454, 456, 126, 149, + -317, -317, -317, 458, -317, 419, 459, -317, 420, -317, + 460, 422, -317, 461, 70, 428, 258, 21, 292, -317, + 465, 431, -317, 432, 391, 299, -317, -317, 433, 466, + 470, -317, -6, -317, 471, 374, 436, -6, 374, 26, + 0, 391, 7, 434, 474, 437, 440, 441, 442, -317, + -317, 438, -317, 443, -317, 445, 475, -317, -317, -317, + 446, 447, 448, 449, 450, 451, 452, 455, 462, 463, + 464, 467, 91, -317, 473, -317, -317, 374, 482, 484, + 391, 408, 468, 6, 492, 472, -317, 476, -317, -317, + -317, 147, -317, -317, 477, 493, 391, 495, -317, 491, + 479, 478, 494, -317, -317, -317, -317, 217, 217, 217, + -317, -317, -317, -317, 1, 1, 74, 74, 9, 292, + 374, 218, 219, 247, 248, 252, -317, 258, 499, 481, + 483, 480, 485, 153, 158, 374, 94, 497, 340, -317, + 498, 391, 487, 488, 490, -317, -317, 497, -317, -317, + -317, -317, 496, -317, -317, -317, -317, -317, 496, -317, + -317, -317, -317, -317, -317, -317, -317, -317, -317, -317, + -317, -317, -317, -317, -317, 47, -317, -317, 503, 497, + 374, 374, -317, 500, 510, 27, 70, -317, -317, -317, + 501, 391, 497, 391, 70, 489, 505, -317, 54, 70, + -317, -317, 511, 57, 507, 519, -317, -317, 497, 504, + 70, 506, -317, 508, 516, 512, -317, -317, 57, -317, + 509, 64, 66, 513, 50, -317, -317, 27, 70, 497, + -317, 497, -317, 486, 522, 79, 74, 74, -317, 74, + -317, 74, -317, -317, -317, -317, 70, 70, -317, 502, + -317, -317, -317, -317, -317, -317, -317, -317 }; +/* YYPGOTO[NTERM-NUM]. */ static const short yypgoto[] = { - -32768, 202, 104, 544,-32768, 17,-32768, 511, -29, 380, - 379, 385,-32768,-32768,-32768,-32768,-32768,-32768, -52,-32768, - 299,-32768, -27, -152, -40,-32768, -66,-32768, -60, -107, - 437,-32768, -93,-32768, -314, -20, -279, 200, -177, -218, - -32768, 291, 213, -266, 205,-32768, 502, 232,-32768, 239, - -32768, -99 + -317, -317, 8, 82, 534, -317, -17, -317, 515, -31, + 364, 366, 370, -317, -317, -317, -317, -317, -317, -54, + -317, 285, -317, -29, -154, -42, -317, -68, -317, -62, + -109, 417, -317, -95, -317, -316, -22, -281, 186, -179, + -220, -317, 278, 203, -247, 97, -317, 469, 145, -317, + 200, -317, -101 }; - -#define YYLAST 603 - - +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -151 static const short yytable[] = { - 142, 85, 239, 116, 214, 64, 332, 163, 96, 117, - 345, 272, 84, 166, 65, 90, 164, 120, 350, 177, - 290, 194, 126, 355, 108, 195, 138, 139, 296, 139, - 140, 291, 140, 64, 368, 169, 171, 18, 337, 291, - 212, 270, 106, 19, 121, 236, 138, 139, 116, 167, - 140, 348, 383, 116, 134, 320, 227, 281, 180, 116, - 240, 129, -147, 123, 20, 273, 334, 366, 135, 357, - 393, 394, 141, 353, 141, 230, 357, 231, 213, 237, - 342, 241, 169, 138, 139, 138, 139, 140, 384, 140, - 385, 172, 141, 138, 139, 54, 381, 140, 357, 168, - 338, 339, 328, 147, 335, 300, 380, 381, 358, 150, - 29, 354, 359, 360, 361, 358, 321, 27, 21, 359, - 360, 361, 375, 100, 377, 28, 30, 33, 101, 141, - 144, 141, 53, 233, 31, 388, 235, 358, 148, 141, - 1, 359, 360, 361, 151, 177, 2, 264, 178, 322, - 265, 32, 347, 116, 349, 294, 295, 299, 302, 117, - 303, 3, 4, 5, 6, 7, 8, 102, 277, 104, - 54, 278, 103, 34, 105, 267, 304, -149, 305, 2, - 318, 179, 9, 10, 180, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 3, 4, 5, 6, 7, 8, - -148, 293, 57, 319, 297, 59, 66, 34, 44, 107, - 306, 45, 307, 67, 22, 9, 10, 24, 301, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 308, 22, - 309, 310, 24, 311, 61, 22, 62, 91, 24, 184, - 185, 186, 92, 166, 25, 45, 35, 36, 37, 38, - 97, 26, 41, 42, 43, 35, 36, 37, 38, 25, - 376, 378, 287, 288, 289, 25, 26, 109, 99, 63, - 63, 110, 26, 112, 118, 389, 390, 197, 391, 167, - 392, 69, 70, 71, 72, 73, 122, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 123, 83, 198, 199, - 200, 201, 202, 127, 203, 204, 205, 206, 207, 208, - 209, 133, 136, 94, 95, 69, 70, 71, 72, 73, - 61, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 137, 83, 35, 36, 37, 38, 143, 146, 41, 42, - 43, 35, 36, 37, 38, 69, 70, 71, 72, 73, - 325, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 149, 83, 114, 70, 71, 72, 73, 153, 74, 75, - 76, 77, 78, 79, 80, 81, 115, 152, 83, 69, - 70, 71, 72, 73, 154, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 156, 83, 219, 220, 71, 72, - 73, 157, 74, 75, 76, 77, 78, 79, 80, 81, - 221, 158, 83, 114, 70, 71, 72, 73, 159, 74, - 75, 76, 77, 78, 79, 80, 81, 271, 160, 83, - 119, 70, 161, 162, 165, 170, 74, 75, 76, 77, - 78, 79, 80, 81, 125, 70, 83, 174, 173, 175, - 74, 75, 76, 77, 78, 79, 80, 81, 114, 70, - 83, 187, 188, 128, 74, 75, 76, 77, 78, 79, - 80, 81, 189, 191, 83, 35, 36, 37, 38, 190, - 192, 193, 179, 215, 228, 166, 216, 218, 167, 232, - 234, 177, 180, 244, 245, 251, 246, 268, 247, 269, - 248, 274, 249, 250, 280, 252, 253, 254, 255, 282, - 283, 286, 256, 257, 258, 259, 260, 261, 313, 262, - 263, 266, 276, -146, 323, 275, 327, 336, 279, 341, - 329, 284, 285, 314, 316, 315, 351, 356, 364, 317, - 330, 365, 397, 331, 333, 371, 340, 387, 346, 352, - 386, 367, 372, 369, 370, 398, 23, 93, 374, 379, - 242, 395, 243, 238, 312, 382, 0, 326, 0, 373, - 0, 0, 176, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 145 + 144, 87, 241, 118, 216, 66, 334, 165, 98, 119, + 347, 274, 86, 168, 67, 92, 166, 122, 352, 179, + 292, 24, 128, 357, 110, 19, 140, 141, 298, 141, + 142, 293, 142, 66, 370, 171, 173, 24, 339, 293, + 214, 272, 108, 24, 123, 238, 140, 141, 118, 169, + 142, 350, 385, 118, 136, 322, 229, 283, 182, 118, + 242, 131, -148, 125, 20, 275, 336, 368, 137, 359, + 395, 396, 143, 355, 143, 232, 359, 233, 215, 239, + 344, 243, 171, 140, 141, 140, 141, 142, 386, 142, + 387, 174, 143, 140, 141, 56, 29, 142, 359, 170, + 340, 341, 330, 149, 337, 302, 382, 35, 360, 152, + 26, 356, 361, 362, 363, 360, 323, 383, 21, 361, + 362, 363, 377, 196, 379, 22, 26, 197, 383, 143, + 146, 143, 26, 235, 23, 390, 237, 360, 150, 143, + 1, 361, 362, 363, 153, 179, 2, 266, 180, 324, + 267, 30, 349, 118, 351, 296, 297, 301, 27, 119, + 31, 3, 4, 5, 6, 7, 8, 102, 186, 187, + 188, 104, 103, 36, 27, 269, 105, 32, 33, 2, + 27, 181, 9, 10, 182, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 3, 4, 5, 6, 7, 8, + 106, 295, 55, 279, 299, 107, 280, 36, 46, -150, + 34, 47, 320, 28, -149, 9, 10, 321, 303, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 56, 28, + 289, 290, 291, 59, 63, 28, 64, 304, 306, 305, + 307, 61, 94, 168, 68, 47, 37, 38, 39, 40, + 130, 69, 43, 44, 45, 37, 38, 39, 40, 93, + 378, 380, 37, 38, 39, 40, 308, 310, 309, 311, + 65, 312, 99, 313, 101, 391, 392, 199, 393, 169, + 394, 71, 72, 73, 74, 75, 109, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 65, 85, 200, 201, + 202, 203, 204, 111, 205, 206, 207, 208, 209, 210, + 211, 112, 114, 96, 97, 71, 72, 73, 74, 75, + 63, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 120, 85, 37, 38, 39, 40, 124, 129, 43, 44, + 45, 37, 38, 39, 40, 71, 72, 73, 74, 75, + 327, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 125, 85, 116, 72, 73, 74, 75, 135, 76, 77, + 78, 79, 80, 81, 82, 83, 117, 138, 85, 71, + 72, 73, 74, 75, 139, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 145, 85, 221, 222, 73, 74, + 75, 148, 76, 77, 78, 79, 80, 81, 82, 83, + 223, 151, 85, 116, 72, 73, 74, 75, 154, 76, + 77, 78, 79, 80, 81, 82, 83, 273, 155, 85, + 121, 72, 156, 161, 159, 158, 76, 77, 78, 79, + 80, 81, 82, 83, 127, 72, 85, 160, 162, 163, + 76, 77, 78, 79, 80, 81, 82, 83, 116, 72, + 85, 164, 167, 172, 76, 77, 78, 79, 80, 81, + 82, 83, 175, 176, 85, 177, 190, 192, 189, 194, + 191, 193, 195, 181, 217, 230, 218, 220, 169, 168, + 234, 236, 182, 179, 246, 250, 247, 248, 249, 253, + 251, 270, 252, 271, 254, 255, 256, 257, 258, 259, + 260, 276, 282, 261, 284, 285, 325, 329, 288, 353, + 262, 263, 264, 315, -147, 265, 268, 338, 277, 343, + 358, 366, 281, 318, 287, 278, 286, 316, 367, 317, + 373, 319, 331, 388, 332, 333, 389, 25, 245, 244, + 240, 335, 314, 384, 178, 342, 328, 348, 354, 397, + 369, 375, 371, 95, 372, 374, 0, 376, 0, 0, + 0, 381, 147 }; static const short yycheck[] = { - 99, 41, 179, 69, 156, 34, 285, 5, 48, 69, - 324, 5, 41, 19, 34, 42, 123, 83, 332, 19, - 19, 53, 88, 337, 64, 57, 19, 20, 19, 20, - 23, 30, 23, 62, 348, 128, 129, 21, 317, 30, - 19, 218, 62, 19, 84, 19, 19, 20, 114, 55, - 23, 330, 366, 119, 94, 273, 163, 234, 58, 125, - 53, 90, 56, 61, 19, 59, 19, 346, 95, 19, - 384, 385, 65, 19, 65, 168, 19, 170, 57, 53, - 53, 180, 175, 19, 20, 19, 20, 23, 367, 23, - 369, 131, 65, 19, 20, 19, 362, 23, 19, 128, - 318, 319, 279, 19, 57, 257, 56, 373, 58, 19, - 4, 57, 62, 63, 64, 58, 22, 13, 19, 62, - 63, 64, 58, 54, 58, 53, 53, 23, 59, 65, - 54, 65, 21, 173, 53, 56, 176, 58, 54, 65, + 101, 43, 181, 71, 158, 36, 287, 5, 50, 71, + 326, 5, 43, 19, 36, 44, 125, 85, 334, 19, + 19, 13, 90, 339, 66, 21, 19, 20, 19, 20, + 23, 30, 23, 64, 350, 130, 131, 29, 319, 30, + 19, 220, 64, 35, 86, 19, 19, 20, 116, 55, + 23, 332, 368, 121, 96, 275, 165, 236, 58, 127, + 53, 92, 56, 61, 19, 59, 19, 348, 97, 19, + 386, 387, 65, 19, 65, 170, 19, 172, 57, 53, + 53, 182, 177, 19, 20, 19, 20, 23, 369, 23, + 371, 133, 65, 19, 20, 19, 14, 23, 19, 130, + 320, 321, 281, 19, 57, 259, 56, 25, 58, 19, + 13, 57, 62, 63, 64, 58, 22, 364, 19, 62, + 63, 64, 58, 53, 58, 19, 29, 57, 375, 65, + 54, 65, 35, 175, 0, 56, 178, 58, 54, 65, 3, 62, 63, 64, 54, 19, 9, 56, 22, 55, - 59, 53, 329, 219, 331, 254, 255, 256, 19, 219, - 21, 24, 25, 26, 27, 28, 29, 54, 56, 54, - 19, 59, 59, 19, 59, 215, 19, 56, 21, 9, - 59, 55, 45, 46, 58, 31, 32, 33, 34, 35, + 59, 53, 331, 221, 333, 256, 257, 258, 13, 221, + 4, 24, 25, 26, 27, 28, 29, 54, 19, 20, + 21, 54, 59, 19, 29, 217, 59, 53, 53, 9, + 35, 55, 45, 46, 58, 31, 32, 33, 34, 35, 36, 37, 38, 39, 24, 25, 26, 27, 28, 29, - 56, 253, 19, 59, 256, 19, 19, 19, 54, 19, - 19, 57, 21, 55, 12, 45, 46, 12, 258, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 19, 27, - 21, 19, 27, 21, 19, 33, 21, 55, 33, 19, - 20, 21, 54, 19, 12, 57, 31, 32, 33, 34, - 55, 12, 37, 38, 39, 31, 32, 33, 34, 27, - 359, 360, 245, 246, 247, 33, 27, 19, 58, 55, - 55, 19, 33, 19, 5, 374, 375, 19, 377, 55, - 379, 5, 6, 7, 8, 9, 19, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 61, 21, 40, 41, + 54, 255, 21, 56, 258, 59, 59, 19, 54, 56, + 53, 57, 59, 13, 56, 45, 46, 59, 260, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 19, 29, + 247, 248, 249, 19, 19, 35, 21, 19, 19, 21, + 21, 19, 54, 19, 19, 57, 31, 32, 33, 34, + 19, 55, 37, 38, 39, 31, 32, 33, 34, 55, + 361, 362, 31, 32, 33, 34, 19, 19, 21, 21, + 55, 19, 55, 21, 58, 376, 377, 19, 379, 55, + 381, 5, 6, 7, 8, 9, 19, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 55, 21, 40, 41, 42, 43, 44, 19, 46, 47, 48, 49, 50, 51, - 52, 21, 19, 37, 38, 5, 6, 7, 8, 9, + 52, 19, 19, 37, 38, 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 19, 21, 31, 32, 33, 34, 21, 21, 37, 38, + 5, 21, 31, 32, 33, 34, 19, 19, 37, 38, 39, 31, 32, 33, 34, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 21, 21, 5, 6, 7, 8, 9, 19, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 56, 21, 5, - 6, 7, 8, 9, 55, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 60, 21, 5, 6, 7, 8, - 9, 56, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 55, 21, 5, 6, 7, 8, 9, 19, 11, + 61, 21, 5, 6, 7, 8, 9, 21, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 21, 21, 5, 6, 7, 8, + 9, 21, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 21, 21, 5, 6, 7, 8, 9, 56, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 21, - 5, 6, 19, 55, 5, 19, 11, 12, 13, 14, - 15, 16, 17, 18, 5, 6, 21, 19, 56, 19, + 5, 6, 55, 19, 56, 60, 11, 12, 13, 14, + 15, 16, 17, 18, 5, 6, 21, 55, 19, 19, 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, - 21, 20, 57, 19, 11, 12, 13, 14, 15, 16, - 17, 18, 21, 21, 21, 31, 32, 33, 34, 57, - 57, 21, 55, 19, 19, 19, 55, 55, 55, 19, - 55, 19, 58, 57, 56, 24, 56, 19, 56, 19, - 57, 19, 57, 57, 19, 58, 58, 58, 58, 19, - 24, 24, 58, 58, 58, 58, 58, 58, 24, 58, - 58, 53, 59, 56, 19, 56, 19, 24, 55, 19, - 55, 57, 56, 56, 53, 56, 30, 19, 24, 56, - 56, 19, 0, 55, 55, 24, 55, 24, 56, 53, - 57, 56, 53, 56, 56, 0, 12, 46, 58, 58, - 181, 57, 182, 178, 265, 365, -1, 276, -1, 356, - -1, -1, 135, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 101 + 21, 55, 5, 19, 11, 12, 13, 14, 15, 16, + 17, 18, 56, 19, 21, 19, 57, 57, 20, 57, + 21, 21, 21, 55, 19, 19, 55, 55, 55, 19, + 19, 55, 58, 19, 57, 57, 56, 56, 56, 24, + 57, 19, 57, 19, 58, 58, 58, 58, 58, 58, + 58, 19, 19, 58, 19, 24, 19, 19, 24, 30, + 58, 58, 58, 24, 56, 58, 53, 24, 56, 19, + 19, 24, 55, 53, 56, 59, 57, 56, 19, 56, + 24, 56, 55, 57, 56, 55, 24, 13, 184, 183, + 180, 55, 267, 367, 137, 55, 278, 56, 53, 57, + 56, 358, 56, 48, 56, 53, -1, 58, -1, -1, + -1, 58, 103 }; -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison/bison.simple" - -/* Skeleton output parser for bison, - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - 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. */ - -/* 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. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free -# endif -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ - -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - short yyss; - YYSTYPE yyvs; -# if YYLSP_NEEDED - YYLTYPE yyls; -# endif +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const unsigned char yystos[] = +{ + 0, 3, 9, 24, 25, 26, 27, 28, 29, 45, + 46, 67, 68, 69, 70, 71, 111, 114, 116, 21, + 19, 19, 19, 0, 68, 70, 111, 114, 116, 69, + 53, 4, 53, 53, 53, 69, 19, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 54, 57, 73, 74, + 75, 79, 80, 82, 102, 21, 19, 112, 113, 19, + 117, 19, 115, 19, 21, 55, 75, 102, 19, 55, + 89, 5, 6, 7, 8, 9, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 21, 75, 91, 92, 93, + 94, 95, 89, 55, 54, 74, 37, 38, 91, 55, + 72, 58, 54, 59, 54, 59, 54, 59, 102, 19, + 91, 19, 19, 90, 19, 88, 5, 19, 93, 95, + 5, 5, 93, 91, 19, 61, 96, 5, 93, 19, + 19, 75, 97, 98, 99, 21, 91, 89, 19, 19, + 19, 20, 23, 65, 118, 21, 54, 113, 21, 19, + 54, 21, 19, 54, 56, 19, 55, 83, 60, 56, + 55, 19, 19, 19, 55, 5, 96, 5, 19, 55, + 75, 99, 19, 99, 91, 56, 19, 19, 97, 19, + 22, 55, 58, 76, 77, 78, 19, 20, 21, 20, + 57, 21, 57, 21, 57, 21, 53, 57, 101, 19, + 40, 41, 42, 43, 44, 46, 47, 48, 49, 50, + 51, 52, 84, 87, 19, 57, 90, 19, 55, 81, + 55, 5, 6, 19, 91, 105, 106, 107, 108, 96, + 19, 100, 99, 99, 19, 91, 55, 91, 19, 53, + 78, 105, 53, 118, 77, 76, 57, 56, 56, 56, + 57, 57, 57, 24, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 56, 59, 53, 91, + 19, 19, 105, 19, 5, 59, 19, 56, 59, 56, + 59, 55, 19, 105, 19, 24, 57, 56, 24, 72, + 72, 72, 19, 30, 85, 85, 118, 118, 19, 85, + 86, 118, 90, 91, 19, 21, 19, 21, 19, 21, + 19, 21, 19, 21, 87, 24, 56, 56, 53, 56, + 59, 59, 106, 22, 55, 19, 103, 10, 108, 19, + 105, 55, 56, 55, 103, 55, 19, 57, 24, 103, + 106, 106, 55, 19, 53, 104, 118, 101, 56, 105, + 103, 105, 101, 30, 53, 19, 57, 101, 19, 19, + 58, 62, 63, 64, 109, 110, 24, 19, 103, 56, + 101, 56, 56, 24, 53, 109, 58, 58, 118, 58, + 118, 58, 56, 110, 104, 101, 103, 103, 57, 24, + 56, 118, 118, 118, 118, 101, 101, 57 }; -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# if YYLSP_NEEDED -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) -# else -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX) -# endif - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - register YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (0) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) - -#endif - - #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ #endif @@ -1313,29 +1482,35 @@ union yyalloc #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 +#define YYEMPTY (-2) #define YYEOF 0 + #define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ + #define YYFAIL goto yyerrlab + #define YYRECOVERING() (!!yyerrstatus) + #define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ { \ yychar = (Token); \ yylval = (Value); \ - yychar1 = YYTRANSLATE (yychar); \ + yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK; \ goto yybackup; \ } \ else \ { \ - yyerror ("syntax error: cannot back up"); \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ while (0) @@ -1343,41 +1518,24 @@ while (0) #define YYTERROR 1 #define YYERRCODE 256 - /* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). - - When YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ + are run). */ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + ((Current).first_line = (Rhs)[1].first_line, \ + (Current).first_column = (Rhs)[1].first_column, \ + (Current).last_line = (Rhs)[N].last_line, \ + (Current).last_column = (Rhs)[N].last_column) #endif - /* YYLEX -- calling `yylex' with the right arguments. */ -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ - +#ifdef YYLEX_PARAM +# define YYLEX yylex (YYLEX_PARAM) +#else +# define YYLEX yylex () +#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1392,13 +1550,93 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) + +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_stack_print (short *bottom, short *top) +#else +static void +yy_stack_print (bottom, top) + short *bottom; + short *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_reduce_print (int yyrule) +#else +static void +yy_reduce_print (yyrule) + int yyrule; +#endif +{ + int yyi; + unsigned int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -1411,15 +1649,17 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 # undef YYMAXDEPTH #endif #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif + -#ifdef YYERROR_VERBOSE + +#if YYERROR_VERBOSE # ifndef yystrlen # if defined (__GLIBC__) && defined (_STRING_H) @@ -1469,86 +1709,134 @@ yystpcpy (yydest, yysrc) } # endif # endif -#endif + +#endif /* !YYERROR_VERBOSE */ + -#line 315 "/usr/share/bison/bison.simple" +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + + if (yytype < YYNTOKENS) + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyoutput, ")"); +} + +#endif /* ! YYDEBUG */ +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yydestruct (int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yytype, yyvaluep) + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM # if defined (__STDC__) || defined (__cplusplus) -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL +int yyparse (void *YYPARSE_PARAM); # else -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +int yyparse (); # endif -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef YYPARSE_PARAM -int yyparse (void *); -# else +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void); -# endif +#else +int yyparse (); #endif +#endif /* ! YYPARSE_PARAM */ -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ - -#define YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; -#else -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES -#endif + +/* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; -/* If nonreentrant, generate the variables here. */ -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ +/*----------. +| yyparse. | +`----------*/ +#ifdef YYPARSE_PARAM +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM) +# else +int yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +# endif +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ +yyparse (void) +#else +int +yyparse () +#endif +#endif +{ + register int yystate; register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* Lookahead token as an internal (translated) token number. */ - int yychar1 = 0; + int yytoken = 0; /* Three stacks and their tools: `yyss': related to states, @@ -1558,7 +1846,7 @@ yyparse (YYPARSE_PARAM_ARG) Refer to the stacks thru separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ + /* The state stack. */ short yyssa[YYINITDEPTH]; short *yyss = yyssa; register short *yyssp; @@ -1568,31 +1856,19 @@ yyparse (YYPARSE_PARAM_ARG) YYSTYPE *yyvs = yyvsa; register YYSTYPE *yyvsp; -#if YYLSP_NEEDED - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; -#endif -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -# define YYPOPSTACK (yyvsp--, yyssp--) -#endif - YYSIZE_T yystacksize = YYINITDEPTH; +#define YYPOPSTACK (yyvsp--, yyssp--) + YYSIZE_T yystacksize = YYINITDEPTH; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYLSP_NEEDED - YYLTYPE yyloc; -#endif + /* When reducing, the number of symbols on the RHS of the reduced - rule. */ + rule. */ int yylen; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1609,9 +1885,7 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss; yyvsp = yyvs; -#if YYLSP_NEEDED - yylsp = yyls; -#endif + goto yysetstate; /*------------------------------------------------------------. @@ -1626,7 +1900,7 @@ yyparse (YYPARSE_PARAM_ARG) yysetstate: *yyssp = yystate; - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ YYSIZE_T yysize = yyssp - yyss + 1; @@ -1639,24 +1913,17 @@ yyparse (YYPARSE_PARAM_ARG) YYSTYPE *yyvs1 = yyvs; short *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; -# else + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); -# endif + yyss = yyss1; yyvs = yyvs1; } @@ -1665,10 +1932,10 @@ yyparse (YYPARSE_PARAM_ARG) goto yyoverflowlab; # else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) + if (YYMAXDEPTH <= yystacksize) goto yyoverflowlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { @@ -1679,10 +1946,8 @@ yyparse (YYPARSE_PARAM_ARG) goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED - YYSTACK_RELOCATE (yyls); -# endif -# undef YYSTACK_RELOCATE + +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -1691,14 +1956,12 @@ yyparse (YYPARSE_PARAM_ARG) yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; -#if YYLSP_NEEDED - yylsp = yyls + yysize - 1; -#endif + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } @@ -1706,7 +1969,6 @@ yyparse (YYPARSE_PARAM_ARG) goto yybackup; - /*-----------. | yybackup. | `-----------*/ @@ -1719,88 +1981,55 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yyn == YYPACT_NINF) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ + if (yychar <= YYEOF) { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE (yychar); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - YYFPRINTF (stderr, "Next token is %d (%s", - yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -# endif - YYFPRINTF (stderr, ")\n"); - } -#endif + yytoken = YYTRANSLATE (yychar); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) + if (yyn == 0 || yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; if (yyn == YYFINAL) YYACCEPT; /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", - yychar, yytname[yychar1])); + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif + /* Count tokens shifted since error; after three, turn off error status. */ @@ -1831,58 +2060,40 @@ yyreduce: /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison users should not rely upon it. Assigning to YYVAL unconditionally makes the parser a bit smaller, and it avoids a GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; -#if YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - yyloc = yylsp[1-yylen]; - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); -#endif -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) + YY_REDUCE_PRINT (yyn); + switch (yyn) { - int yyi; - - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - switch (yyn) { - -case 1: -#line 640 "parse.y" -{ ; } + case 2: +#line 644 "parse.y" + { ; } break; -case 2: -#line 641 "parse.y" -{ ; } + + case 3: +#line 645 "parse.y" + { ; } break; -case 3: -#line 642 "parse.y" -{ ; } + + case 4: +#line 646 "parse.y" + { ; } break; -case 4: -#line 643 "parse.y" -{ ; } + + case 5: +#line 647 "parse.y" + { ; } break; -case 5: -#line 646 "parse.y" -{ + + case 6: +#line 650 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", C_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1892,9 +2103,10 @@ case 5: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 6: -#line 655 "parse.y" -{ + + case 7: +#line 659 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", H_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1904,9 +2116,10 @@ case 6: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 7: -#line 664 "parse.y" -{ + + case 8: +#line 668 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", HT_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1916,9 +2129,10 @@ case 7: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 8: -#line 673 "parse.y" -{ + + case 9: +#line 677 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", PH_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1928,9 +2142,10 @@ case 8: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 9: -#line 682 "parse.y" -{ + + case 10: +#line 686 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", A_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1940,9 +2155,10 @@ case 9: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 10: -#line 691 "parse.y" -{ + + case 11: +#line 695 "parse.y" + { Node *node = node_new (CCODE_NODE, "cctype", AT_CCODE, "cbuf:steal", (yyvsp[0].cbuf)->str, @@ -1952,57 +2168,68 @@ case 10: g_string_free(yyvsp[0].cbuf,FALSE); } break; -case 11: -#line 702 "parse.y" -{ ; } - break; -case 12: -#line 703 "parse.y" -{ ; } - break; -case 13: -#line 704 "parse.y" -{ ; } - break; -case 14: -#line 705 "parse.y" -{ ; } - break; -case 15: + + case 12: #line 706 "parse.y" -{ ; } + { ; } break; -case 16: + + case 13: #line 707 "parse.y" -{ ; } + { ; } break; -case 17: + + case 14: #line 708 "parse.y" -{ ; } + { ; } break; -case 18: + + case 15: #line 709 "parse.y" -{ ; } + { ; } + break; + + case 16: +#line 710 "parse.y" + { ; } break; -case 19: + + case 17: +#line 711 "parse.y" + { ; } + break; + + case 18: #line 712 "parse.y" -{ + { ; } + break; + + case 19: +#line 713 "parse.y" + { ; } + break; + + case 20: +#line 716 "parse.y" + { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); } break; -case 20: -#line 717 "parse.y" -{ + + case 21: +#line 721 "parse.y" + { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); } break; -case 21: -#line 724 "parse.y" -{ + + case 22: +#line 728 "parse.y" + { class = node_new (CLASS_NODE, "otype:steal", yyvsp[-3].id, "ptype:steal", yyvsp[-1].id, @@ -2015,9 +2242,10 @@ case 21: interfaces = NULL; } break; -case 23: -#line 739 "parse.y" -{ + + case 24: +#line 743 "parse.y" + { if(strcmp(yyvsp[-3].id,"chunks") == 0) { g_free (chunk_size); chunk_size = g_strdup(yyvsp[-2].id); @@ -2030,9 +2258,10 @@ case 23: } } break; -case 24: -#line 751 "parse.y" -{ + + case 25: +#line 755 "parse.y" + { if (strcmp (yyvsp[-3].id, "interface") == 0) { interfaces = g_list_append (interfaces, g_strdup (yyvsp[-2].id)); @@ -2042,9 +2271,10 @@ case 24: } } break; -case 25: -#line 760 "parse.y" -{ + + case 26: +#line 764 "parse.y" + { if(strcmp(yyvsp[-3].id,"chunks") == 0) { g_free (chunk_size); if(atoi(yyvsp[-2].id) != 0) @@ -2057,21 +2287,25 @@ case 25: } } break; -case 26: -#line 774 "parse.y" -{ ; } - break; -case 27: -#line 775 "parse.y" -{ ; } - break; -case 28: + + case 27: #line 778 "parse.y" -{ ; } + { ; } break; -case 29: + + case 28: #line 779 "parse.y" -{ + { ; } + break; + + case 29: +#line 782 "parse.y" + { ; } + break; + + case 30: +#line 783 "parse.y" + { if (strcmp (yyvsp[-1].id, "BonoboObject") != 0) { g_free (yyvsp[-1].id); yyerror (_("parse error")); @@ -2081,9 +2315,10 @@ case 29: last_added_method->bonobo_object_func = TRUE; } break; -case 30: -#line 788 "parse.y" -{ + + case 31: +#line 792 "parse.y" + { if (strcmp (yyvsp[-2].id, "interface") != 0) { g_free (yyvsp[-2].id); g_free (yyvsp[-1].id); @@ -2096,41 +2331,50 @@ case 30: NULL); } break; -case 31: -#line 800 "parse.y" -{ ; } - break; -case 32: -#line 801 "parse.y" -{ ; } - break; -case 33: -#line 802 "parse.y" -{ ; } + + case 32: +#line 804 "parse.y" + { ; } break; -case 34: -#line 803 "parse.y" -{ ; } + + case 33: +#line 805 "parse.y" + { ; } break; -case 35: + + case 34: #line 806 "parse.y" -{ the_scope = PUBLIC_SCOPE; } + { ; } break; -case 36: + + case 35: #line 807 "parse.y" -{ the_scope = PRIVATE_SCOPE; } + { ; } break; -case 37: -#line 808 "parse.y" -{ the_scope = PROTECTED_SCOPE; } + + case 36: +#line 810 "parse.y" + { the_scope = PUBLIC_SCOPE; } break; -case 38: -#line 809 "parse.y" -{ the_scope = CLASS_SCOPE; } + + case 37: +#line 811 "parse.y" + { the_scope = PRIVATE_SCOPE; } break; -case 39: + + case 38: #line 812 "parse.y" -{ + { the_scope = PROTECTED_SCOPE; } + break; + + case 39: +#line 813 "parse.y" + { the_scope = CLASS_SCOPE; } + break; + + case 40: +#line 816 "parse.y" + { if (strcmp (yyvsp[-1].id, "destroywith") == 0) { g_free (yyvsp[-1].id); destructor_unref = FALSE; @@ -2151,9 +2395,10 @@ case 39: } } break; -case 40: -#line 832 "parse.y" -{ + + case 41: +#line 836 "parse.y" + { if (strcmp (yyvsp[-2].id, "destroy") == 0) { g_free(yyvsp[-2].id); destructor_unref = FALSE; @@ -2176,59 +2421,69 @@ case 40: } } break; -case 41: -#line 856 "parse.y" -{ + + case 42: +#line 860 "parse.y" + { initializer = yyvsp[0].id; initializer_line = ccode_line; } break; -case 42: -#line 860 "parse.y" -{ + + case 43: +#line 864 "parse.y" + { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); } break; -case 43: -#line 868 "parse.y" -{ ; } + + case 44: +#line 872 "parse.y" + { ; } break; -case 44: -#line 869 "parse.y" -{ ; } + + case 45: +#line 873 "parse.y" + { ; } break; -case 45: -#line 870 "parse.y" -{ destructor = NULL; } + + case 46: +#line 874 "parse.y" + { destructor = NULL; } break; -case 46: -#line 871 "parse.y" -{ initializer = NULL; } + + case 47: +#line 875 "parse.y" + { initializer = NULL; } break; -case 47: -#line 872 "parse.y" -{ + + case 48: +#line 876 "parse.y" + { destructor = NULL; initializer = NULL; } break; -case 48: -#line 878 "parse.y" -{ + + case 49: +#line 882 "parse.y" + { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); } break; -case 49: -#line 881 "parse.y" -{ + + case 50: +#line 885 "parse.y" + { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); } break; -case 50: -#line 886 "parse.y" -{ + + case 51: +#line 890 "parse.y" + { Node *node = NULL; if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { @@ -2297,9 +2552,10 @@ case 50: } break; -case 51: -#line 954 "parse.y" -{ + + case 52: +#line 958 "parse.y" + { Node *node = NULL; if(strcmp(yyvsp[-3].id, "get") == 0) { Type *type = pop_type(); @@ -2354,9 +2610,10 @@ case 51: } } break; -case 52: -#line 1008 "parse.y" -{ + + case 53: +#line 1012 "parse.y" + { Node *node; char *get, *set = NULL; Variable *var; @@ -2444,9 +2701,10 @@ case 52: class_nodes = g_list_append (class_nodes, node); } break; -case 53: -#line 1097 "parse.y" -{ + + case 54: +#line 1101 "parse.y" + { if (strcmp (yyvsp[-1].id, "export")!=0) { g_free (yyvsp[-1].id); yyerror (_("parse error")); @@ -2455,15 +2713,17 @@ case 53: yyval.id = yyvsp[-1].id; } break; -case 54: -#line 1105 "parse.y" -{ + + case 55: +#line 1109 "parse.y" + { yyval.id = NULL; } break; -case 55: -#line 1110 "parse.y" -{ + + case 56: +#line 1114 "parse.y" + { ensure_property (); node_set ((Node *)property, "line_no", yyvsp[-10].line, @@ -2512,9 +2772,10 @@ case 55: } } break; -case 56: -#line 1158 "parse.y" -{ + + case 57: +#line 1162 "parse.y" + { ensure_property (); node_set ((Node *)property, "line_no", yyvsp[-7].line, @@ -2551,9 +2812,10 @@ case 56: } } break; -case 57: -#line 1194 "parse.y" -{ + + case 58: +#line 1198 "parse.y" + { ensure_property (); node_set ((Node *)property, "line_no", yyvsp[-4].line, @@ -2568,29 +2830,35 @@ case 57: } } break; -case 58: -#line 1210 "parse.y" -{ ; } - break; -case 59: -#line 1211 "parse.y" -{ ; } - break; -case 60: + + case 59: #line 1214 "parse.y" -{ ; } + { ; } break; -case 61: + + case 60: #line 1215 "parse.y" -{ ; } + { ; } break; -case 62: + + case 61: #line 1218 "parse.y" -{ yyval.id = yyvsp[0].id; } + { ; } break; -case 63: + + case 62: #line 1219 "parse.y" -{ + { ; } + break; + + case 63: +#line 1222 "parse.y" + { yyval.id = yyvsp[0].id; } + break; + + case 64: +#line 1223 "parse.y" + { if (strcmp (yyvsp[-3].id, "_") != 0) { g_free (yyvsp[-3].id); yyerror(_("parse error")); @@ -2601,71 +2869,80 @@ case 63: g_free (yyvsp[-1].id); } break; -case 64: -#line 1231 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 65: +#line 1235 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 65: -#line 1232 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 66: +#line 1236 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 66: -#line 1235 "parse.y" -{ + + case 67: +#line 1239 "parse.y" + { ensure_property (); node_set ((Node *)property, "nick:steal", yyvsp[0].id, NULL); } break; -case 67: -#line 1241 "parse.y" -{ + + case 68: +#line 1245 "parse.y" + { ensure_property (); node_set ((Node *)property, "blurb:steal", yyvsp[0].id, NULL); } break; -case 68: -#line 1247 "parse.y" -{ + + case 69: +#line 1251 "parse.y" + { ensure_property (); node_set ((Node *)property, "maximum:steal", yyvsp[0].id, NULL); } break; -case 69: -#line 1253 "parse.y" -{ + + case 70: +#line 1257 "parse.y" + { ensure_property (); node_set ((Node *)property, "minimum:steal", yyvsp[0].id, NULL); } break; -case 70: -#line 1259 "parse.y" -{ + + case 71: +#line 1263 "parse.y" + { ensure_property (); node_set ((Node *)property, "default_value:steal", yyvsp[0].id, NULL); } break; -case 71: -#line 1265 "parse.y" -{ + + case 72: +#line 1269 "parse.y" + { ensure_property (); node_set ((Node *)property, "flags:steal", yyvsp[0].list, NULL); } break; -case 72: -#line 1271 "parse.y" -{ + + case 73: +#line 1275 "parse.y" + { Type *type = pop_type (); ensure_property (); node_set ((Node *)property, @@ -2673,99 +2950,110 @@ case 72: NULL); } break; -case 73: -#line 1278 "parse.y" -{ + + case 74: +#line 1282 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 74: -#line 1284 "parse.y" -{ + + case 75: +#line 1288 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 75: -#line 1290 "parse.y" -{ + + case 76: +#line 1294 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 76: -#line 1296 "parse.y" -{ + + case 77: +#line 1300 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 77: -#line 1302 "parse.y" -{ + + case 78: +#line 1306 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 78: -#line 1308 "parse.y" -{ + + case 79: +#line 1312 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 79: -#line 1314 "parse.y" -{ + + case 80: +#line 1318 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 80: -#line 1320 "parse.y" -{ + + case 81: +#line 1324 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 81: -#line 1326 "parse.y" -{ + + case 82: +#line 1330 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 82: -#line 1332 "parse.y" -{ + + case 83: +#line 1336 "parse.y" + { ensure_property (); node_set ((Node *)property, "extra_gtktype:steal", yyvsp[0].id, NULL); } break; -case 83: -#line 1338 "parse.y" -{ + + case 84: +#line 1342 "parse.y" + { ensure_property (); if (strcmp (yyvsp[0].id, "link") == 0) { g_free(yyvsp[0].id); @@ -2784,9 +3072,10 @@ case 83: } } break; -case 84: -#line 1358 "parse.y" -{ + + case 85: +#line 1362 "parse.y" + { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); @@ -2796,36 +3085,42 @@ case 84: yyval.id = debool (yyvsp[-4].id); } break; -case 85: -#line 1367 "parse.y" -{ + + case 86: +#line 1371 "parse.y" + { yyval.id = debool (yyvsp[0].id); typestack = g_list_prepend(typestack,NULL); } break; -case 86: -#line 1373 "parse.y" -{ yyval.list = yyvsp[-1].list; } + + case 87: +#line 1377 "parse.y" + { yyval.list = yyvsp[-1].list; } break; -case 87: -#line 1374 "parse.y" -{ yyval.list = NULL; } + + case 88: +#line 1378 "parse.y" + { yyval.list = NULL; } break; -case 88: -#line 1377 "parse.y" -{ + + case 89: +#line 1381 "parse.y" + { yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); } break; -case 89: -#line 1380 "parse.y" -{ + + case 90: +#line 1384 "parse.y" + { yyval.list = g_list_append(NULL,yyvsp[0].id); } break; -case 90: -#line 1386 "parse.y" -{ + + case 91: +#line 1390 "parse.y" + { Node *node = node_new (TYPE_NODE, "name:steal", yyvsp[-1].id, "pointer:steal", yyvsp[0].id, @@ -2833,184 +3128,216 @@ case 90: typestack = g_list_prepend(typestack,node); } break; -case 91: -#line 1393 "parse.y" -{ + + case 92: +#line 1397 "parse.y" + { Node *node = node_new (TYPE_NODE, "name:steal", yyvsp[0].id, NULL); typestack = g_list_prepend(typestack,node); } break; -case 92: -#line 1402 "parse.y" -{ + + case 93: +#line 1406 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 93: -#line 1405 "parse.y" -{ + + case 94: +#line 1409 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 94: -#line 1408 "parse.y" -{ + + case 95: +#line 1412 "parse.y" + { yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 95: -#line 1412 "parse.y" -{ + + case 96: +#line 1416 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); } break; -case 96: -#line 1416 "parse.y" -{ + + case 97: +#line 1420 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 97: -#line 1420 "parse.y" -{ + + case 98: +#line 1424 "parse.y" + { yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 98: -#line 1425 "parse.y" -{ + + case 99: +#line 1429 "parse.y" + { yyval.id = g_strconcat(yyvsp[-2].id, " ", yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); } break; -case 99: -#line 1433 "parse.y" -{ + + case 100: +#line 1437 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 100: -#line 1437 "parse.y" -{ + + case 101: +#line 1441 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[-1].id); g_free(yyvsp[0].id); } break; -case 101: -#line 1442 "parse.y" -{ + + case 102: +#line 1446 "parse.y" + { yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 102: -#line 1446 "parse.y" -{ + + case 103: +#line 1450 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 103: -#line 1449 "parse.y" -{ + + case 104: +#line 1453 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); g_free(yyvsp[-1].id); } break; -case 104: -#line 1453 "parse.y" -{ + + case 105: +#line 1457 "parse.y" + { yyval.id = g_strdup(yyvsp[0].id); } break; -case 105: -#line 1456 "parse.y" -{ + + case 106: +#line 1460 "parse.y" + { yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); } break; -case 106: -#line 1461 "parse.y" -{ yyval.id = "void"; } - break; -case 107: -#line 1462 "parse.y" -{ yyval.id = "char"; } - break; -case 108: -#line 1463 "parse.y" -{ yyval.id = "short"; } - break; -case 109: -#line 1464 "parse.y" -{ yyval.id = "int"; } - break; -case 110: + + case 107: #line 1465 "parse.y" -{ yyval.id = "long"; } + { yyval.id = "void"; } break; -case 111: + + case 108: #line 1466 "parse.y" -{ yyval.id = "float"; } + { yyval.id = "char"; } break; -case 112: + + case 109: #line 1467 "parse.y" -{ yyval.id = "double"; } + { yyval.id = "short"; } break; -case 113: + + case 110: #line 1468 "parse.y" -{ yyval.id = "signed"; } + { yyval.id = "int"; } + break; + + case 111: +#line 1469 "parse.y" + { yyval.id = "long"; } + break; + + case 112: +#line 1470 "parse.y" + { yyval.id = "float"; } break; -case 114: -#line 1469 "parse.y" -{ yyval.id = "unsigned"; } + + case 113: +#line 1471 "parse.y" + { yyval.id = "double"; } break; -case 115: + + case 114: #line 1472 "parse.y" -{ yyval.id = "struct"; } + { yyval.id = "signed"; } break; -case 116: + + case 115: #line 1473 "parse.y" -{ yyval.id = "union"; } + { yyval.id = "unsigned"; } break; -case 117: -#line 1474 "parse.y" -{ yyval.id = "enum"; } + + case 116: +#line 1476 "parse.y" + { yyval.id = "struct"; } break; -case 118: + + case 117: #line 1477 "parse.y" -{ yyval.id = g_strdup("*"); } + { yyval.id = "union"; } break; -case 119: + + case 118: #line 1478 "parse.y" -{ yyval.id = g_strdup("* const"); } + { yyval.id = "enum"; } break; -case 120: -#line 1479 "parse.y" -{ + + case 119: +#line 1481 "parse.y" + { yyval.id = g_strdup("*"); } + break; + + case 120: +#line 1482 "parse.y" + { yyval.id = g_strdup("* const"); } + break; + + case 121: +#line 1483 "parse.y" + { yyval.id = g_strconcat("*", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 121: -#line 1483 "parse.y" -{ + + case 122: +#line 1487 "parse.y" + { yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); g_free(yyvsp[0].id); } break; -case 122: -#line 1490 "parse.y" -{ + + case 123: +#line 1494 "parse.y" + { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; else if(strcmp(yyvsp[-1].id, "last")==0) @@ -3023,15 +3350,17 @@ case 122: g_free(yyvsp[-1].id); } break; -case 123: -#line 1502 "parse.y" -{ + + case 124: +#line 1506 "parse.y" + { yyval.sigtype = SIGNAL_LAST_METHOD; } break; -case 124: -#line 1508 "parse.y" -{ + + case 125: +#line 1512 "parse.y" + { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; else if(strcmp(yyvsp[-1].id,"last")==0) @@ -3044,9 +3373,10 @@ case 124: g_free(yyvsp[-1].id); } break; -case 125: -#line 1520 "parse.y" -{ + + case 126: +#line 1524 "parse.y" + { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; else if(strcmp(yyvsp[-2].id,"last")==0) @@ -3059,48 +3389,56 @@ case 125: g_free(yyvsp[-2].id); } break; -case 126: -#line 1532 "parse.y" -{ + + case 127: +#line 1536 "parse.y" + { yyval.sigtype = SIGNAL_LAST_METHOD; } break; -case 127: -#line 1535 "parse.y" -{ + + case 128: +#line 1539 "parse.y" + { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; } break; -case 128: -#line 1541 "parse.y" -{ + + case 129: +#line 1545 "parse.y" + { gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id)); } break; -case 129: -#line 1546 "parse.y" -{ + + case 130: +#line 1550 "parse.y" + { gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); } break; -case 130: -#line 1549 "parse.y" -{ + + case 131: +#line 1553 "parse.y" + { gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); } break; -case 131: -#line 1554 "parse.y" -{ yyval.cbuf = yyvsp[0].cbuf; } - break; -case 132: -#line 1555 "parse.y" -{ yyval.cbuf = NULL; } + + case 132: +#line 1558 "parse.y" + { yyval.cbuf = yyvsp[0].cbuf; } break; -case 133: + + case 133: #line 1559 "parse.y" -{ + { yyval.cbuf = NULL; } + break; + + case 134: +#line 1563 "parse.y" + { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); @@ -3117,9 +3455,10 @@ case 133: ccode_line, vararg, yyvsp[-8].list); } break; -case 134: -#line 1575 "parse.y" -{ + + case 135: +#line 1579 "parse.y" + { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); @@ -3136,9 +3475,10 @@ case 134: ccode_line, vararg, yyvsp[-8].list); } break; -case 135: -#line 1591 "parse.y" -{ + + case 136: +#line 1595 "parse.y" + { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); @@ -3155,9 +3495,10 @@ case 135: ccode_line, vararg, NULL); } break; -case 136: -#line 1607 "parse.y" -{ + + case 137: +#line 1611 "parse.y" + { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); @@ -3174,9 +3515,10 @@ case 136: ccode_line, vararg, NULL); } break; -case 137: -#line 1623 "parse.y" -{ + + case 138: +#line 1627 "parse.y" + { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); @@ -3188,18 +3530,20 @@ case 137: ccode_line, vararg, NULL); } break; -case 138: -#line 1634 "parse.y" -{ + + case 139: +#line 1638 "parse.y" + { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-10].line, ccode_line, vararg, NULL); } break; -case 139: -#line 1640 "parse.y" -{ + + case 140: +#line 1644 "parse.y" + { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); free_all_global_state(); @@ -3210,9 +3554,10 @@ case 139: vararg, NULL); } break; -case 140: -#line 1650 "parse.y" -{ + + case 141: +#line 1654 "parse.y" + { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, @@ -3234,9 +3579,10 @@ case 140: } } break; -case 141: -#line 1673 "parse.y" -{ + + case 142: +#line 1677 "parse.y" + { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { @@ -3248,9 +3594,10 @@ case 141: g_free(yyvsp[-1].id); } break; -case 142: -#line 1684 "parse.y" -{ + + case 143: +#line 1688 "parse.y" + { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { @@ -3270,31 +3617,36 @@ case 142: g_free(yyvsp[-1].id); } break; -case 143: -#line 1703 "parse.y" -{ + + case 144: +#line 1707 "parse.y" + { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; } break; -case 144: -#line 1709 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 145: +#line 1713 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 145: -#line 1710 "parse.y" -{ + + case 146: +#line 1714 "parse.y" + { yyval.id = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf, FALSE); } break; -case 146: -#line 1716 "parse.y" -{ vararg = FALSE; has_self = FALSE; } + + case 147: +#line 1720 "parse.y" + { vararg = FALSE; has_self = FALSE; } break; -case 147: -#line 1717 "parse.y" -{ + + case 148: +#line 1721 "parse.y" + { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) @@ -3306,9 +3658,10 @@ case 147: } } break; -case 148: -#line 1728 "parse.y" -{ + + case 149: +#line 1732 "parse.y" + { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[-1].id,"self")==0) @@ -3320,9 +3673,10 @@ case 148: } } break; -case 149: -#line 1739 "parse.y" -{ + + case 150: +#line 1743 "parse.y" + { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) @@ -3334,9 +3688,10 @@ case 149: } } break; -case 150: -#line 1750 "parse.y" -{ + + case 151: +#line 1754 "parse.y" + { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) push_self(yyvsp[-2].id, FALSE); @@ -3347,9 +3702,10 @@ case 150: } } break; -case 151: -#line 1760 "parse.y" -{ + + case 152: +#line 1764 "parse.y" + { has_self = TRUE; if(strcmp(yyvsp[-3].id,"self")==0) push_self(yyvsp[-3].id, TRUE); @@ -3360,9 +3716,10 @@ case 151: } } break; -case 152: -#line 1770 "parse.y" -{ + + case 153: +#line 1774 "parse.y" + { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) push_self(yyvsp[-2].id, TRUE); @@ -3373,41 +3730,49 @@ case 152: } } break; -case 153: -#line 1780 "parse.y" -{ has_self = FALSE; } - break; -case 154: -#line 1783 "parse.y" -{ vararg = TRUE; } - break; -case 155: + + case 154: #line 1784 "parse.y" -{ vararg = FALSE; } + { has_self = FALSE; } break; -case 156: + + case 155: #line 1787 "parse.y" -{ ; } + { vararg = TRUE; } break; -case 157: + + case 156: #line 1788 "parse.y" -{ ; } + { vararg = FALSE; } break; -case 158: + + case 157: #line 1791 "parse.y" -{ + { ; } + break; + + case 158: +#line 1792 "parse.y" + { ; } + break; + + case 159: +#line 1795 "parse.y" + { push_funcarg(yyvsp[0].id,NULL); } break; -case 159: -#line 1794 "parse.y" -{ + + case 160: +#line 1798 "parse.y" + { push_funcarg(yyvsp[-1].id,yyvsp[0].id); } break; -case 160: -#line 1797 "parse.y" -{ + + case 161: +#line 1801 "parse.y" + { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); YYERROR; @@ -3416,9 +3781,10 @@ case 160: push_funcarg(yyvsp[-4].id,NULL); } break; -case 161: -#line 1805 "parse.y" -{ + + case 162: +#line 1809 "parse.y" + { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); YYERROR; @@ -3427,17 +3793,20 @@ case 161: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); } break; -case 162: -#line 1815 "parse.y" -{ ; } + + case 163: +#line 1819 "parse.y" + { ; } break; -case 163: -#line 1816 "parse.y" -{ ; } + + case 164: +#line 1820 "parse.y" + { ; } break; -case 164: -#line 1819 "parse.y" -{ + + case 165: +#line 1823 "parse.y" + { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = node_new (CHECK_NODE, "chtype", TYPE_CHECK, @@ -3455,9 +3824,10 @@ case 164: g_free(yyvsp[0].id); } break; -case 165: -#line 1836 "parse.y" -{ + + case 166: +#line 1840 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", GT_CHECK, "number:steal", yyvsp[0].id, @@ -3465,9 +3835,10 @@ case 165: checks = g_list_append(checks,node); } break; -case 166: -#line 1843 "parse.y" -{ + + case 167: +#line 1847 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", LT_CHECK, "number:steal", yyvsp[0].id, @@ -3475,9 +3846,10 @@ case 166: checks = g_list_append(checks,node); } break; -case 167: -#line 1850 "parse.y" -{ + + case 168: +#line 1854 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", GE_CHECK, "number:steal", yyvsp[0].id, @@ -3485,9 +3857,10 @@ case 167: checks = g_list_append(checks,node); } break; -case 168: -#line 1857 "parse.y" -{ + + case 169: +#line 1861 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", LE_CHECK, "number:steal", yyvsp[0].id, @@ -3495,9 +3868,10 @@ case 168: checks = g_list_append(checks,node); } break; -case 169: -#line 1864 "parse.y" -{ + + case 170: +#line 1868 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", EQ_CHECK, "number:steal", yyvsp[0].id, @@ -3505,9 +3879,10 @@ case 169: checks = g_list_append(checks,node); } break; -case 170: -#line 1871 "parse.y" -{ + + case 171: +#line 1875 "parse.y" + { Node *node = node_new (CHECK_NODE, "chtype", NE_CHECK, "number:steal", yyvsp[0].id, @@ -3515,9 +3890,10 @@ case 170: checks = g_list_append(checks,node); } break; -case 171: -#line 1880 "parse.y" -{ + + case 172: +#line 1884 "parse.y" + { Node *node = node_new (ENUMDEF_NODE, "etype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-5].id, @@ -3527,9 +3903,10 @@ case 171: nodes = g_list_append (nodes, node); } break; -case 172: -#line 1889 "parse.y" -{ + + case 173: +#line 1893 "parse.y" + { Node *node = node_new (ENUMDEF_NODE, "etype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-6].id, @@ -3539,17 +3916,20 @@ case 172: nodes = g_list_append (nodes, node); } break; -case 173: -#line 1900 "parse.y" -{;} + + case 174: +#line 1904 "parse.y" + {;} break; -case 174: -#line 1901 "parse.y" -{;} + + case 175: +#line 1905 "parse.y" + {;} break; -case 175: -#line 1904 "parse.y" -{ + + case 176: +#line 1908 "parse.y" + { Node *node; char *num = yyvsp[0].id; @@ -3570,9 +3950,10 @@ case 175: enum_vals = g_list_append (enum_vals, node); } break; -case 176: -#line 1924 "parse.y" -{ + + case 177: +#line 1928 "parse.y" + { Node *node; node = node_new (ENUMVALUE_NODE, @@ -3581,9 +3962,10 @@ case 176: enum_vals = g_list_append (enum_vals, node); } break; -case 177: -#line 1934 "parse.y" -{ + + case 178: +#line 1938 "parse.y" + { Node *node = node_new (FLAGS_NODE, "ftype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-5].id, @@ -3593,9 +3975,10 @@ case 177: nodes = g_list_append (nodes, node); } break; -case 178: -#line 1943 "parse.y" -{ + + case 179: +#line 1947 "parse.y" + { Node *node = node_new (FLAGS_NODE, "ftype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-6].id, @@ -3605,21 +3988,24 @@ case 178: nodes = g_list_append (nodes, node); } break; -case 179: -#line 1954 "parse.y" -{ + + case 180: +#line 1958 "parse.y" + { flag_vals = g_list_append (flag_vals, yyvsp[0].id); } break; -case 180: -#line 1957 "parse.y" -{ + + case 181: +#line 1961 "parse.y" + { flag_vals = g_list_append (flag_vals, yyvsp[0].id); } break; -case 181: -#line 1962 "parse.y" -{ + + case 182: +#line 1966 "parse.y" + { Node *node = node_new (ERROR_NODE, "etype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-5].id, @@ -3629,9 +4015,10 @@ case 181: nodes = g_list_append (nodes, node); } break; -case 182: -#line 1971 "parse.y" -{ + + case 183: +#line 1975 "parse.y" + { Node *node = node_new (ERROR_NODE, "etype:steal", yyvsp[-1].id, "prefix:steal", yyvsp[-6].id, @@ -3641,63 +4028,58 @@ case 182: nodes = g_list_append (nodes, node); } break; -case 183: -#line 1982 "parse.y" -{ + + case 184: +#line 1986 "parse.y" + { error_vals = g_list_append (error_vals, yyvsp[0].id); } break; -case 184: -#line 1985 "parse.y" -{ + + case 185: +#line 1989 "parse.y" + { error_vals = g_list_append (error_vals, yyvsp[0].id); } break; -case 185: -#line 1991 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 186: +#line 1995 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 186: -#line 1992 "parse.y" -{ + + case 187: +#line 1996 "parse.y" + { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); } break; -case 187: -#line 1996 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 188: +#line 2000 "parse.y" + { yyval.id = yyvsp[0].id; } break; -case 188: -#line 1997 "parse.y" -{ yyval.id = yyvsp[0].id; } + + case 189: +#line 2001 "parse.y" + { yyval.id = yyvsp[0].id; } break; -} -#line 705 "/usr/share/bison/bison.simple" + } + +/* Line 1000 of yacc.c. */ +#line 4074 "parse.c" yyvsp -= yylen; yyssp -= yylen; -#if YYLSP_NEEDED - yylsp -= yylen; -#endif -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; -#if YYLSP_NEEDED - *++yylsp = yyloc; -#endif + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule @@ -3705,11 +4087,11 @@ case 188: yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTBASE]; + yystate = yydefgoto[yyn - YYNTOKENS]; goto yynewstate; @@ -3722,145 +4104,151 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; - -#ifdef YYERROR_VERBOSE +#if YYERROR_VERBOSE yyn = yypact[yystate]; - if (yyn > YYFLAG && yyn < YYLAST) + if (YYPACT_NINF < yyn && yyn < YYLAST) { YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); + const char* yyprefix; char *yymsg; - int yyx, yycount; + int yyx; - yycount = 0; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 0; + + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } + } + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); if (yycount < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) - if (yycheck[yyx + yyn] == yyx) + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yyprefix); yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + yyprefix = " or "; } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - yyerror ("parse error; also virtual memory exhausted"); + yyerror ("syntax error; also virtual memory exhausted"); } else -#endif /* defined (YYERROR_VERBOSE) */ - yyerror ("parse error"); +#endif /* YYERROR_VERBOSE */ + yyerror ("syntax error"); } - goto yyerrlab1; -/*--------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action | -`--------------------------------------------------*/ -yyerrlab1: + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yychar, yytname[yychar1])); - yychar = YYEMPTY; + if (yychar <= YYEOF) + { + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ + if (yychar == YYEOF) + for (;;) + { + YYPOPSTACK; + if (yyssp == yyss) + YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + } + } + else + { + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + + } } /* Else will try to reuse lookahead token after shifting the error token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; + goto yyerrlab1; -/*-------------------------------------------------------------------. -| yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -yyerrdefault: -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: - /* If its default is to accept any token, ok. Otherwise pop it. */ - yyn = yydefact[yystate]; - if (yyn) - goto yydefault; +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) + goto yyerrorlab; #endif + yyvsp -= yylen; + yyssp -= yylen; + yystate = *yyssp; + goto yyerrlab1; -/*---------------------------------------------------------------. -| yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -yyerrpop: - if (yyssp == yyss) - YYABORT; - yyvsp--; - yystate = *--yyssp; -#if YYLSP_NEEDED - yylsp--; -#endif -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ -/*--------------. -| yyerrhandle. | -`--------------*/ -yyerrhandle: - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + YYPOPSTACK; + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); } - else if (yyn == 0) - goto yyerrpop; if (yyn == YYFINAL) YYACCEPT; @@ -3868,9 +4256,7 @@ yyerrhandle: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif + yystate = yyn; goto yynewstate; @@ -3890,13 +4276,15 @@ yyabortlab: yyresult = 1; goto yyreturn; -/*---------------------------------------------. -| yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ +#ifndef yyoverflow +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ yyoverflowlab: yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ +#endif yyreturn: #ifndef yyoverflow @@ -3905,5 +4293,8 @@ yyreturn: #endif return yyresult; } -#line 2000 "parse.y" + + +#line 2004 "parse.y" + diff --git a/src/parse.h b/src/parse.h index ff21709..8454d8a 100644 --- a/src/parse.h +++ b/src/parse.h @@ -1,69 +1,157 @@ -#ifndef BISON_PARSE_H -# define BISON_PARSE_H +/* A Bison parser, made by GNU Bison 1.875c. */ -#ifndef YYSTYPE -typedef union { +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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. */ + +/* 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. */ + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + CLASS = 258, + FROM = 259, + CONST = 260, + VOID = 261, + STRUCT = 262, + UNION = 263, + ENUM = 264, + THREEDOTS = 265, + SIGNED = 266, + UNSIGNED = 267, + LONG = 268, + SHORT = 269, + INT = 270, + FLOAT = 271, + DOUBLE = 272, + CHAR = 273, + TOKEN = 274, + NUMBER = 275, + TYPETOKEN = 276, + ARRAY_DIM = 277, + SINGLE_CHAR = 278, + CCODE = 279, + HTCODE = 280, + PHCODE = 281, + HCODE = 282, + ACODE = 283, + ATCODE = 284, + STRING = 285, + PUBLIC = 286, + PRIVATE = 287, + PROTECTED = 288, + CLASSWIDE = 289, + PROPERTY = 290, + ARGUMENT = 291, + VIRTUAL = 292, + SIGNAL = 293, + OVERRIDE = 294, + NICK = 295, + BLURB = 296, + MAXIMUM = 297, + MINIMUM = 298, + DEFAULT_VALUE = 299, + ERROR = 300, + FLAGS = 301, + TYPE = 302, + FLAGS_TYPE = 303, + ENUM_TYPE = 304, + PARAM_TYPE = 305, + BOXED_TYPE = 306, + OBJECT_TYPE = 307 + }; +#endif +#define CLASS 258 +#define FROM 259 +#define CONST 260 +#define VOID 261 +#define STRUCT 262 +#define UNION 263 +#define ENUM 264 +#define THREEDOTS 265 +#define SIGNED 266 +#define UNSIGNED 267 +#define LONG 268 +#define SHORT 269 +#define INT 270 +#define FLOAT 271 +#define DOUBLE 272 +#define CHAR 273 +#define TOKEN 274 +#define NUMBER 275 +#define TYPETOKEN 276 +#define ARRAY_DIM 277 +#define SINGLE_CHAR 278 +#define CCODE 279 +#define HTCODE 280 +#define PHCODE 281 +#define HCODE 282 +#define ACODE 283 +#define ATCODE 284 +#define STRING 285 +#define PUBLIC 286 +#define PRIVATE 287 +#define PROTECTED 288 +#define CLASSWIDE 289 +#define PROPERTY 290 +#define ARGUMENT 291 +#define VIRTUAL 292 +#define SIGNAL 293 +#define OVERRIDE 294 +#define NICK 295 +#define BLURB 296 +#define MAXIMUM 297 +#define MINIMUM 298 +#define DEFAULT_VALUE 299 +#define ERROR 300 +#define FLAGS 301 +#define TYPE 302 +#define FLAGS_TYPE 303 +#define ENUM_TYPE 304 +#define PARAM_TYPE 305 +#define BOXED_TYPE 306 +#define OBJECT_TYPE 307 + + + + +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#line 623 "parse.y" +typedef union YYSTYPE { char *id; GString *cbuf; GList *list; int line; int sigtype; -} yystype; -# define YYSTYPE yystype +} YYSTYPE; +/* Line 1275 of yacc.c. */ +#line 149 "y.tab.h" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -# define CLASS 257 -# define FROM 258 -# define CONST 259 -# define VOID 260 -# define STRUCT 261 -# define UNION 262 -# define ENUM 263 -# define THREEDOTS 264 -# define SIGNED 265 -# define UNSIGNED 266 -# define LONG 267 -# define SHORT 268 -# define INT 269 -# define FLOAT 270 -# define DOUBLE 271 -# define CHAR 272 -# define TOKEN 273 -# define NUMBER 274 -# define TYPETOKEN 275 -# define ARRAY_DIM 276 -# define SINGLE_CHAR 277 -# define CCODE 278 -# define HTCODE 279 -# define PHCODE 280 -# define HCODE 281 -# define ACODE 282 -# define ATCODE 283 -# define STRING 284 -# define PUBLIC 285 -# define PRIVATE 286 -# define PROTECTED 287 -# define CLASSWIDE 288 -# define PROPERTY 289 -# define ARGUMENT 290 -# define VIRTUAL 291 -# define SIGNAL 292 -# define OVERRIDE 293 -# define NICK 294 -# define BLURB 295 -# define MAXIMUM 296 -# define MINIMUM 297 -# define DEFAULT_VALUE 298 -# define ERROR 299 -# define FLAGS 300 -# define TYPE 301 -# define FLAGS_TYPE 302 -# define ENUM_TYPE 303 -# define PARAM_TYPE 304 -# define BOXED_TYPE 305 -# define OBJECT_TYPE 306 - extern YYSTYPE yylval; -#endif /* not BISON_PARSE_H */ + + diff --git a/src/parse.y b/src/parse.y index 917476a..ded33fd 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1,6 +1,7 @@ /* GOB C Preprocessor * Copyright (C) 1999-2000 the Free Software Foundation. - * Copyright (C) 2001 George Lebl + * Copyright (C) 2000 Eazel, Inc. + * Copyright (C) 2001-2004 George (Jiri) Lebl * * Author: George Lebl * @@ -77,6 +78,7 @@ int yylex(void); extern int ccode_line; extern int line_no; +extern gboolean for_cpp; extern char *yytext; @@ -551,14 +553,16 @@ property_link_and_export (Node *node) get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype); g_strdown (get_func); - if (strcmp (prop->gtktype, "FLAGS") == 0) { - setcast = "(guint) "; - getcast = to_free = - get_prop_enum_flag_cast (prop); - } else if (strcmp (prop->gtktype, "ENUM") == 0) { - setcast = "(gint) "; - getcast = to_free = - get_prop_enum_flag_cast (prop); + if (for_cpp) { + if (strcmp (prop->gtktype, "FLAGS") == 0) { + setcast = "(guint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } else if (strcmp (prop->gtktype, "ENUM") == 0) { + setcast = "(gint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } } set = g_strdup_printf("%s->%s = %s%s (VAL);", diff --git a/src/test.gob b/src/test.gob index 8146a72..a885f4f 100644 --- a/src/test.gob +++ b/src/test.gob @@ -84,6 +84,14 @@ error TEST_OBJECT_ERROR { BAD_THAT } Test:Object:Error; +enum BUBLE { + KEIN = 0, + STANDARD, + STANDARD_RO, + KOMPLETT, + ALT +} Buble:Enum; + class Test:Object from G:Object (interface Gtk:Tree:Model) /* We can add more interfaces by adding more lines like the above */ @@ -196,18 +204,18 @@ class Test:Object from G:Object link); private Some:Flags flags_property; - property ENUM flags_property (nick = "flagsprop", + property FLAGS flags_property (nick = "flagsprop", blurb = "flagsprop", flags_type = Some:Flags, link); - private PackageBoxed *prop; + private PackageBoxed prop; property BOXED prop (nick="prop", blurb="prop", boxed_type=Package:Boxed, link); /* testing old semantics */ - private PackageBoxed *prop2; + private PackageBoxed prop2; property BOXED prop2 (nick="prop2", blurb="prop2", boxed_type=PACKAGE_TYPE_BOXED, @@ -269,6 +277,9 @@ class Test:Object from G:Object char * test_handler (self, GObject *w, int h, gpointer data) { + data = w = NULL; + h = 0; + return NULL; } @@ -292,6 +303,9 @@ class Test:Object from G:Object test_object_connect_data__bleh (self, self_test_handler, NULL, NULL, 0); self_connect_data__bleh (self, self_test_handler, NULL, NULL, 0); + wid = NULL; + h = 0; + /* testing multiple marshaller support */ return 0; } @@ -332,14 +346,17 @@ class Test:Object from G:Object }*/ public int consttest(self, const gchar *text, ...) { + text = NULL; return 25; } public int consttest2(self, gchar const *text, ...) { + text = NULL; return 25; } public int consttest3(self, G:Object const *wid (check null type)) { + wid = NULL; return 25; } public int consttest4(const self) @@ -367,10 +384,14 @@ class Test:Object from G:Object } public int consttest9(const self, int i, double b) { + b = 0.0; + i = 0; return 25; } public int consttest10(self const, int i, double b) { + b = 0.0; + i = 0; return 25; } signal private first NONE (NONE) @@ -412,26 +433,32 @@ class Test:Object from G:Object { puts("TEST3"); self_googlegoogle(self); + if (some_array[0]) return; } private virtual void testprivvirtual2(self, const int some_array[5][8][9]) { /* nothing here */ + if (some_array[0]) return; } public virtual void testpublicvirtual(self, int const some_array[5][8][9]) { /* nothing here */ + if (some_array[0]) return; } protected virtual void testprotectedvirtual(self, int some_array[5][8][9]) { /* nothing here */ + if (some_array[0]) return; } - signal first NONE (POINTER) - void testarrsignal(self, long arr[8]) + signal first NONE (POINTER, ENUM) + void testarrsignal(self, long arr[8], Buble:Enum foo) { /* foo */ + arr[0] = 1; + foo = BUBLE_KEIN; } /* testing empty func */ @@ -481,6 +508,10 @@ class Test:Object from G:Object gulong g, gfloat h, gdouble i, gchar * j, gint k, gpointer o, GObject *p) { + h = i = k = 0; + a = b = c = d = e = f = g = 0; + o = p = (GObject *)NULL; + j = (char *)NULL; /* ugh, testing casting */ } @@ -498,6 +529,15 @@ class Test:Object from G:Object return FALSE; } + /* some more enum testing */ + public BubleEnum buble; + property ENUM buble + (nick = "Buble", + blurb = "Buble", + enum_type = Buble:Enum, + default_value = BUBLE_STANDARD, + link, export); + /* testing types */ public int t1; public long int t2; -- 2.43.0