From 5cf778c4e6d93c2d0d0e899480d2ae480df34609 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 11 Feb 2007 07:45:57 +0100 Subject: [PATCH] * Update to xkbcomp 1.0.3. --- debian/changelog | 3 +- xkbcomp/Makefile.in | 480 +++++---- xkbcomp/README.config | 2 +- xkbcomp/README.enhancing | 2 +- xkbcomp/aclocal.m4 | 1828 +++++++++++++++++----------------- xkbcomp/compat.c | 2 +- xkbcomp/config.guess | 56 +- xkbcomp/config.sub | 47 +- xkbcomp/configure | 237 +++-- xkbcomp/configure.ac | 2 +- xkbcomp/expr.c | 2 +- xkbcomp/mkinstalldirs | 111 --- xkbcomp/xkbparse.c | 1990 +++++++++++++++++++++----------------- xkbcomp/xkbparse.y | 8 +- 14 files changed, 2545 insertions(+), 2225 deletions(-) delete mode 100755 xkbcomp/mkinstalldirs diff --git a/debian/changelog b/debian/changelog index 95b13f8..7557bb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low * Update to xf86dga 1.0.2. * Update to xfontsel 1.0.2. * Update to xinit 1.0.3. + * Update to xkbcomp 1.0.3. - -- Julien Cristau Sun, 11 Feb 2007 07:41:59 +0100 + -- Julien Cristau Sun, 11 Feb 2007 07:45:30 +0100 xbase-clients (1:7.1.ds1-2) unstable; urgency=low diff --git a/xkbcomp/Makefile.in b/xkbcomp/Makefile.in index 5903b90..45a6102 100644 --- a/xkbcomp/Makefile.in +++ b/xkbcomp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -35,6 +35,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -42,7 +43,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -56,12 +56,76 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +bin_PROGRAMS = xkbcomp$(EXEEXT) +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + config.guess config.sub depcomp install-sh missing xkbparse.c +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_xkbcomp_OBJECTS = action.$(OBJEXT) alias.$(OBJEXT) compat.$(OBJEXT) \ + expr.$(OBJEXT) geometry.$(OBJEXT) indicators.$(OBJEXT) \ + keycodes.$(OBJEXT) keymap.$(OBJEXT) keytypes.$(OBJEXT) \ + listing.$(OBJEXT) misc.$(OBJEXT) parseutils.$(OBJEXT) \ + symbols.$(OBJEXT) utils.$(OBJEXT) vmod.$(OBJEXT) \ + xkbcomp.$(OBJEXT) xkbparse.$(OBJEXT) xkbpath.$(OBJEXT) \ + xkbscan.$(OBJEXT) +xkbcomp_OBJECTS = $(am_xkbcomp_OBJECTS) +am__DEPENDENCIES_1 = +xkbcomp_DEPENDENCIES = $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +SOURCES = $(xkbcomp_SOURCES) +DIST_SOURCES = $(xkbcomp_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +appmanDATA_INSTALL = $(INSTALL_DATA) +DATA = $(appman_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMCMDECHO = @AMCMDECHO@ +AMDEPSHOWCMDSAT = @AMDEPSHOWCMDSAT@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ +AMPRETTYECHO = @AMPRETTYECHO@ +AMSHOWCMDSAT = @AMSHOWCMDSAT@ AMTAR = @AMTAR@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -94,6 +158,7 @@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +LT_QUIET = @LT_QUIET@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ @@ -123,6 +188,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -148,6 +215,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -157,12 +225,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -bin_PROGRAMS = xkbcomp - AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"' xkbcomp_LDADD = $(XKBCOMP_LIBS) - xkbcomp_SOURCES = \ action.c \ action.h \ @@ -197,30 +261,20 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c - appman_PRE = \ xkbcomp.man - BUILT_SOURCES = xkbparse.c MAINTAINERCLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - README.config \ - README.enhancing\ -$(appman_PRE) - +EXTRA_DIST = README.config README.enhancing $(appman_PRE) appmandir = $(APP_MAN_DIR) - appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) CLEANFILES = $(appman_DATA) - SED = sed # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 - MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ @@ -234,75 +288,52 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = xkbcomp$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am_xkbcomp_OBJECTS = action.$(OBJEXT) alias.$(OBJEXT) compat.$(OBJEXT) \ - expr.$(OBJEXT) geometry.$(OBJEXT) indicators.$(OBJEXT) \ - keycodes.$(OBJEXT) keymap.$(OBJEXT) keytypes.$(OBJEXT) \ - listing.$(OBJEXT) misc.$(OBJEXT) parseutils.$(OBJEXT) \ - symbols.$(OBJEXT) utils.$(OBJEXT) vmod.$(OBJEXT) \ - xkbcomp.$(OBJEXT) xkbparse.$(OBJEXT) xkbpath.$(OBJEXT) \ - xkbscan.$(OBJEXT) -xkbcomp_OBJECTS = $(am_xkbcomp_OBJECTS) -xkbcomp_DEPENDENCIES = -xkbcomp_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/action.Po ./$(DEPDIR)/alias.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/compat.Po ./$(DEPDIR)/expr.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/geometry.Po ./$(DEPDIR)/indicators.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/keycodes.Po ./$(DEPDIR)/keymap.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/keytypes.Po ./$(DEPDIR)/listing.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/misc.Po ./$(DEPDIR)/parseutils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/symbols.Po ./$(DEPDIR)/utils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/vmod.Po ./$(DEPDIR)/xkbcomp.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xkbparse.Po ./$(DEPDIR)/xkbpath.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xkbscan.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) -DIST_SOURCES = $(xkbcomp_SOURCES) -DATA = $(appman_DATA) - -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \ - config.guess config.h.in config.sub configure configure.ac \ - depcomp install-sh missing mkinstalldirs xkbparse.c -SOURCES = $(xkbcomp_SOURCES) - all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj .y - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + @AMPRETTYECHO@ ' [AUTOMAKE ] rebuild all'; \ + @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + @AMPRETTYECHO@ ' [AUTOMAKE ] Makefile'; \ + @AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + @AMPRETTYECHO@ ' [SH ] config.status'; \ + @AMCMDECHO@ ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + @AMPRETTYECHO@ ' [SH ] config.status $@'; \ + @AMCMDECHO@ ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + @@AMPRETTYECHO@ ' [SH ] config.status' + @AMSHOWCMDSAT@$(SHELL) ./config.status --recheck -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + @@AMPRETTYECHO@ ' [AUTOCONF ] Regenerate' + @AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + @@AMPRETTYECHO@ ' [ACLOCAL ] Regenerate' + @AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @if test ! -f $@; then \ @@ -312,25 +343,28 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h - -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + @@AMPRETTYECHO@ ' [SH ] Regenerate config.h' + @AMSHOWCMDSAT@cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + @@AMPRETTYECHO@ ' [AUTOHEADER] Regenerate' + @AMSHOWCMDSAT@cd $(top_srcdir) && $(AUTOHEADER) + @AMSHOWCMDSAT@rm -f stamp-h1 + @AMSHOWCMDSAT@touch $@ distclean-hdr: - -rm -f config.h stamp-h1 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + @@AMPRETTYECHO@ ' [RM ] config.h stamp-h1' + @AMSHOWCMDSAT@-rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + @AMSHOWCMDSAT@test -z "$(bindir)" || ( @AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(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; \ + @AMPRETTYECHO@ " [INSTALL ] $$p -> $(DESTDIR)$(bindir)/$$f"; \ + @AMCMDECHO@ " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -338,21 +372,25 @@ 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; \ + @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(bindir)/$$f"; \ + @AMCMDECHO@ " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + @AMSHOWCMDSAT@-test -z "$(bin_PROGRAMS)" || ( @AMPRETTYECHO@ ' [RM ] $(bin_PROGRAMS)'; rm -f $(bin_PROGRAMS) ) xkbcomp$(EXEEXT): $(xkbcomp_OBJECTS) $(xkbcomp_DEPENDENCIES) + @@AMPRETTYECHO@ ' [LD ] xkbcomp$(EXEEXT)' @rm -f xkbcomp$(EXEEXT) - $(LINK) $(xkbcomp_LDFLAGS) $(xkbcomp_OBJECTS) $(xkbcomp_LDADD) $(LIBS) + @AMSHOWCMDSAT@$(LINK) $(xkbcomp_LDFLAGS) $(xkbcomp_OBJECTS) $(xkbcomp_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + @@AMPRETTYECHO@ ' [RM ] *.$(OBJEXT)' + @AMSHOWCMDSAT@-rm -f *.$(OBJEXT) distclean-compile: - -rm -f *.tab.c + @@AMPRETTYECHO@ ' [RM ] *.tab.c' + @AMSHOWCMDSAT@-rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alias.Po@am__quote@ @@ -375,34 +413,30 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkbscan.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + @@AMPRETTYECHO@ ' [C ] $<' +@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ @AMSHOWCMDSAT@source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + @@AMPRETTYECHO@ ' [C ] $<' +@am__fastdepCC_TRUE@ @AMSHOWCMDSAT@if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ @AMSHOWCMDSAT@source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ @AMDEPSHOWCMDSAT@$(COMPILE) -c `$(CYGPATH_W) '$<'` .y.c: - $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< - if test -f y.tab.h; then \ + @@AMPRETTYECHO@ ' [YACC ] %SOURCE' + @AMSHOWCMDSAT@$(YACCCOMPILE) $< + @AMSHOWCMDSAT@if test -f y.tab.h; then \ to=`echo "$*_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ - sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \ + sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \ + y.tab.h >$*.ht; \ rm -f y.tab.h; \ if cmp -s $*.ht $*.h; then \ rm -f $*.ht ;\ @@ -410,51 +444,47 @@ distclean-compile: mv $*.ht $*.h; \ fi; \ fi - if test -f y.output; then \ + @AMSHOWCMDSAT@if test -f y.output; then \ mv y.output $*.output; \ fi - sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ - rm -f y.tab.c + @AMSHOWCMDSAT@sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ + @AMSHOWCMDSAT@rm -f y.tab.c uninstall-info-am: -appmanDATA_INSTALL = $(INSTALL_DATA) install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(appmandir) + @@AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(appmandir)' + @AMSHOWCMDSAT@test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)" @list='$(appman_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f"; \ - $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f; \ + f=$(am__strip_dir) \ + @AMPRETTYECHO@ " [INSTALL ] '$$d$$p' -> '$(DESTDIR)$(appmandir)/$$f'"; \ + @AMCMDECHO@ " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \ + $(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \ done uninstall-appmanDATA: @$(NORMAL_UNINSTALL) @list='$(appman_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(appmandir)/$$f"; \ - rm -f $(DESTDIR)$(appmandir)/$$f; \ + f=$(am__strip_dir) \ + @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(appmandir)/$$f"; \ + @AMCMDECHO@ " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \ + rm -f "$(DESTDIR)$(appmandir)/$$f"; \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + @AMSHOWCMDSAT@list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ + @AMPRETTYECHO@ ' [MKID ] $$unique'; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + @AMSHOWCMDSAT@tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -462,14 +492,16 @@ TAGS: $(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; \ + @AMPRETTYECHO@ " [ETAGS ] $$tags"; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + @AMSHOWCMDSAT@tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -478,33 +510,26 @@ CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + || ( \ + @AMPRETTYECHO@ " [CTAGS ] $$tags"; \ + $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique ) GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ + @@AMPRETTYECHO@ ' [GTAGS ]' + @AMSHOWCMDSAT@here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print + @@AMPRETTYECHO@ ' [RM ] TAGS ID GTAGS GRTAGS GSYMS GPATH tags' + @AMSHOWCMDSAT@-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) + @AMSHOWCMDSAT@$(am__remove_distdir) + @@AMPRETTYECHO@ ' [MKDIR ] $(distdir)' + @AMSHOWCMDSAT@mkdir $(distdir) + @@AMPRETTYECHO@ ' [MKDIR ] ' @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -516,7 +541,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -531,34 +556,68 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + @AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || ( @AMPRETTYECHO@ ' [CHMOD ] a+r $(distdir)'; chmod -R a+r $(distdir) ) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - + @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz' + @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + @AMSHOWCMDSAT@$(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2' + @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + @AMSHOWCMDSAT@$(am__remove_distdir) + +dist-tarZ: distdir + @@AMPRETTYECHO@ ' [TAR.Z ] $(distdir).tar.Z' + @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + @AMSHOWCMDSAT@$(am__remove_distdir) + +dist-shar: distdir + @@AMPRETTYECHO@ ' [SHAR.GZ ] $(distdir).shar.gz' + @AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + @AMSHOWCMDSAT@$(am__remove_distdir) + +dist-zip: distdir + @@AMPRETTYECHO@ ' [ZIP ] $(distdir).zip' + @AMSHOWCMDSAT@-rm -f $(distdir).zip + @AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir) + @AMSHOWCMDSAT@$(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz' + @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2' + @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + @AMSHOWCMDSAT@$(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) + @AMSHOWCMDSAT@case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + @AMPRETTYECHO@ ' [UNTAR.GZ ] $(distdir).tar.gz'; \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + @AMPRETTYECHO@ ' [UNTAR.BZ2 ] $(distdir).tar.bz2'; \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + @AMPRETTYECHO@ ' [UNTAR.Z ] $(distdir).tar.Z'; \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + @AMPRETTYECHO@ ' [UNSHAR.GZ ] $(distdir).shar.gz'; \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + @AMPRETTYECHO@ ' [UNZIP ] $(distdir).zip'; \ + unzip $(distdir).zip ;;\ + esac + @AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir) + @AMSHOWCMDSAT@mkdir $(distdir)/_build + @AMSHOWCMDSAT@mkdir $(distdir)/_inst + @AMSHOWCMDSAT@chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/_build \ @@ -574,19 +633,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$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" \ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -609,9 +669,10 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(DATA) config.h - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(appmandir) + @AMSHOWCMDSAT@for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \ + test -z "$$dir" || ( @AMPRETTYECHO@ " [MKDIR ] $$dir"; $(mkdir_p) "$$dir" ); \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -623,39 +684,49 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + @AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: + @@AMPRETTYECHO@ ' [RM ] $(CLEANFILES)' -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + @@AMPRETTYECHO@ ' [RM ] $(CONFIG_CLEAN_FILES)' + @AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -rm -f xkbparse.c + @@AMPRETTYECHO@ ' [RM ] $(BUILT_SOURCES)' -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + @@AMPRETTYECHO@ ' [RM ] $(MAINTAINERCLEANFILES)' + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + @@AMPRETTYECHO@ ' [RM ] xkbparse.c' + -rm -f xkbparse.c clean: clean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ - distclean-tags + @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)' + @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES) + @@AMPRETTYECHO@ ' [RM ] ./$(DEPDIR)' + @AMSHOWCMDSAT@-rm -rf ./$(DEPDIR) + @@AMPRETTYECHO@ ' [RM ] Makefile' + @AMSHOWCMDSAT@-rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -671,10 +742,14 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) - -rm -f Makefile + @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)' + @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES) + @@AMPRETTYECHO@ ' [RM ] autom4te.cache/' + @AMSHOWCMDSAT@-rm -rf $(top_srcdir)/autom4te.cache + @@AMPRETTYECHO@ ' [RM ] ./$(DEPDIR)' + @AMSHOWCMDSAT@-rm -rf ./$(DEPDIR) + @@AMPRETTYECHO@ ' [RM ] Makefile' + @AMSHOWCMDSAT@-rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -692,11 +767,12 @@ ps-am: uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am info info-am install install-am \ +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ install-appmanDATA install-binPROGRAMS install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ diff --git a/xkbcomp/README.config b/xkbcomp/README.config index 27d82b2..4d3f2d5 100644 --- a/xkbcomp/README.config +++ b/xkbcomp/README.config @@ -193,4 +193,4 @@ ble and allow simpler and more intuitive syntax. It is preserved merely for compatibility reasons. Avoid using it if it is possible. -$XdotOrg: app/xkbcomp/README.config,v 1.3 2004/09/03 23:41:22 kem Exp $ +$XdotOrg$ diff --git a/xkbcomp/README.enhancing b/xkbcomp/README.enhancing index 0c1cd5e..a8456e8 100644 --- a/xkbcomp/README.enhancing +++ b/xkbcomp/README.enhancing @@ -506,4 +506,4 @@ rules file described above the .lst file could look like: And that should be it. Enjoy creating your own xkb mapping. -$XdotOrg: app/xkbcomp/README.enhancing,v 1.3 2004/09/03 23:41:22 kem Exp $ +$XdotOrg$ diff --git a/xkbcomp/aclocal.m4 b/xkbcomp/aclocal.m4 index 3e79bd4..8459d10 100644 --- a/xkbcomp/aclocal.m4 +++ b/xkbcomp/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,893 +11,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 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. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 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 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# 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.7.9])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 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. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# -# Check to make sure that the build environment is sane. -# - -# Copyright 1996, 1997, 2000, 2001 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. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 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. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 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. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 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. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright 2001 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. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# -*- Autoconf -*- -# Copyright (C) 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. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# serial 5 -*- Autoconf -*- - -# Copyright (C) 1999, 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. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > 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 - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - 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 - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 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. - -#serial 2 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - 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"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///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 ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 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. - -# serial 2 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 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. - -# serial 5 - -AC_PREREQ(2.52) - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# Copyright 1996, 1998, 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. - -# serial 2 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright 1996, 1997, 2000, 2001 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. - -AC_PREREQ([2.52]) - -# serial 6 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # # Copyright © 2004 Scott James Remnant . @@ -1136,40 +249,40 @@ AC_REQUIRE([AC_CANONICAL_HOST]) if test x$APP_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; + linux*) APP_MAN_SUFFIX=1x ;; *) APP_MAN_SUFFIX=1 ;; esac fi if test x$APP_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; + linux*) APP_MAN_DIR='$(mandir)/man1' ;; *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; esac fi if test x$LIB_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;; + linux*) LIB_MAN_SUFFIX=3x ;; *) LIB_MAN_SUFFIX=3 ;; esac fi if test x$LIB_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;; + linux*) LIB_MAN_DIR='$(mandir)/man3' ;; *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; esac fi if test x$FILE_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;; + linux*) FILE_MAN_SUFFIX=5x ;; solaris*) FILE_MAN_SUFFIX=4 ;; *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; + linux*) FILE_MAN_DIR='$(mandir)/man5' ;; *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; esac fi @@ -1178,14 +291,14 @@ fi # LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$MISC_MAN_SUFFIX = x ; then case $host_os in -# k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;; +# linux*) MISC_MAN_SUFFIX=7x ;; solaris*) MISC_MAN_SUFFIX=5 ;; *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then case $host_os in -# k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;; +# linux*) MISC_MAN_DIR='$(mandir)/man7' ;; *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; esac fi @@ -1194,14 +307,14 @@ fi # LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$DRIVER_MAN_SUFFIX = x ; then case $host_os in -# k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; +# linux*) DRIVER_MAN_SUFFIX=4x ;; solaris*) DRIVER_MAN_SUFFIX=7 ;; *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then case $host_os in -# k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; +# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;; *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; esac fi @@ -1372,3 +485,918 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ fi ]) +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# 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.9.6])]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 7 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # 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 + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + 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 + # 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 + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 3 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. 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 " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +AC_REQUIRE([AM_PRETTY_CMDS]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# 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 --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + + +# AM_PRETTY_CMDS +# ------------ +AC_DEFUN([AM_PRETTY_CMDS], +[AC_ARG_ENABLE(pretty-cmds, +[ --disable-pretty-cmds show all commands executed + --enable-pretty-cmds do not output the entire command lines]) +AMSHOWCMDSAT='' +AMDEPSHOWCMDSAT='' +AMPRETTYECHO=true +AMCMDECHO=echo +if test "x$enable_pretty_cmds" == xyes; +then + AMSHOWCMDSAT='@' + _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' + AMPRETTYECHO=echo + AMCMDECHO=true + LT_QUIET='--quiet' +fi +AC_SUBST([AMSHOWCMDSAT]) +AC_SUBST([AMDEPSHOWCMDSAT]) +AC_SUBST([AMPRETTYECHO]) +AC_SUBST([AMCMDECHO]) +AC_SUBST([LT_QUIET]) +]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 97e91af..70a6da3 100644 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -583,7 +583,7 @@ SymInterpInfo si; si= info->dflt; si.defs.merge= merge; si.interp.sym= def->sym; - si.interp.match= (si.interp.match&(~XkbSI_OpMask))|(pred&XkbSI_OpMask); + si.interp.match= pred & XkbSI_OpMask; si.interp.mods= mods; if (!HandleInterpBody(def->def,xkb,&si,info)) { info->errorCount++; diff --git a/xkbcomp/config.guess b/xkbcomp/config.guess index 917bbc5..c38553d 100755 --- a/xkbcomp/config.guess +++ b/xkbcomp/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2006-02-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +106,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -764,7 +767,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -772,6 +780,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -779,8 +790,11 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[345]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[345]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -794,7 +808,7 @@ EOF i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -851,7 +865,11 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,9 +888,16 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -916,6 +941,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -961,7 +989,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout @@ -971,7 +999,11 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1182,7 +1214,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1261,6 +1292,9 @@ EOF i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/xkbcomp/config.sub b/xkbcomp/config.sub index 1c366df..ad9f395 100755 --- a/xkbcomp/config.sub +++ b/xkbcomp/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2006-02-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +119,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +172,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +192,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -239,7 +248,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,8 +266,9 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ @@ -286,6 +296,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -336,8 +349,9 @@ case $basic_machine in | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ @@ -696,6 +710,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +820,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +882,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1174,21 +1201,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/xkbcomp/configure b/xkbcomp/configure index 0362eb3..ab1a863 100755 --- a/xkbcomp/configure +++ b/xkbcomp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59e for xkbcomp 1.0.2. +# Generated by GNU Autoconf 2.60 for xkbcomp 1.0.3. # # Report bugs to . # @@ -232,8 +232,8 @@ IFS=$as_save_IFS for as_shell in $as_candidate_shells $SHELL; do - # Try only shells which exist, to save several forks. - if test -f "$as_shell" && + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -559,8 +559,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xkbcomp' PACKAGE_TARNAME='xkbcomp' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='xkbcomp 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='xkbcomp 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -611,13 +611,21 @@ AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO -AMTAR install_sh STRIP INSTALL_STRIP_PROGRAM +mkdir_p AWK SET_MAKE am__leading_dot +AMTAR +am__tar +am__untar +AMSHOWCMDSAT +AMDEPSHOWCMDSAT +AMPRETTYECHO +AMCMDECHO +LT_QUIET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT @@ -1179,7 +1187,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xkbcomp 1.0.2 to adapt to many kinds of systems. +\`configure' configures xkbcomp 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1249,17 +1257,19 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkbcomp 1.0.2:";; + short | recursive ) echo "Configuration of xkbcomp 1.0.3:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-pretty-cmds show all commands executed + --enable-pretty-cmds do not output the entire command lines + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1349,8 +1359,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkbcomp configure 1.0.2 -generated by GNU Autoconf 2.59e +xkbcomp configure 1.0.3 +generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1363,8 +1373,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xkbcomp $as_me 1.0.2, which was -generated by GNU Autoconf 2.59e. Invocation command line was +It was created by xkbcomp $as_me 1.0.3, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1716,7 +1726,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.7" +am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -1886,7 +1896,6 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm -f conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1900,6 +1909,39 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1944,7 +1986,7 @@ done { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'` +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1981,7 +2023,30 @@ else fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# Check whether --enable-pretty-cmds was given. +if test "${enable_pretty_cmds+set}" = set; then + enableval=$enable_pretty_cmds; +fi + +AMSHOWCMDSAT='' +AMDEPSHOWCMDSAT='' +AMPRETTYECHO=true +AMCMDECHO=echo +if test "x$enable_pretty_cmds" == xyes; +then + AMSHOWCMDSAT='@' + test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' + AMPRETTYECHO=echo + AMCMDECHO=true + LT_QUIET='--quiet' +fi + + + + + + +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -2001,7 +2066,7 @@ fi # Define the identity of the package. PACKAGE='xkbcomp' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -2029,9 +2094,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -2140,6 +2202,14 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + @@ -2821,7 +2891,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -3007,13 +3077,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 @@ -3078,6 +3148,11 @@ static char *f (char * (*g) (char **, int), char **p, ...) that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3138,7 +3213,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext @@ -3272,7 +3347,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 @@ -3300,9 +3377,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 @@ -3780,40 +3862,40 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac if test x$APP_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; + linux*) APP_MAN_SUFFIX=1x ;; *) APP_MAN_SUFFIX=1 ;; esac fi if test x$APP_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; + linux*) APP_MAN_DIR='$(mandir)/man1' ;; *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; esac fi if test x$LIB_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;; + linux*) LIB_MAN_SUFFIX=3x ;; *) LIB_MAN_SUFFIX=3 ;; esac fi if test x$LIB_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;; + linux*) LIB_MAN_DIR='$(mandir)/man3' ;; *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; esac fi if test x$FILE_MAN_SUFFIX = x ; then case $host_os in - k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;; + linux*) FILE_MAN_SUFFIX=5x ;; solaris*) FILE_MAN_SUFFIX=4 ;; *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then case $host_os in - k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; + linux*) FILE_MAN_DIR='$(mandir)/man5' ;; *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; esac fi @@ -3822,14 +3904,14 @@ fi # LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$MISC_MAN_SUFFIX = x ; then case $host_os in -# k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;; +# linux*) MISC_MAN_SUFFIX=7x ;; solaris*) MISC_MAN_SUFFIX=5 ;; *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then case $host_os in -# k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;; +# linux*) MISC_MAN_DIR='$(mandir)/man7' ;; *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; esac fi @@ -3838,14 +3920,14 @@ fi # LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$DRIVER_MAN_SUFFIX = x ; then case $host_os in -# k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; +# linux*) DRIVER_MAN_SUFFIX=4x ;; solaris*) DRIVER_MAN_SUFFIX=7 ;; *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then case $host_os in -# k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; +# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;; *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; esac fi @@ -4297,8 +4379,8 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xkbcomp $as_me 1.0.2, which was -generated by GNU Autoconf 2.59e. Invocation command line was +This file was extended by xkbcomp $as_me 1.0.3, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4350,8 +4432,8 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xkbcomp config.status 1.0.2 -configured by $0, generated by GNU Autoconf 2.59e, +xkbcomp config.status 1.0.3 +configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -4576,13 +4658,21 @@ AUTOCONF!$AUTOCONF$ac_delim AUTOMAKE!$AUTOMAKE$ac_delim AUTOHEADER!$AUTOHEADER$ac_delim MAKEINFO!$MAKEINFO$ac_delim -AMTAR!$AMTAR$ac_delim install_sh!$install_sh$ac_delim STRIP!$STRIP$ac_delim INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim AWK!$AWK$ac_delim SET_MAKE!$SET_MAKE$ac_delim am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +AMSHOWCMDSAT!$AMSHOWCMDSAT$ac_delim +AMDEPSHOWCMDSAT!$AMDEPSHOWCMDSAT$ac_delim +AMPRETTYECHO!$AMPRETTYECHO$ac_delim +AMCMDECHO!$AMCMDECHO$ac_delim +LT_QUIET!$LT_QUIET$ac_delim MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim MAINT!$MAINT$ac_delim @@ -4617,14 +4707,6 @@ host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim -FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim -MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim -DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim -ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim -APP_MAN_DIR!$APP_MAN_DIR$ac_delim -LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim -FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim -MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4666,13 +4748,21 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim +MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim +DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim +ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim +APP_MAN_DIR!$APP_MAN_DIR$ac_delim +LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim +FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim +MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim DRIVER_MAN_DIR!$DRIVER_MAN_DIR$ac_delim ADMIN_MAN_DIR!$ADMIN_MAN_DIR$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -4957,6 +5047,7 @@ $ac_datarootdir_hack test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' @@ -5143,27 +5234,21 @@ echo X"$mf" | else continue fi - 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"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///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 ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. 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 " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 946913d..47390e9 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xkbcomp,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp) +AC_INIT(xkbcomp,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/xkbcomp/expr.c b/xkbcomp/expr.c index 895f611..6e01d7d 100644 --- a/xkbcomp/expr.c +++ b/xkbcomp/expr.c @@ -1,4 +1,4 @@ -/* $XdotOrg: app/xkbcomp/expr.c,v 1.2 2004/04/23 19:54:50 eich Exp $ */ +/* $XdotOrg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. diff --git a/xkbcomp/mkinstalldirs b/xkbcomp/mkinstalldirs deleted file mode 100755 index d2d5f21..0000000 --- a/xkbcomp/mkinstalldirs +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here diff --git a/xkbcomp/xkbparse.c b/xkbcomp/xkbparse.c index b51cba0..ccab7bd 100644 --- a/xkbcomp/xkbparse.c +++ b/xkbcomp/xkbparse.c @@ -1,7 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + 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 @@ -18,13 +20,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. */ +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton 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 @@ -37,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.1" +#define YYBISON_VERSION "2.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -190,7 +200,7 @@ /* Copy the first part of user declarations. */ -#line 93 "xkbparse.y" +#line 93 "../xkbparse.y" #ifdef DEBUG #define YYDEBUG 1 @@ -222,9 +232,10 @@ # define YYTOKEN_TABLE 0 #endif -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 111 "xkbparse.y" -typedef union YYSTYPE { +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 111 "../xkbparse.y" +{ int ival; unsigned uval; char *str; @@ -251,9 +262,10 @@ typedef union YYSTYPE { OutlineDef *outline; DoodadDef *doodad; XkbFile *file; -} YYSTYPE; -/* Line 196 of yacc.c. */ -#line 257 "xkbparse.c" +} +/* Line 193 of yacc.c. */ +#line 268 "xkbparse.c" + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -264,23 +276,56 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 269 "xkbparse.c" +/* Line 216 of yacc.c. */ +#line 281 "xkbparse.c" -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ +#ifdef short +# undef short #endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; #endif -#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; #endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; #endif +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + #ifndef YY_ # if YYENABLE_NLS # if ENABLE_NLS @@ -293,7 +338,32 @@ typedef union YYSTYPE { # endif #endif -#if ! defined (yyoverflow) || YYERROR_VERBOSE +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -301,64 +371,76 @@ typedef union YYSTYPE { # if YYSTACK_USE_ALLOCA # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if defined (__STDC__) || defined (__cplusplus) +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# define YYINCLUDED_STDLIB_H +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif # endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely invoke alloca (N) if N exceeds 4096. Use a slightly smaller number to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif # else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# ifdef __cplusplus -extern "C" { +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif -# ifdef __cplusplus -} -# endif # endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) +#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 int yyss; + yytype_int16 yyss; YYSTYPE yyvs; }; @@ -368,13 +450,13 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (yytype_int16) + 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__ +# if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else @@ -385,7 +467,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif @@ -403,29 +485,23 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (0) + while (YYID (0)) #endif -#if defined (__STDC__) || defined (__cplusplus) - typedef signed char yysigned_char; -#else - typedef short int yysigned_char; -#endif - -/* YYFINAL -- State number of the termination state. */ +/* YYFINAL -- State number of the termination state. */ #define YYFINAL 18 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 701 +#define YYLAST 706 -/* YYNTOKENS -- Number of terminals. */ +/* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 65 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 72 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 182 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 332 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 73 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 184 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 335 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -435,7 +511,7 @@ union yyalloc ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = +static const yytype_uint8 yytranslate[] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 2, 12, 13, 14, 15, 16, 2, 2, 2, 2, 2, @@ -468,7 +544,7 @@ static const unsigned char yytranslate[] = #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short int yyprhs[] = +static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 7, 9, 12, 14, 22, 24, 26, 28, 31, 33, 41, 46, 48, 50, 52, 54, @@ -487,18 +563,18 @@ static const unsigned short int yyprhs[] = 440, 444, 448, 452, 456, 460, 462, 465, 468, 471, 474, 476, 481, 483, 487, 491, 493, 498, 500, 504, 509, 516, 518, 520, 522, 524, 526, 527, 531, 533, - 535, 537, 539, 541, 543, 545, 547, 549, 551, 553, - 555, 557, 558 + 535, 537, 539, 542, 544, 546, 548, 550, 552, 554, + 556, 558, 560, 562, 563 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short int yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = { 66, 0, -1, 67, -1, 70, -1, 72, -1, 67, - 68, -1, 68, -1, 74, 69, 135, 41, 70, 42, + 68, -1, 68, -1, 74, 69, 136, 41, 70, 42, 49, -1, 4, -1, 10, -1, 11, -1, 70, 71, - -1, 71, -1, 74, 73, 135, 41, 77, 42, 49, - -1, 74, 73, 135, 77, -1, 5, -1, 6, -1, + -1, 71, -1, 74, 73, 136, 41, 77, 42, 49, + -1, 74, 73, 136, 77, -1, 5, -1, 6, -1, 8, -1, 7, -1, 9, -1, 75, -1, -1, 75, 76, -1, 76, -1, 57, -1, 58, -1, 59, -1, 60, -1, 61, -1, 62, -1, 63, -1, 64, -1, @@ -507,33 +583,33 @@ static const short int yyrhs[] = 88, -1, 116, 89, -1, 116, 94, -1, 116, 93, -1, 116, 95, -1, 116, 96, -1, 116, 97, -1, 116, 98, -1, 116, 112, -1, 117, 52, -1, 124, - 36, 120, 49, -1, 133, 49, -1, 50, 133, 49, - -1, 132, 36, 120, 49, -1, 22, 132, 36, 132, + 36, 120, 49, -1, 134, 49, -1, 50, 134, 49, + -1, 133, 36, 120, 49, -1, 22, 133, 36, 133, 49, -1, 17, 83, 49, -1, 83, 48, 84, -1, - 84, -1, 133, -1, 133, 36, 120, -1, 19, 86, + 84, -1, 134, -1, 134, 36, 120, -1, 19, 86, 41, 87, 42, 49, -1, 128, 37, 120, -1, 128, - -1, 87, 79, -1, 79, -1, 18, 134, 41, 87, - 42, 49, -1, 21, 132, 41, 90, 42, 49, -1, + -1, 87, 79, -1, 79, -1, 18, 135, 41, 87, + 42, 49, -1, 21, 133, 41, 90, 42, 49, -1, 90, 48, 91, -1, 91, -1, -1, 124, 36, 120, - -1, 124, 36, 92, -1, 133, -1, 50, 133, -1, + -1, 124, 36, 92, -1, 134, -1, 50, 134, -1, 92, -1, 45, 126, 46, -1, 45, 122, 46, -1, - 23, 131, 36, 120, 49, -1, 24, 133, 41, 119, - 42, 49, -1, 25, 134, 41, 87, 42, 49, -1, - 25, 131, 36, 120, 49, -1, 35, 25, 131, 36, - 120, 49, -1, 26, 134, 41, 108, 42, 49, -1, - 26, 134, 41, 110, 42, 49, -1, 29, 134, 41, + 23, 132, 36, 120, 49, -1, 24, 134, 41, 119, + 42, 49, -1, 25, 135, 41, 87, 42, 49, -1, + 25, 132, 36, 120, 49, -1, 35, 25, 132, 36, + 120, 49, -1, 26, 135, 41, 108, 42, 49, -1, + 26, 135, 41, 110, 42, 49, -1, 29, 135, 41, 99, 42, 49, -1, 99, 100, -1, 100, -1, 28, 41, 101, 42, 49, -1, 79, -1, 112, -1, 95, -1, 105, -1, 101, 102, -1, 102, -1, 27, 41, 103, 42, 49, -1, 79, -1, 103, 48, 104, -1, - 104, -1, 132, -1, 41, 119, 42, -1, 30, 134, + 104, -1, 133, -1, 41, 119, 42, -1, 30, 135, 41, 106, 42, 49, -1, 106, 48, 107, -1, 107, - -1, 132, 36, 132, -1, 108, 48, 109, -1, 109, - -1, 41, 110, 42, -1, 133, 36, 41, 110, 42, - -1, 133, 36, 120, -1, 110, 48, 111, -1, 111, - -1, 45, 129, 48, 129, 46, -1, 113, 134, 41, + -1, 133, 36, 133, -1, 108, 48, 109, -1, 109, + -1, 41, 110, 42, -1, 134, 36, 41, 110, 42, + -1, 134, 36, 120, -1, 110, 48, 111, -1, 111, + -1, 45, 129, 48, 129, 46, -1, 113, 135, 41, 87, 42, 49, -1, 31, -1, 32, -1, 33, -1, - 34, -1, 133, -1, 115, -1, 20, -1, 19, -1, + 34, -1, 134, -1, 115, -1, 20, -1, 19, -1, 18, -1, 21, -1, 23, -1, 24, -1, 25, -1, 26, -1, 28, -1, 29, -1, 31, -1, 117, -1, -1, 12, -1, 14, -1, 13, -1, 15, -1, 16, @@ -545,15 +621,16 @@ static const short int yyrhs[] = -1, 125, -1, 43, 120, 44, -1, 122, 48, 123, -1, 123, -1, 114, 43, 118, 44, -1, 114, -1, 114, 47, 114, -1, 114, 45, 120, 46, -1, 114, - 47, 114, 45, 120, 46, -1, 134, -1, 131, -1, - 130, -1, 132, -1, 127, -1, -1, 127, 48, 128, - -1, 128, -1, 55, -1, 29, -1, 131, -1, 54, - -1, 53, -1, 54, -1, 53, -1, 56, -1, 55, - -1, 58, -1, 52, -1, 136, -1, -1, 52, -1 + 47, 114, 45, 120, 46, -1, 135, -1, 132, -1, + 131, -1, 133, -1, 127, -1, -1, 127, 48, 128, + -1, 128, -1, 55, -1, 29, -1, 132, -1, 38, + 130, -1, 130, -1, 54, -1, 53, -1, 54, -1, + 53, -1, 56, -1, 55, -1, 58, -1, 52, -1, + 137, -1, -1, 52, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short int yyrline[] = +static const yytype_uint16 yyrline[] = { 0, 169, 169, 171, 173, 177, 179, 183, 189, 190, 191, 194, 196, 200, 206, 211, 212, 213, 214, 215, @@ -572,14 +649,14 @@ static const unsigned short int yyrline[] = 606, 608, 610, 612, 614, 616, 620, 622, 624, 626, 628, 630, 632, 634, 638, 640, 644, 648, 655, 663, 672, 683, 690, 697, 704, 714, 715, 718, 720, 724, - 738, 742, 749, 750, 753, 756, 759, 762, 763, 766, - 769, 770, 773 + 738, 742, 749, 750, 753, 754, 757, 760, 763, 766, + 767, 770, 773, 774, 777 }; #endif #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { "END_OF_FILE", "error", "$undefined", "ERROR_TOK", "XKB_KEYMAP", @@ -606,15 +683,15 @@ static const char *const yytname[] = "DoodadDecl", "DoodadType", "FieldSpec", "Element", "OptMergeMode", "MergeMode", "OptExprList", "ExprList", "Expr", "Term", "ActionList", "Action", "Lhs", "Terminal", "OptKeySymList", "KeySymList", "KeySym", - "Number", "Float", "Integer", "KeyName", "Ident", "String", "OptMapName", - "MapName", 0 + "SignedNumber", "Number", "Float", "Integer", "KeyName", "Ident", + "String", "OptMapName", "MapName", 0 }; #endif # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const yytype_uint16 yytoknum[] = { 0, 256, 257, 255, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 20, 21, 22, @@ -627,7 +704,7 @@ static const unsigned short int yytoknum[] = # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const unsigned char yyr1[] = +static const yytype_uint8 yyr1[] = { 0, 65, 66, 66, 66, 67, 67, 68, 69, 69, 69, 70, 70, 71, 72, 73, 73, 73, 73, 73, @@ -646,12 +723,12 @@ static const unsigned char yyr1[] = 120, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 121, 121, 121, 122, 122, 123, 124, 124, 124, 124, 125, 125, 125, 125, 126, 126, 127, 127, 128, - 128, 128, 129, 129, 130, 131, 132, 133, 133, 134, - 135, 135, 136 + 128, 128, 129, 129, 130, 130, 131, 132, 133, 134, + 134, 135, 136, 136, 137 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const unsigned char yyr2[] = +static const yytype_uint8 yyr2[] = { 0, 2, 1, 1, 1, 2, 1, 7, 1, 1, 1, 2, 1, 7, 4, 1, 1, 1, 1, 1, @@ -670,31 +747,31 @@ static const unsigned char yyr2[] = 3, 3, 3, 3, 3, 1, 2, 2, 2, 2, 1, 4, 1, 3, 3, 1, 4, 1, 3, 4, 6, 1, 1, 1, 1, 1, 0, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 1 + 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 1 }; /* 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[] = +static const yytype_uint8 yydefact[] = { 21, 24, 25, 26, 27, 28, 29, 30, 31, 0, 21, 6, 21, 12, 4, 0, 20, 23, 1, 5, 0, 11, 0, 8, 15, 16, 18, 17, 19, 9, - 10, 181, 181, 22, 181, 182, 0, 180, 33, 0, + 10, 183, 183, 22, 183, 184, 0, 182, 33, 0, 21, 33, 130, 21, 130, 131, 133, 132, 134, 135, 32, 0, 129, 0, 0, 0, 120, 119, 118, 121, 0, 122, 123, 124, 125, 126, 127, 128, 113, 114, - 115, 0, 0, 177, 176, 178, 34, 37, 38, 35, + 115, 0, 0, 179, 178, 180, 34, 37, 38, 35, 36, 39, 40, 42, 41, 43, 44, 45, 46, 47, 0, 157, 117, 0, 0, 116, 48, 7, 13, 0, - 56, 57, 179, 0, 170, 175, 169, 0, 61, 171, + 56, 57, 181, 0, 170, 177, 169, 0, 61, 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 54, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 51, 0, 120, 119, 121, 122, 123, 124, 125, - 127, 128, 0, 0, 0, 0, 0, 174, 157, 0, + 127, 128, 0, 0, 0, 0, 0, 176, 157, 0, 145, 150, 152, 163, 162, 164, 116, 161, 158, 0, 0, 55, 58, 63, 0, 0, 60, 166, 0, 0, 67, 73, 0, 116, 0, 0, 0, 139, 0, 0, @@ -703,142 +780,141 @@ static const unsigned char yydefact[] = 146, 0, 148, 149, 137, 0, 0, 0, 0, 159, 0, 0, 49, 52, 0, 62, 0, 170, 169, 0, 0, 155, 0, 165, 168, 72, 0, 0, 0, 53, - 76, 0, 0, 79, 0, 0, 173, 172, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, - 153, 0, 136, 141, 142, 140, 143, 144, 0, 64, - 59, 137, 75, 0, 74, 0, 65, 66, 70, 69, - 77, 138, 78, 105, 0, 81, 103, 82, 108, 0, - 107, 0, 94, 0, 92, 0, 83, 80, 111, 151, - 160, 0, 154, 167, 0, 0, 0, 0, 91, 0, - 101, 0, 156, 110, 106, 0, 0, 96, 97, 86, - 0, 0, 0, 0, 0, 0, 99, 100, 102, 98, - 93, 95 + 76, 0, 0, 79, 0, 0, 0, 175, 174, 0, + 173, 0, 0, 0, 0, 0, 0, 0, 0, 84, + 0, 0, 153, 0, 136, 141, 142, 140, 143, 144, + 0, 64, 59, 137, 75, 0, 74, 0, 65, 66, + 70, 69, 77, 138, 78, 105, 172, 0, 81, 103, + 82, 108, 0, 107, 0, 94, 0, 92, 0, 83, + 80, 111, 151, 160, 0, 154, 167, 0, 0, 0, + 0, 91, 0, 101, 0, 156, 110, 106, 0, 0, + 96, 97, 86, 0, 0, 0, 0, 0, 0, 99, + 100, 102, 98, 93, 95 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const short int yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { -1, 9, 10, 11, 31, 12, 13, 14, 32, 22, 16, 17, 42, 50, 173, 77, 78, 79, 99, 100, 80, 107, 174, 81, 82, 179, 180, 181, 83, 84, - 201, 86, 87, 88, 202, 203, 293, 294, 316, 317, - 204, 309, 310, 192, 193, 194, 195, 205, 90, 158, - 92, 51, 52, 261, 262, 187, 160, 230, 231, 161, - 162, 232, 233, 108, 248, 163, 164, 165, 166, 167, - 36, 37 + 201, 86, 87, 88, 202, 203, 296, 297, 319, 320, + 204, 312, 313, 192, 193, 194, 195, 205, 90, 158, + 92, 51, 52, 263, 264, 187, 160, 230, 231, 161, + 162, 232, 233, 108, 249, 250, 163, 164, 165, 166, + 167, 36, 37 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ #define YYPACT_NINF -188 -static const short int yypact[] = +static const yytype_int16 yypact[] = { - 629, -188, -188, -188, -188, -188, -188, -188, -188, 5, - 2, -188, 58, -188, -188, 690, 629, -188, -188, -188, - 121, -188, 421, -188, -188, -188, -188, -188, -188, -188, - -188, -31, -31, -188, -31, -188, -12, -188, -7, -7, - 629, -188, 198, 612, 137, -188, -188, -188, -188, -188, - -188, 18, 4, 50, 62, 33, 15, 16, -188, 72, - 72, 89, 33, -40, 15, -188, 15, 107, -188, -188, - -188, 136, 33, -188, -188, -188, -188, -188, -188, -188, + 628, -188, -188, -188, -188, -188, -188, -188, -188, 12, + 4, -188, 58, -188, -188, 695, 628, -188, -188, -188, + 121, -188, 408, -188, -188, -188, -188, -188, -188, -188, + -188, -9, -9, -188, -9, -188, 19, -188, 45, 45, + 628, -188, 174, 620, 137, -188, -188, -188, -188, -188, + -188, 317, 39, -15, 50, 1, 59, -18, -188, 72, + 72, 106, 1, -27, 59, -188, 59, 62, -188, -188, + -188, 117, 1, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, - 15, 51, -188, 78, 146, 138, -188, -188, -188, 30, - -188, 166, -188, 163, -188, -188, -188, 176, 184, -188, - 183, 190, 195, 202, 200, 218, 221, 224, 89, 189, - 231, 394, 627, 394, 394, -188, 33, -188, 394, 609, - 609, 394, 480, 72, 394, 394, 394, 609, -30, 435, - 237, -188, 609, -188, -188, -188, -188, -188, -188, -188, - -188, -188, 394, 394, 394, 394, 394, -188, 152, 229, - -188, 249, -188, -188, -188, -188, -188, -188, 252, 98, - 212, -188, 396, -188, 495, 523, 396, 165, 33, -16, - -188, -188, 262, 6, 257, 256, 64, 396, 348, 538, - 266, 153, 127, -188, 128, -188, 271, 15, 268, 15, - -188, -188, 258, -188, -188, -188, 394, 566, -188, -188, - -188, 314, -188, -188, 394, 394, 394, 394, 394, -188, - 394, 394, -188, -188, 265, -188, 269, 272, 274, 277, - 61, -188, 279, 280, -188, -188, 285, 480, 312, -188, - -188, 290, 394, -188, 293, 129, -188, -188, 281, 296, - 31, 297, 266, 353, 586, 306, 307, -188, 361, 311, - -188, 317, 321, 207, 207, -188, -188, 396, 264, -188, - -188, 394, -188, 627, -188, 16, -188, -188, -188, 396, - -188, 396, -188, -188, 153, -188, -188, -188, -188, 266, - 396, 334, -188, 452, -188, 72, -188, -188, -188, -188, - -188, 336, -188, -188, 337, 132, -37, 340, -188, 174, - -188, 356, -188, -188, -188, 394, 193, -188, -188, -188, - 344, 72, 72, 197, 346, -37, -188, -188, -188, -188, - -188, -188 + 59, 51, -188, 125, 146, 134, -188, -188, -188, 132, + -188, 163, -188, 168, -188, -188, -188, 173, 179, -188, + 178, 186, 190, 194, 206, 204, 208, 221, 106, 216, + 225, 265, 640, 265, 265, -188, 1, -188, 265, 599, + 599, 265, 470, 72, 265, 265, 265, 599, -26, 21, + 239, -188, 599, -188, -188, -188, -188, -188, -188, -188, + -188, -188, 265, 265, 265, 265, 265, -188, 159, 232, + -188, 240, -188, -188, -188, -188, -188, -188, 223, 98, + 156, -188, 260, -188, 485, 513, 260, 617, 1, 30, + -188, -188, 243, 32, 231, 192, 64, 260, 199, 528, + 236, 35, 127, -188, 128, -188, 251, 59, 270, 59, + -188, -188, 422, -188, -188, -188, 265, 556, -188, -188, + -188, 342, -188, -188, 265, 265, 265, 265, 265, -188, + 265, 265, -188, -188, 263, -188, 264, 249, 271, 281, + 61, -188, 279, 278, -188, -188, 280, 470, 340, -188, + -188, 283, 265, -188, 284, 129, 16, -188, -188, 282, + -188, 298, -34, 308, 236, 381, 576, 287, 321, -188, + 215, 325, -188, 332, 336, 158, 158, -188, -188, 260, + 316, -188, -188, 265, -188, 640, -188, -18, -188, -188, + -188, 260, -188, 260, -188, -188, -188, 35, -188, -188, + -188, -188, 236, 260, 346, -188, 442, -188, 72, -188, + -188, -188, -188, -188, 344, -188, -188, 343, 143, -28, + 348, -188, 176, -188, 367, -188, -188, -188, 265, 198, + -188, -188, -188, 359, 72, 72, 202, 362, -28, -188, + -188, -188, -188, -188, -188 }; /* YYPGOTO[NTERM-NUM]. */ -static const short int yypgoto[] = +static const yytype_int16 yypgoto[] = { - -188, -188, -188, 392, -188, 376, 12, -188, 399, 70, - -188, 408, 397, -188, -35, -188, -188, -188, -188, 313, - -188, -188, -47, -188, -188, -188, 203, 204, -188, -188, - 390, -188, -188, -188, -188, 241, -188, 158, -188, 149, - -188, -188, 141, -188, 232, -187, 205, 433, -188, 26, - -188, -188, -188, 215, -134, 106, 101, -188, 214, -29, - -188, -188, -188, -170, 208, -188, -43, -51, -45, -33, - 109, -188 + -188, -188, -188, 410, -188, 383, -7, -188, 399, 38, + -188, 409, 385, -188, -35, -188, -188, -188, -188, 301, + -188, -188, -47, -188, -188, -188, 191, 200, -188, -188, + 378, -188, -188, -188, -188, 228, -188, 148, -188, 130, + -188, -188, 133, -188, 197, -187, 205, 423, -188, 26, + -188, -188, -188, 203, -134, 89, 104, -188, 207, -29, + -188, -188, -188, -175, 188, 233, -188, -43, -51, -45, + -33, 109, -188 }; /* 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 -178 -static const short int yytable[] = +#define YYTABLE_NINF -180 +static const yytype_int16 yytable[] = { - 94, 186, -2, 245, 315, 18, 95, 234, 110, 111, - 101, 190, 102, 105, 109, 191, 76, 113, 112, 74, - 114, 35, 93, 103, 21, 73, 236, 119, 75, 40, - 115, 116, 237, 117, 41, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 104, 65, 66, -71, 67, - 68, 69, 70, 71, -71, 21, 96, 120, -3, 1, - 2, 3, 4, 5, 6, 7, 8, 102, 72, 105, - 15, 106, 190, 73, 74, 140, 75, 91, 126, 127, - 20, 101, 184, 175, 95, 95, 73, 183, 73, 75, - 189, 75, 95, 196, 95, 207, 121, 95, 122, 97, - 93, 93, 305, 182, 200, 303, 241, 272, 93, 273, - 93, 98, 242, 93, 123, 1, 2, 3, 4, 5, + 94, 186, 234, 245, -2, 21, 95, 190, 110, 111, + 101, 104, 18, 318, 109, 190, 76, 113, 112, 191, + 114, 73, 93, 103, 75, 102, 105, 119, 74, 73, + 115, 116, 75, 117, 97, 105, 21, 106, 15, 143, + 144, 58, 145, 35, 146, 147, 197, 149, 20, 198, + 150, 199, 67, 68, 69, 70, 73, 120, -3, 75, + 40, 1, 2, 3, 4, 5, 6, 7, 8, 247, + 248, 72, 236, 246, -71, 140, 73, 91, 237, 75, + -71, 101, 184, 175, 95, 95, 41, 183, 247, 248, + 189, 96, 95, 196, 95, 207, 121, 95, 122, 98, + 93, 93, 306, 182, 200, 308, 241, 274, 93, 275, + 93, 102, 242, 93, -112, 1, 2, 3, 4, 5, 6, 7, 8, 209, 209, 23, 209, 209, 74, 95, 95, 29, 30, 235, 109, 215, 216, 217, 218, 225, - 225, 38, 105, 39, 95, 93, 93, 222, 168, 45, - 46, 47, 48, 49, 225, 91, 91, 95, 91, -112, - 93, 118, 95, 91, 115, 91, 255, 200, 91, 249, - 251, 283, 225, 93, 314, 250, 252, 252, 93, 54, - 252, 323, 124, 143, 144, 58, 145, 125, 146, 147, - 148, 149, 183, 65, 227, 214, 151, 121, -14, 122, - 91, 91, 128, 229, 129, 196, 246, 247, 182, 95, - 45, 46, 47, 48, 49, 91, 320, 130, 105, 292, - 228, 131, 321, 75, 132, 93, 133, 159, 91, 169, - 170, 134, 109, 91, 172, 324, 136, 176, 141, 329, - 185, 325, 188, 135, 311, 242, 217, 218, 95, 215, - 216, 217, 218, 208, 210, 318, 212, 213, 292, 137, - 211, 223, 138, 91, 93, 139, 215, 216, 217, 218, - 311, 328, 142, 206, 318, 219, 143, 144, 58, 145, - 91, 146, 147, 197, 149, 220, 198, 150, 199, 67, - 68, 69, 70, 215, 216, 217, 218, 221, 238, 229, - 256, 215, 216, 217, 218, 240, 239, 253, 72, 254, - 300, 191, 258, 73, 269, -127, 75, -177, 270, 91, - 271, 263, 264, 265, 266, 274, 267, 268, 275, 284, - 143, 144, 58, 145, 276, 146, 147, 148, 149, 280, - 65, 150, 282, 151, 279, 285, 287, 295, 281, 152, - 153, 215, 216, 217, 218, 154, 296, 177, 260, 290, - 298, 299, 155, 156, 102, 105, 157, 73, 74, 242, - 75, 143, 144, 58, 145, 306, 146, 147, 148, 149, - 312, 65, 150, 313, 151, 215, 216, 217, 218, 319, - 152, 153, 322, 326, 289, 330, 154, 243, 215, 216, - 217, 218, 19, 155, 156, 102, 105, 157, 73, 74, - 297, 75, 143, 144, 58, 145, 43, 146, 147, 148, - 149, 34, 65, 150, 33, 151, 24, 25, 26, 27, - 28, 152, 153, 215, 216, 217, 218, 154, 44, 171, - 277, 85, 278, 257, 155, 156, 102, 105, 157, 73, - 74, 308, 75, 143, 144, 58, 145, 288, 146, 147, - 197, 149, 327, 198, 150, 199, 67, 68, 69, 70, - 143, 144, 58, 145, 331, 146, 147, 148, 149, 291, - 65, 150, 286, 151, 89, 72, 301, 302, 0, 0, - 73, 0, 304, 75, 307, 0, 0, 0, 143, 144, + 225, 38, 118, 39, 95, 93, 93, 222, 168, 45, + 46, 47, 48, 49, 225, 91, 91, 95, 91, 105, + 93, 123, 95, 91, 115, 91, 257, 200, 91, 251, + 253, 285, 225, 93, -14, 252, 254, 254, 93, 54, + 126, 127, 124, 125, 326, 317, 45, 46, 47, 48, + 49, 254, 183, 215, 216, 217, 218, 217, 218, 128, + 91, 91, 214, 229, 121, 223, 122, 196, 182, 129, + 159, 95, 169, 170, 130, 91, 131, 172, 323, 132, + 176, 295, 133, 185, 324, 188, 134, 93, 91, 215, + 216, 217, 218, 91, 109, 135, 215, 216, 217, 218, + 327, 240, 136, 211, 332, 137, 328, 314, 243, 138, + 242, 95, 215, 216, 217, 218, 208, 210, 321, 212, + 213, 295, 139, 91, 300, 141, 142, 93, 221, 215, + 216, 217, 218, 314, 331, 206, 220, 321, 219, 238, + 239, 191, 91, 143, 144, 58, 145, 255, 146, 147, + 148, 149, -127, 65, 150, 260, 151, 215, 216, 217, + 218, 229, 152, 153, 265, 266, 267, 268, 154, 269, + 270, 256, 271, 272, -179, 155, 156, 102, 105, 157, + 73, 74, 91, 75, 273, 276, 277, 281, 298, 278, + 287, 283, 282, 284, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 293, 65, 66, 288, 67, 68, + 69, 70, 71, 215, 216, 217, 218, 290, 143, 144, + 58, 145, 303, 146, 147, 148, 149, 72, 65, 150, + 299, 151, 73, 74, 301, 75, 302, 152, 153, 215, + 216, 217, 218, 154, 242, 177, 262, 309, 315, 316, + 155, 156, 102, 105, 157, 73, 74, 322, 75, 143, + 144, 58, 145, 325, 146, 147, 148, 149, 329, 65, + 150, 333, 151, 24, 25, 26, 27, 28, 152, 153, + 19, 34, 292, 43, 154, 33, 44, 171, 279, 85, + 259, 155, 156, 102, 105, 157, 73, 74, 280, 75, + 143, 144, 58, 145, 311, 146, 147, 197, 149, 289, + 198, 150, 199, 67, 68, 69, 70, 330, 334, 291, + 143, 144, 58, 145, 258, 146, 147, 148, 149, 294, + 65, 150, 72, 151, 89, 307, 304, 73, 0, 286, + 75, 0, 305, 0, 310, 0, 0, 0, 143, 144, 58, 145, 72, 146, 147, 148, 149, 73, 65, 150, 75, 151, 0, 143, 144, 58, 145, 0, 146, 147, 148, 149, 0, 65, 150, 177, 151, 0, 0, 0, @@ -849,71 +925,71 @@ static const short int yytable[] = 0, 0, 0, 72, 0, 0, 0, 0, 73, 0, 244, 75, 0, 0, 143, 144, 58, 145, 72, 146, 147, 148, 149, 73, 65, 150, 75, 151, 0, 0, - 0, 0, 0, 0, 143, 144, 58, 145, 259, 146, - 147, 148, 149, 291, 65, 150, 72, 151, 0, 0, + 0, 0, 0, 0, 143, 144, 58, 145, 261, 146, + 147, 148, 149, 294, 65, 150, 72, 151, 0, 0, 0, 73, 0, 0, 75, 0, 0, 143, 144, 58, 145, 0, 146, 147, 148, 149, 72, 65, 150, 0, 151, 73, 0, 0, 75, 143, 144, 58, 145, 0, - 146, 147, 148, 149, 53, 65, 150, 0, 151, 72, - 0, 0, 0, 0, 73, 0, 0, 75, 0, 1, - 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, - 0, 0, 73, 0, 0, 75, 1, 2, 3, 4, - 5, 6, 7, 8, 23, 24, 25, 26, 27, 28, - 29, 30 + 146, 147, 148, 149, 0, 65, 227, 0, 151, 72, + 0, 0, 0, 0, 73, 0, 0, 75, 143, 144, + 58, 145, 53, 146, 147, 148, 149, 0, 65, 150, + 105, 151, 228, 0, 0, 75, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, + 6, 7, 8, 0, 0, 73, 0, 0, 75, 23, + 24, 25, 26, 27, 28, 29, 30 }; -static const short int yycheck[] = +static const yytype_int16 yycheck[] = { - 51, 135, 0, 190, 41, 0, 51, 177, 59, 60, - 55, 41, 52, 53, 57, 45, 51, 62, 61, 56, - 63, 52, 51, 56, 12, 55, 42, 72, 58, 41, - 63, 64, 48, 66, 41, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 29, 28, 29, 42, 31, - 32, 33, 34, 35, 48, 43, 52, 90, 0, 57, - 58, 59, 60, 61, 62, 63, 64, 52, 50, 53, - 0, 55, 41, 55, 56, 118, 58, 51, 48, 49, - 10, 126, 133, 130, 129, 130, 55, 132, 55, 58, - 137, 58, 137, 138, 139, 142, 45, 142, 47, 49, - 129, 130, 289, 132, 139, 275, 42, 46, 137, 48, - 139, 49, 48, 142, 36, 57, 58, 59, 60, 61, + 51, 135, 177, 190, 0, 12, 51, 41, 59, 60, + 55, 29, 0, 41, 57, 41, 51, 62, 61, 45, + 63, 55, 51, 56, 58, 52, 53, 72, 56, 55, + 63, 64, 58, 66, 49, 53, 43, 55, 0, 18, + 19, 20, 21, 52, 23, 24, 25, 26, 10, 28, + 29, 30, 31, 32, 33, 34, 55, 90, 0, 58, + 41, 57, 58, 59, 60, 61, 62, 63, 64, 53, + 54, 50, 42, 38, 42, 118, 55, 51, 48, 58, + 48, 126, 133, 130, 129, 130, 41, 132, 53, 54, + 137, 52, 137, 138, 139, 142, 45, 142, 47, 49, + 129, 130, 277, 132, 139, 292, 42, 46, 137, 48, + 139, 52, 48, 142, 52, 57, 58, 59, 60, 61, 62, 63, 64, 152, 153, 4, 155, 156, 56, 174, 175, 10, 11, 178, 177, 37, 38, 39, 40, 174, - 175, 32, 53, 34, 189, 174, 175, 49, 122, 12, - 13, 14, 15, 16, 189, 129, 130, 202, 132, 52, - 189, 25, 207, 137, 197, 139, 199, 202, 142, 42, - 42, 42, 207, 202, 42, 48, 48, 48, 207, 42, - 48, 315, 36, 18, 19, 20, 21, 49, 23, 24, - 25, 26, 237, 28, 29, 43, 31, 45, 0, 47, - 174, 175, 36, 177, 41, 250, 53, 54, 237, 254, - 12, 13, 14, 15, 16, 189, 42, 41, 53, 254, - 55, 37, 48, 58, 41, 254, 36, 121, 202, 123, - 124, 36, 275, 207, 128, 42, 36, 131, 49, 42, - 134, 48, 136, 41, 295, 48, 39, 40, 293, 37, - 38, 39, 40, 152, 153, 306, 155, 156, 293, 41, - 154, 49, 41, 237, 293, 41, 37, 38, 39, 40, - 321, 322, 41, 36, 325, 46, 18, 19, 20, 21, - 254, 23, 24, 25, 26, 36, 28, 29, 30, 31, - 32, 33, 34, 37, 38, 39, 40, 45, 36, 273, - 42, 37, 38, 39, 40, 49, 49, 36, 50, 41, - 46, 45, 206, 55, 49, 43, 58, 43, 49, 293, - 43, 215, 216, 217, 218, 46, 220, 221, 48, 48, - 18, 19, 20, 21, 49, 23, 24, 25, 26, 49, - 28, 29, 49, 31, 238, 49, 49, 41, 242, 37, - 38, 37, 38, 39, 40, 43, 49, 45, 44, 253, - 49, 44, 50, 51, 52, 53, 54, 55, 56, 48, - 58, 18, 19, 20, 21, 41, 23, 24, 25, 26, - 44, 28, 29, 46, 31, 37, 38, 39, 40, 49, - 37, 38, 36, 49, 41, 49, 43, 49, 37, 38, - 39, 40, 10, 50, 51, 52, 53, 54, 55, 56, - 49, 58, 18, 19, 20, 21, 40, 23, 24, 25, - 26, 22, 28, 29, 16, 31, 5, 6, 7, 8, - 9, 37, 38, 37, 38, 39, 40, 43, 41, 126, - 237, 51, 238, 202, 50, 51, 52, 53, 54, 55, - 56, 293, 58, 18, 19, 20, 21, 252, 23, 24, - 25, 26, 321, 28, 29, 30, 31, 32, 33, 34, - 18, 19, 20, 21, 325, 23, 24, 25, 26, 27, - 28, 29, 250, 31, 51, 50, 271, 273, -1, -1, - 55, -1, 284, 58, 42, -1, -1, -1, 18, 19, + 175, 32, 25, 34, 189, 174, 175, 49, 122, 12, + 13, 14, 15, 16, 189, 129, 130, 202, 132, 53, + 189, 36, 207, 137, 197, 139, 199, 202, 142, 42, + 42, 42, 207, 202, 0, 48, 48, 48, 207, 42, + 48, 49, 36, 49, 318, 42, 12, 13, 14, 15, + 16, 48, 237, 37, 38, 39, 40, 39, 40, 36, + 174, 175, 43, 177, 45, 49, 47, 252, 237, 41, + 121, 256, 123, 124, 41, 189, 37, 128, 42, 41, + 131, 256, 36, 134, 48, 136, 36, 256, 202, 37, + 38, 39, 40, 207, 277, 41, 37, 38, 39, 40, + 42, 49, 36, 154, 42, 41, 48, 298, 49, 41, + 48, 296, 37, 38, 39, 40, 152, 153, 309, 155, + 156, 296, 41, 237, 49, 49, 41, 296, 45, 37, + 38, 39, 40, 324, 325, 36, 36, 328, 46, 36, + 49, 45, 256, 18, 19, 20, 21, 36, 23, 24, + 25, 26, 43, 28, 29, 206, 31, 37, 38, 39, + 40, 275, 37, 38, 215, 216, 217, 218, 43, 220, + 221, 41, 49, 49, 43, 50, 51, 52, 53, 54, + 55, 56, 296, 58, 43, 46, 48, 238, 41, 49, + 48, 242, 49, 49, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 255, 28, 29, 49, 31, 32, + 33, 34, 35, 37, 38, 39, 40, 49, 18, 19, + 20, 21, 46, 23, 24, 25, 26, 50, 28, 29, + 49, 31, 55, 56, 49, 58, 44, 37, 38, 37, + 38, 39, 40, 43, 48, 45, 44, 41, 44, 46, + 50, 51, 52, 53, 54, 55, 56, 49, 58, 18, + 19, 20, 21, 36, 23, 24, 25, 26, 49, 28, + 29, 49, 31, 5, 6, 7, 8, 9, 37, 38, + 10, 22, 41, 40, 43, 16, 41, 126, 237, 51, + 202, 50, 51, 52, 53, 54, 55, 56, 238, 58, + 18, 19, 20, 21, 296, 23, 24, 25, 26, 252, + 28, 29, 30, 31, 32, 33, 34, 324, 328, 254, + 18, 19, 20, 21, 42, 23, 24, 25, 26, 27, + 28, 29, 50, 31, 51, 287, 273, 55, -1, 246, + 58, -1, 275, -1, 42, -1, -1, -1, 18, 19, 20, 21, 50, 23, 24, 25, 26, 55, 28, 29, 58, 31, -1, 18, 19, 20, 21, -1, 23, 24, 25, 26, -1, 28, 29, 45, 31, -1, -1, -1, @@ -929,52 +1005,53 @@ static const short int yycheck[] = -1, 55, -1, -1, 58, -1, -1, 18, 19, 20, 21, -1, 23, 24, 25, 26, 50, 28, 29, -1, 31, 55, -1, -1, 58, 18, 19, 20, 21, -1, - 23, 24, 25, 26, 42, 28, 29, -1, 31, 50, - -1, -1, -1, -1, 55, -1, -1, 58, -1, 57, - 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, - -1, -1, 55, -1, -1, 58, 57, 58, 59, 60, - 61, 62, 63, 64, 4, 5, 6, 7, 8, 9, - 10, 11 + 23, 24, 25, 26, -1, 28, 29, -1, 31, 50, + -1, -1, -1, -1, 55, -1, -1, 58, 18, 19, + 20, 21, 42, 23, 24, 25, 26, -1, 28, 29, + 53, 31, 55, -1, -1, 58, -1, 57, 58, 59, + 60, 61, 62, 63, 64, 57, 58, 59, 60, 61, + 62, 63, 64, -1, -1, 55, -1, -1, 58, 4, + 5, 6, 7, 8, 9, 10, 11 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const unsigned char yystos[] = +static const yytype_uint8 yystos[] = { 0, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, 70, 71, 72, 74, 75, 76, 0, 68, 74, 71, 74, 4, 5, 6, 7, 8, 9, 10, - 11, 69, 73, 76, 73, 52, 135, 136, 135, 135, + 11, 69, 73, 76, 73, 52, 136, 137, 136, 136, 41, 41, 77, 70, 77, 12, 13, 14, 15, 16, 78, 116, 117, 42, 42, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 28, 29, 31, 32, 33, 34, 35, 50, 55, 56, 58, 79, 80, 81, 82, 85, 88, 89, 93, 94, 95, 96, 97, 98, 112, - 113, 114, 115, 124, 132, 133, 52, 49, 49, 83, - 84, 133, 52, 134, 29, 53, 55, 86, 128, 131, - 132, 132, 131, 133, 131, 134, 134, 134, 25, 133, - 134, 45, 47, 36, 36, 49, 48, 49, 36, 41, + 113, 114, 115, 124, 133, 134, 52, 49, 49, 83, + 84, 134, 52, 135, 29, 53, 55, 86, 128, 132, + 133, 133, 132, 134, 132, 135, 135, 135, 25, 134, + 135, 45, 47, 36, 36, 49, 48, 49, 36, 41, 41, 37, 41, 36, 36, 41, 36, 41, 41, 41, - 131, 49, 41, 18, 19, 21, 23, 24, 25, 26, + 132, 49, 41, 18, 19, 21, 23, 24, 25, 26, 29, 31, 37, 38, 43, 50, 51, 54, 114, 120, - 121, 124, 125, 130, 131, 132, 133, 134, 114, 120, + 121, 124, 125, 131, 132, 133, 134, 135, 114, 120, 120, 84, 120, 79, 87, 87, 120, 45, 50, 90, - 91, 92, 124, 133, 132, 120, 119, 120, 120, 87, - 41, 45, 108, 109, 110, 111, 133, 25, 28, 30, + 91, 92, 124, 134, 133, 120, 119, 120, 120, 87, + 41, 45, 108, 109, 110, 111, 134, 25, 28, 30, 79, 95, 99, 100, 105, 112, 36, 87, 121, 124, 121, 120, 121, 121, 43, 37, 38, 39, 40, 46, 36, 45, 49, 49, 42, 79, 42, 29, 55, 114, - 122, 123, 126, 127, 128, 133, 42, 48, 36, 49, - 49, 42, 48, 49, 42, 110, 53, 54, 129, 42, - 48, 42, 48, 36, 41, 134, 42, 100, 120, 42, - 44, 118, 119, 120, 120, 120, 120, 120, 120, 49, - 49, 43, 46, 48, 46, 48, 49, 91, 92, 120, - 49, 120, 49, 42, 48, 49, 109, 49, 111, 41, - 120, 27, 79, 101, 102, 41, 49, 49, 49, 44, - 46, 118, 123, 128, 129, 110, 41, 42, 102, 106, - 107, 132, 44, 46, 42, 41, 103, 104, 132, 49, - 42, 48, 36, 119, 42, 48, 49, 107, 132, 42, - 49, 104 + 122, 123, 126, 127, 128, 134, 42, 48, 36, 49, + 49, 42, 48, 49, 42, 110, 38, 53, 54, 129, + 130, 42, 48, 42, 48, 36, 41, 135, 42, 100, + 120, 42, 44, 118, 119, 120, 120, 120, 120, 120, + 120, 49, 49, 43, 46, 48, 46, 48, 49, 91, + 92, 120, 49, 120, 49, 42, 130, 48, 49, 109, + 49, 111, 41, 120, 27, 79, 101, 102, 41, 49, + 49, 49, 44, 46, 118, 123, 128, 129, 110, 41, + 42, 102, 106, 107, 133, 44, 46, 42, 41, 103, + 104, 133, 49, 42, 48, 36, 119, 42, 48, 49, + 107, 133, 42, 49, 104 }; #define yyerrok (yyerrstatus = 0) @@ -1002,7 +1079,7 @@ do \ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ @@ -1010,7 +1087,7 @@ do \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (0) +while (YYID (0)) #define YYTERROR 1 @@ -1025,7 +1102,7 @@ while (0) #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (N) \ + if (YYID (N)) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -1039,7 +1116,7 @@ while (0) (Current).first_column = (Current).last_column = \ YYRHSLOC (Rhs, 0).last_column; \ } \ - while (0) + while (YYID (0)) #endif @@ -1051,8 +1128,8 @@ while (0) # if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -1079,36 +1156,96 @@ while (0) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (0) +} while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (/* Nothing. */; bottom <= top; ++bottom) + for (; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -1117,37 +1254,45 @@ yy_stack_print (bottom, top) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (0) +} while (YYID (0)) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) #else static void -yy_reduce_print (yyrule) +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; int yyrule; #endif { + int yynrhs = yyr2[yyrule]; int yyi; unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", - 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]]); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (Rule); \ -} while (0) + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1181,42 +1326,44 @@ int yydebug; #if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1242,7 +1389,7 @@ yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { - size_t yyn = 0; + YYSIZE_T yyn = 0; char const *yyp = yystr; for (;;) @@ -1277,53 +1424,123 @@ yytnamerr (char *yyres, const char *yystr) } # endif -#endif /* YYERROR_VERBOSE */ +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ -#if YYDEBUG -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#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]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - switch (yytype) - { - default: - break; - } - YYFPRINTF (yyoutput, ")"); -} - -#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else @@ -1334,8 +1551,7 @@ yydestruct (yymsg, yytype, yyvaluep) YYSTYPE *yyvaluep; #endif { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + YYUSE (yyvaluep); if (!yymsg) yymsg = "Deleting"; @@ -1345,7 +1561,7 @@ yydestruct (yymsg, yytype, yyvaluep) { default: - break; + break; } } @@ -1353,13 +1569,13 @@ yydestruct (yymsg, yytype, yyvaluep) /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); -# else +#else int yyparse (); -# endif +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void); #else int yyparse (); @@ -1384,20 +1600,24 @@ int yynerrs; `----------*/ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -int yyparse (void *YYPARSE_PARAM) -# else -int yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -# endif +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int yyparse (void) #else int yyparse () - ; + #endif #endif { @@ -1409,6 +1629,12 @@ yyparse () int yyerrstatus; /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -1419,9 +1645,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - short int *yyssp; + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1430,7 +1656,7 @@ yyparse () -#define YYPOPSTACK (yyvsp--, yyssp--) +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) YYSIZE_T yystacksize = YYINITDEPTH; @@ -1439,9 +1665,9 @@ yyparse () YYSTYPE yyval; - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1465,8 +1691,7 @@ yyparse () `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: @@ -1479,11 +1704,11 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1511,7 +1736,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1546,12 +1771,10 @@ yyparse () `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ -/* yyresume: */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; @@ -1593,22 +1816,21 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; - - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + yystate = yyn; + *++yyvsp = yylval; + goto yynewstate; @@ -1644,967 +1866,967 @@ yyreduce: switch (yyn) { case 2: -#line 170 "xkbparse.y" - { (yyval.file)= rtrnValue= (yyvsp[0].file); } +#line 170 "../xkbparse.y" + { (yyval.file)= rtrnValue= (yyvsp[(1) - (1)].file); } break; case 3: -#line 172 "xkbparse.y" - { (yyval.file)= rtrnValue= (yyvsp[0].file); } +#line 172 "../xkbparse.y" + { (yyval.file)= rtrnValue= (yyvsp[(1) - (1)].file); } break; case 4: -#line 174 "xkbparse.y" - { (yyval.file)= rtrnValue= (yyvsp[0].file); } +#line 174 "../xkbparse.y" + { (yyval.file)= rtrnValue= (yyvsp[(1) - (1)].file); } break; case 5: -#line 178 "xkbparse.y" - { (yyval.file)= (XkbFile *)AppendStmt(&(yyvsp[-1].file)->common,&(yyvsp[0].file)->common); } +#line 178 "../xkbparse.y" + { (yyval.file)= (XkbFile *)AppendStmt(&(yyvsp[(1) - (2)].file)->common,&(yyvsp[(2) - (2)].file)->common); } break; case 6: -#line 180 "xkbparse.y" - { (yyval.file)= (yyvsp[0].file); } +#line 180 "../xkbparse.y" + { (yyval.file)= (yyvsp[(1) - (1)].file); } break; case 7: -#line 186 "xkbparse.y" - { (yyval.file)= CreateXKBFile((yyvsp[-5].uval),(yyvsp[-4].str),&(yyvsp[-2].file)->common,(yyvsp[-6].uval)); } +#line 186 "../xkbparse.y" + { (yyval.file)= CreateXKBFile((yyvsp[(2) - (7)].uval),(yyvsp[(3) - (7)].str),&(yyvsp[(5) - (7)].file)->common,(yyvsp[(1) - (7)].uval)); } break; case 8: -#line 189 "xkbparse.y" +#line 189 "../xkbparse.y" { (yyval.uval)= XkmKeymapFile; } break; case 9: -#line 190 "xkbparse.y" +#line 190 "../xkbparse.y" { (yyval.uval)= XkmSemanticsFile; } break; case 10: -#line 191 "xkbparse.y" +#line 191 "../xkbparse.y" { (yyval.uval)= XkmLayoutFile; } break; case 11: -#line 195 "xkbparse.y" - { (yyval.file)= (XkbFile *)AppendStmt(&(yyvsp[-1].file)->common,&(yyvsp[0].file)->common); } +#line 195 "../xkbparse.y" + { (yyval.file)= (XkbFile *)AppendStmt(&(yyvsp[(1) - (2)].file)->common,&(yyvsp[(2) - (2)].file)->common); } break; case 12: -#line 197 "xkbparse.y" - { (yyval.file)= (yyvsp[0].file); } +#line 197 "../xkbparse.y" + { (yyval.file)= (yyvsp[(1) - (1)].file); } break; case 13: -#line 203 "xkbparse.y" - { (yyval.file)= CreateXKBFile((yyvsp[-5].uval),(yyvsp[-4].str),(yyvsp[-2].any),(yyvsp[-6].uval)); } +#line 203 "../xkbparse.y" + { (yyval.file)= CreateXKBFile((yyvsp[(2) - (7)].uval),(yyvsp[(3) - (7)].str),(yyvsp[(5) - (7)].any),(yyvsp[(1) - (7)].uval)); } break; case 14: -#line 207 "xkbparse.y" - { (yyval.file)= CreateXKBFile((yyvsp[-2].uval),(yyvsp[-1].str),(yyvsp[0].any),(yyvsp[-3].uval)); } +#line 207 "../xkbparse.y" + { (yyval.file)= CreateXKBFile((yyvsp[(2) - (4)].uval),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].any),(yyvsp[(1) - (4)].uval)); } break; case 15: -#line 211 "xkbparse.y" +#line 211 "../xkbparse.y" { (yyval.uval)= XkmKeyNamesIndex; } break; case 16: -#line 212 "xkbparse.y" +#line 212 "../xkbparse.y" { (yyval.uval)= XkmTypesIndex; } break; case 17: -#line 213 "xkbparse.y" +#line 213 "../xkbparse.y" { (yyval.uval)= XkmCompatMapIndex; } break; case 18: -#line 214 "xkbparse.y" +#line 214 "../xkbparse.y" { (yyval.uval)= XkmSymbolsIndex; } break; case 19: -#line 215 "xkbparse.y" +#line 215 "../xkbparse.y" { (yyval.uval)= XkmGeometryIndex; } break; case 20: -#line 218 "xkbparse.y" - { (yyval.uval)= (yyvsp[0].uval); } +#line 218 "../xkbparse.y" + { (yyval.uval)= (yyvsp[(1) - (1)].uval); } break; case 21: -#line 219 "xkbparse.y" +#line 219 "../xkbparse.y" { (yyval.uval)= 0; } break; case 22: -#line 222 "xkbparse.y" - { (yyval.uval)= (((yyvsp[-1].uval))|((yyvsp[0].uval))); } +#line 222 "../xkbparse.y" + { (yyval.uval)= (((yyvsp[(1) - (2)].uval))|((yyvsp[(2) - (2)].uval))); } break; case 23: -#line 223 "xkbparse.y" - { (yyval.uval)= (yyvsp[0].uval); } +#line 223 "../xkbparse.y" + { (yyval.uval)= (yyvsp[(1) - (1)].uval); } break; case 24: -#line 226 "xkbparse.y" +#line 226 "../xkbparse.y" { (yyval.uval)= XkbLC_Partial; } break; case 25: -#line 227 "xkbparse.y" +#line 227 "../xkbparse.y" { (yyval.uval)= XkbLC_Default; } break; case 26: -#line 228 "xkbparse.y" +#line 228 "../xkbparse.y" { (yyval.uval)= XkbLC_Hidden; } break; case 27: -#line 229 "xkbparse.y" +#line 229 "../xkbparse.y" { (yyval.uval)= XkbLC_AlphanumericKeys; } break; case 28: -#line 230 "xkbparse.y" +#line 230 "../xkbparse.y" { (yyval.uval)= XkbLC_ModifierKeys; } break; case 29: -#line 231 "xkbparse.y" +#line 231 "../xkbparse.y" { (yyval.uval)= XkbLC_KeypadKeys; } break; case 30: -#line 232 "xkbparse.y" +#line 232 "../xkbparse.y" { (yyval.uval)= XkbLC_FunctionKeys; } break; case 31: -#line 233 "xkbparse.y" +#line 233 "../xkbparse.y" { (yyval.uval)= XkbLC_AlternateGroup; } break; case 32: -#line 237 "xkbparse.y" - { (yyval.any)= AppendStmt((yyvsp[-1].any),(yyvsp[0].any)); } +#line 237 "../xkbparse.y" + { (yyval.any)= AppendStmt((yyvsp[(1) - (2)].any),(yyvsp[(2) - (2)].any)); } break; case 33: -#line 238 "xkbparse.y" +#line 238 "../xkbparse.y" { (yyval.any)= NULL; } break; case 34: -#line 242 "xkbparse.y" +#line 242 "../xkbparse.y" { - (yyvsp[0].var)->merge= StmtSetMerge(&(yyvsp[0].var)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].var)->common; + (yyvsp[(2) - (2)].var)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].var)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].var)->common; } break; case 35: -#line 247 "xkbparse.y" +#line 247 "../xkbparse.y" { - (yyvsp[0].vmod)->merge= StmtSetMerge(&(yyvsp[0].vmod)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].vmod)->common; + (yyvsp[(2) - (2)].vmod)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].vmod)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].vmod)->common; } break; case 36: -#line 252 "xkbparse.y" +#line 252 "../xkbparse.y" { - (yyvsp[0].interp)->merge= StmtSetMerge(&(yyvsp[0].interp)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].interp)->common; + (yyvsp[(2) - (2)].interp)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].interp)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].interp)->common; } break; case 37: -#line 257 "xkbparse.y" +#line 257 "../xkbparse.y" { - (yyvsp[0].keyName)->merge= StmtSetMerge(&(yyvsp[0].keyName)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].keyName)->common; + (yyvsp[(2) - (2)].keyName)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].keyName)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].keyName)->common; } break; case 38: -#line 262 "xkbparse.y" +#line 262 "../xkbparse.y" { - (yyvsp[0].keyAlias)->merge= StmtSetMerge(&(yyvsp[0].keyAlias)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].keyAlias)->common; + (yyvsp[(2) - (2)].keyAlias)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].keyAlias)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].keyAlias)->common; } break; case 39: -#line 267 "xkbparse.y" +#line 267 "../xkbparse.y" { - (yyvsp[0].keyType)->merge= StmtSetMerge(&(yyvsp[0].keyType)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].keyType)->common; + (yyvsp[(2) - (2)].keyType)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].keyType)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].keyType)->common; } break; case 40: -#line 272 "xkbparse.y" +#line 272 "../xkbparse.y" { - (yyvsp[0].syms)->merge= StmtSetMerge(&(yyvsp[0].syms)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].syms)->common; + (yyvsp[(2) - (2)].syms)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].syms)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].syms)->common; } break; case 41: -#line 277 "xkbparse.y" +#line 277 "../xkbparse.y" { - (yyvsp[0].modMask)->merge= StmtSetMerge(&(yyvsp[0].modMask)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].modMask)->common; + (yyvsp[(2) - (2)].modMask)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].modMask)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].modMask)->common; } break; case 42: -#line 282 "xkbparse.y" +#line 282 "../xkbparse.y" { - (yyvsp[0].groupCompat)->merge= StmtSetMerge(&(yyvsp[0].groupCompat)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].groupCompat)->common; + (yyvsp[(2) - (2)].groupCompat)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].groupCompat)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].groupCompat)->common; } break; case 43: -#line 287 "xkbparse.y" +#line 287 "../xkbparse.y" { - (yyvsp[0].ledMap)->merge= StmtSetMerge(&(yyvsp[0].ledMap)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].ledMap)->common; + (yyvsp[(2) - (2)].ledMap)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].ledMap)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].ledMap)->common; } break; case 44: -#line 292 "xkbparse.y" +#line 292 "../xkbparse.y" { - (yyvsp[0].ledName)->merge= StmtSetMerge(&(yyvsp[0].ledName)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].ledName)->common; + (yyvsp[(2) - (2)].ledName)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].ledName)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].ledName)->common; } break; case 45: -#line 297 "xkbparse.y" +#line 297 "../xkbparse.y" { - (yyvsp[0].shape)->merge= StmtSetMerge(&(yyvsp[0].shape)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].shape)->common; + (yyvsp[(2) - (2)].shape)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].shape)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].shape)->common; } break; case 46: -#line 302 "xkbparse.y" +#line 302 "../xkbparse.y" { - (yyvsp[0].section)->merge= StmtSetMerge(&(yyvsp[0].section)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].section)->common; + (yyvsp[(2) - (2)].section)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].section)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].section)->common; } break; case 47: -#line 307 "xkbparse.y" +#line 307 "../xkbparse.y" { - (yyvsp[0].doodad)->merge= StmtSetMerge(&(yyvsp[0].doodad)->common,(yyvsp[-1].uval)); - (yyval.any)= &(yyvsp[0].doodad)->common; + (yyvsp[(2) - (2)].doodad)->merge= StmtSetMerge(&(yyvsp[(2) - (2)].doodad)->common,(yyvsp[(1) - (2)].uval)); + (yyval.any)= &(yyvsp[(2) - (2)].doodad)->common; } break; case 48: -#line 312 "xkbparse.y" +#line 312 "../xkbparse.y" { - if ((yyvsp[-1].uval)==MergeAltForm) { + if ((yyvsp[(1) - (2)].uval)==MergeAltForm) { yyerror("cannot use 'alternate' to include other maps"); (yyval.any)= &IncludeCreate(scanStr,MergeDefault)->common; } else { - (yyval.any)= &IncludeCreate(scanStr,(yyvsp[-1].uval))->common; + (yyval.any)= &IncludeCreate(scanStr,(yyvsp[(1) - (2)].uval))->common; } } break; case 49: -#line 324 "xkbparse.y" - { (yyval.var)= VarCreate((yyvsp[-3].expr),(yyvsp[-1].expr)); } +#line 324 "../xkbparse.y" + { (yyval.var)= VarCreate((yyvsp[(1) - (4)].expr),(yyvsp[(3) - (4)].expr)); } break; case 50: -#line 326 "xkbparse.y" - { (yyval.var)= BoolVarCreate((yyvsp[-1].sval),1); } +#line 326 "../xkbparse.y" + { (yyval.var)= BoolVarCreate((yyvsp[(1) - (2)].sval),1); } break; case 51: -#line 328 "xkbparse.y" - { (yyval.var)= BoolVarCreate((yyvsp[-1].sval),0); } +#line 328 "../xkbparse.y" + { (yyval.var)= BoolVarCreate((yyvsp[(2) - (3)].sval),0); } break; case 52: -#line 332 "xkbparse.y" +#line 332 "../xkbparse.y" { KeycodeDef *def; - def= KeycodeCreate((yyvsp[-3].str),(yyvsp[-1].expr)); - if ((yyvsp[-3].str)) - free((yyvsp[-3].str)); + def= KeycodeCreate((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].expr)); + if ((yyvsp[(1) - (4)].str)) + free((yyvsp[(1) - (4)].str)); (yyval.keyName)= def; } break; case 53: -#line 343 "xkbparse.y" +#line 343 "../xkbparse.y" { KeyAliasDef *def; - def= KeyAliasCreate((yyvsp[-3].str),(yyvsp[-1].str)); - if ((yyvsp[-3].str)) free((yyvsp[-3].str)); - if ((yyvsp[-1].str)) free((yyvsp[-1].str)); + def= KeyAliasCreate((yyvsp[(2) - (5)].str),(yyvsp[(4) - (5)].str)); + if ((yyvsp[(2) - (5)].str)) free((yyvsp[(2) - (5)].str)); + if ((yyvsp[(4) - (5)].str)) free((yyvsp[(4) - (5)].str)); (yyval.keyAlias)= def; } break; case 54: -#line 353 "xkbparse.y" - { (yyval.vmod)= (yyvsp[-1].vmod); } +#line 353 "../xkbparse.y" + { (yyval.vmod)= (yyvsp[(2) - (3)].vmod); } break; case 55: -#line 357 "xkbparse.y" - { (yyval.vmod)= (VModDef *)AppendStmt(&(yyvsp[-2].vmod)->common,&(yyvsp[0].vmod)->common); } +#line 357 "../xkbparse.y" + { (yyval.vmod)= (VModDef *)AppendStmt(&(yyvsp[(1) - (3)].vmod)->common,&(yyvsp[(3) - (3)].vmod)->common); } break; case 56: -#line 359 "xkbparse.y" - { (yyval.vmod)= (yyvsp[0].vmod); } +#line 359 "../xkbparse.y" + { (yyval.vmod)= (yyvsp[(1) - (1)].vmod); } break; case 57: -#line 363 "xkbparse.y" - { (yyval.vmod)= VModCreate((yyvsp[0].sval),NULL); } +#line 363 "../xkbparse.y" + { (yyval.vmod)= VModCreate((yyvsp[(1) - (1)].sval),NULL); } break; case 58: -#line 365 "xkbparse.y" - { (yyval.vmod)= VModCreate((yyvsp[-2].sval),(yyvsp[0].expr)); } +#line 365 "../xkbparse.y" + { (yyval.vmod)= VModCreate((yyvsp[(1) - (3)].sval),(yyvsp[(3) - (3)].expr)); } break; case 59: -#line 371 "xkbparse.y" +#line 371 "../xkbparse.y" { - (yyvsp[-4].interp)->def= (yyvsp[-2].var); - (yyval.interp)= (yyvsp[-4].interp); + (yyvsp[(2) - (6)].interp)->def= (yyvsp[(4) - (6)].var); + (yyval.interp)= (yyvsp[(2) - (6)].interp); } break; case 60: -#line 378 "xkbparse.y" - { (yyval.interp)= InterpCreate((KeySym)(yyvsp[-2].uval),(yyvsp[0].expr)); } +#line 378 "../xkbparse.y" + { (yyval.interp)= InterpCreate((KeySym)(yyvsp[(1) - (3)].uval),(yyvsp[(3) - (3)].expr)); } break; case 61: -#line 380 "xkbparse.y" - { (yyval.interp)= InterpCreate((KeySym)(yyvsp[0].uval),NULL); } +#line 380 "../xkbparse.y" + { (yyval.interp)= InterpCreate((KeySym)(yyvsp[(1) - (1)].uval),NULL); } break; case 62: -#line 384 "xkbparse.y" - { (yyval.var)= (VarDef *)AppendStmt(&(yyvsp[-1].var)->common,&(yyvsp[0].var)->common); } +#line 384 "../xkbparse.y" + { (yyval.var)= (VarDef *)AppendStmt(&(yyvsp[(1) - (2)].var)->common,&(yyvsp[(2) - (2)].var)->common); } break; case 63: -#line 386 "xkbparse.y" - { (yyval.var)= (yyvsp[0].var); } +#line 386 "../xkbparse.y" + { (yyval.var)= (yyvsp[(1) - (1)].var); } break; case 64: -#line 392 "xkbparse.y" - { (yyval.keyType)= KeyTypeCreate((yyvsp[-4].sval),(yyvsp[-2].var)); } +#line 392 "../xkbparse.y" + { (yyval.keyType)= KeyTypeCreate((yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].var)); } break; case 65: -#line 398 "xkbparse.y" - { (yyval.syms)= SymbolsCreate((yyvsp[-4].str),(ExprDef *)(yyvsp[-2].var)); } +#line 398 "../xkbparse.y" + { (yyval.syms)= SymbolsCreate((yyvsp[(2) - (6)].str),(ExprDef *)(yyvsp[(4) - (6)].var)); } break; case 66: -#line 402 "xkbparse.y" - { (yyval.var)= (VarDef *)AppendStmt(&(yyvsp[-2].var)->common,&(yyvsp[0].var)->common); } +#line 402 "../xkbparse.y" + { (yyval.var)= (VarDef *)AppendStmt(&(yyvsp[(1) - (3)].var)->common,&(yyvsp[(3) - (3)].var)->common); } break; case 67: -#line 404 "xkbparse.y" - { (yyval.var)= (yyvsp[0].var); } +#line 404 "../xkbparse.y" + { (yyval.var)= (yyvsp[(1) - (1)].var); } break; case 68: -#line 405 "xkbparse.y" +#line 405 "../xkbparse.y" { (yyval.var)= NULL; } break; case 69: -#line 409 "xkbparse.y" - { (yyval.var)= VarCreate((yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 409 "../xkbparse.y" + { (yyval.var)= VarCreate((yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 70: -#line 411 "xkbparse.y" - { (yyval.var)= VarCreate((yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 411 "../xkbparse.y" + { (yyval.var)= VarCreate((yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 71: -#line 413 "xkbparse.y" - { (yyval.var)= BoolVarCreate((yyvsp[0].sval),1); } +#line 413 "../xkbparse.y" + { (yyval.var)= BoolVarCreate((yyvsp[(1) - (1)].sval),1); } break; case 72: -#line 415 "xkbparse.y" - { (yyval.var)= BoolVarCreate((yyvsp[0].sval),0); } +#line 415 "../xkbparse.y" + { (yyval.var)= BoolVarCreate((yyvsp[(2) - (2)].sval),0); } break; case 73: -#line 417 "xkbparse.y" - { (yyval.var)= VarCreate(NULL,(yyvsp[0].expr)); } +#line 417 "../xkbparse.y" + { (yyval.var)= VarCreate(NULL,(yyvsp[(1) - (1)].expr)); } break; case 74: -#line 421 "xkbparse.y" - { (yyval.expr)= (yyvsp[-1].expr); } +#line 421 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(2) - (3)].expr); } break; case 75: -#line 423 "xkbparse.y" - { (yyval.expr)= ExprCreateUnary(ExprActionList,TypeAction,(yyvsp[-1].expr)); } +#line 423 "../xkbparse.y" + { (yyval.expr)= ExprCreateUnary(ExprActionList,TypeAction,(yyvsp[(2) - (3)].expr)); } break; case 76: -#line 427 "xkbparse.y" - { (yyval.groupCompat)= GroupCompatCreate((yyvsp[-3].ival),(yyvsp[-1].expr)); } +#line 427 "../xkbparse.y" + { (yyval.groupCompat)= GroupCompatCreate((yyvsp[(2) - (5)].ival),(yyvsp[(4) - (5)].expr)); } break; case 77: -#line 431 "xkbparse.y" - { (yyval.modMask)= ModMapCreate((yyvsp[-4].sval),(yyvsp[-2].expr)); } +#line 431 "../xkbparse.y" + { (yyval.modMask)= ModMapCreate((yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].expr)); } break; case 78: -#line 435 "xkbparse.y" - { (yyval.ledMap)= IndicatorMapCreate((yyvsp[-4].sval),(yyvsp[-2].var)); } +#line 435 "../xkbparse.y" + { (yyval.ledMap)= IndicatorMapCreate((yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].var)); } break; case 79: -#line 439 "xkbparse.y" - { (yyval.ledName)= IndicatorNameCreate((yyvsp[-3].ival),(yyvsp[-1].expr),False); } +#line 439 "../xkbparse.y" + { (yyval.ledName)= IndicatorNameCreate((yyvsp[(2) - (5)].ival),(yyvsp[(4) - (5)].expr),False); } break; case 80: -#line 441 "xkbparse.y" - { (yyval.ledName)= IndicatorNameCreate((yyvsp[-3].ival),(yyvsp[-1].expr),True); } +#line 441 "../xkbparse.y" + { (yyval.ledName)= IndicatorNameCreate((yyvsp[(3) - (6)].ival),(yyvsp[(5) - (6)].expr),True); } break; case 81: -#line 445 "xkbparse.y" - { (yyval.shape)= ShapeDeclCreate((yyvsp[-4].sval),(OutlineDef *)&(yyvsp[-2].outline)->common); } +#line 445 "../xkbparse.y" + { (yyval.shape)= ShapeDeclCreate((yyvsp[(2) - (6)].sval),(OutlineDef *)&(yyvsp[(4) - (6)].outline)->common); } break; case 82: -#line 447 "xkbparse.y" +#line 447 "../xkbparse.y" { OutlineDef *outlines; - outlines= OutlineCreate(None,(yyvsp[-2].expr)); - (yyval.shape)= ShapeDeclCreate((yyvsp[-4].sval),outlines); + outlines= OutlineCreate(None,(yyvsp[(4) - (6)].expr)); + (yyval.shape)= ShapeDeclCreate((yyvsp[(2) - (6)].sval),outlines); } break; case 83: -#line 455 "xkbparse.y" - { (yyval.section)= SectionDeclCreate((yyvsp[-4].sval),(yyvsp[-2].row)); } +#line 455 "../xkbparse.y" + { (yyval.section)= SectionDeclCreate((yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].row)); } break; case 84: -#line 459 "xkbparse.y" - { (yyval.row)=(RowDef *)AppendStmt(&(yyvsp[-1].row)->common,&(yyvsp[0].row)->common);} +#line 459 "../xkbparse.y" + { (yyval.row)=(RowDef *)AppendStmt(&(yyvsp[(1) - (2)].row)->common,&(yyvsp[(2) - (2)].row)->common);} break; case 85: -#line 461 "xkbparse.y" - { (yyval.row)= (yyvsp[0].row); } +#line 461 "../xkbparse.y" + { (yyval.row)= (yyvsp[(1) - (1)].row); } break; case 86: -#line 465 "xkbparse.y" - { (yyval.row)= RowDeclCreate((yyvsp[-2].key)); } +#line 465 "../xkbparse.y" + { (yyval.row)= RowDeclCreate((yyvsp[(3) - (5)].key)); } break; case 87: -#line 467 "xkbparse.y" - { (yyval.row)= (RowDef *)(yyvsp[0].var); } +#line 467 "../xkbparse.y" + { (yyval.row)= (RowDef *)(yyvsp[(1) - (1)].var); } break; case 88: -#line 469 "xkbparse.y" - { (yyval.row)= (RowDef *)(yyvsp[0].doodad); } +#line 469 "../xkbparse.y" + { (yyval.row)= (RowDef *)(yyvsp[(1) - (1)].doodad); } break; case 89: -#line 471 "xkbparse.y" - { (yyval.row)= (RowDef *)(yyvsp[0].ledMap); } +#line 471 "../xkbparse.y" + { (yyval.row)= (RowDef *)(yyvsp[(1) - (1)].ledMap); } break; case 90: -#line 473 "xkbparse.y" - { (yyval.row)= (RowDef *)(yyvsp[0].overlay); } +#line 473 "../xkbparse.y" + { (yyval.row)= (RowDef *)(yyvsp[(1) - (1)].overlay); } break; case 91: -#line 477 "xkbparse.y" - { (yyval.key)=(KeyDef *)AppendStmt(&(yyvsp[-1].key)->common,&(yyvsp[0].key)->common);} +#line 477 "../xkbparse.y" + { (yyval.key)=(KeyDef *)AppendStmt(&(yyvsp[(1) - (2)].key)->common,&(yyvsp[(2) - (2)].key)->common);} break; case 92: -#line 479 "xkbparse.y" - { (yyval.key)= (yyvsp[0].key); } +#line 479 "../xkbparse.y" + { (yyval.key)= (yyvsp[(1) - (1)].key); } break; case 93: -#line 483 "xkbparse.y" - { (yyval.key)= (yyvsp[-2].key); } +#line 483 "../xkbparse.y" + { (yyval.key)= (yyvsp[(3) - (5)].key); } break; case 94: -#line 485 "xkbparse.y" - { (yyval.key)= (KeyDef *)(yyvsp[0].var); } +#line 485 "../xkbparse.y" + { (yyval.key)= (KeyDef *)(yyvsp[(1) - (1)].var); } break; case 95: -#line 489 "xkbparse.y" - { (yyval.key)=(KeyDef *)AppendStmt(&(yyvsp[-2].key)->common,&(yyvsp[0].key)->common);} +#line 489 "../xkbparse.y" + { (yyval.key)=(KeyDef *)AppendStmt(&(yyvsp[(1) - (3)].key)->common,&(yyvsp[(3) - (3)].key)->common);} break; case 96: -#line 491 "xkbparse.y" - { (yyval.key)= (yyvsp[0].key); } +#line 491 "../xkbparse.y" + { (yyval.key)= (yyvsp[(1) - (1)].key); } break; case 97: -#line 495 "xkbparse.y" - { (yyval.key)= KeyDeclCreate((yyvsp[0].str),NULL); } +#line 495 "../xkbparse.y" + { (yyval.key)= KeyDeclCreate((yyvsp[(1) - (1)].str),NULL); } break; case 98: -#line 497 "xkbparse.y" - { (yyval.key)= KeyDeclCreate(NULL,(yyvsp[-1].expr)); } +#line 497 "../xkbparse.y" + { (yyval.key)= KeyDeclCreate(NULL,(yyvsp[(2) - (3)].expr)); } break; case 99: -#line 501 "xkbparse.y" - { (yyval.overlay)= OverlayDeclCreate((yyvsp[-4].sval),(yyvsp[-2].olKey)); } +#line 501 "../xkbparse.y" + { (yyval.overlay)= OverlayDeclCreate((yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].olKey)); } break; case 100: -#line 505 "xkbparse.y" +#line 505 "../xkbparse.y" { (yyval.olKey)= (OverlayKeyDef *) - AppendStmt(&(yyvsp[-2].olKey)->common,&(yyvsp[0].olKey)->common); + AppendStmt(&(yyvsp[(1) - (3)].olKey)->common,&(yyvsp[(3) - (3)].olKey)->common); } break; case 101: -#line 510 "xkbparse.y" - { (yyval.olKey)= (yyvsp[0].olKey); } +#line 510 "../xkbparse.y" + { (yyval.olKey)= (yyvsp[(1) - (1)].olKey); } break; case 102: -#line 514 "xkbparse.y" - { (yyval.olKey)= OverlayKeyCreate((yyvsp[-2].str),(yyvsp[0].str)); } +#line 514 "../xkbparse.y" + { (yyval.olKey)= OverlayKeyCreate((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str)); } break; case 103: -#line 518 "xkbparse.y" - { (yyval.outline)=(OutlineDef *)AppendStmt(&(yyvsp[-2].outline)->common,&(yyvsp[0].outline)->common);} +#line 518 "../xkbparse.y" + { (yyval.outline)=(OutlineDef *)AppendStmt(&(yyvsp[(1) - (3)].outline)->common,&(yyvsp[(3) - (3)].outline)->common);} break; case 104: -#line 520 "xkbparse.y" - { (yyval.outline)= (yyvsp[0].outline); } +#line 520 "../xkbparse.y" + { (yyval.outline)= (yyvsp[(1) - (1)].outline); } break; case 105: -#line 524 "xkbparse.y" - { (yyval.outline)= OutlineCreate(None,(yyvsp[-1].expr)); } +#line 524 "../xkbparse.y" + { (yyval.outline)= OutlineCreate(None,(yyvsp[(2) - (3)].expr)); } break; case 106: -#line 526 "xkbparse.y" - { (yyval.outline)= OutlineCreate((yyvsp[-4].sval),(yyvsp[-1].expr)); } +#line 526 "../xkbparse.y" + { (yyval.outline)= OutlineCreate((yyvsp[(1) - (5)].sval),(yyvsp[(4) - (5)].expr)); } break; case 107: -#line 528 "xkbparse.y" - { (yyval.outline)= OutlineCreate((yyvsp[-2].sval),(yyvsp[0].expr)); } +#line 528 "../xkbparse.y" + { (yyval.outline)= OutlineCreate((yyvsp[(1) - (3)].sval),(yyvsp[(3) - (3)].expr)); } break; case 108: -#line 532 "xkbparse.y" - { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[-2].expr)->common,&(yyvsp[0].expr)->common); } +#line 532 "../xkbparse.y" + { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[(1) - (3)].expr)->common,&(yyvsp[(3) - (3)].expr)->common); } break; case 109: -#line 534 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 534 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 110: -#line 538 "xkbparse.y" +#line 538 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprCoord,TypeUnknown); - expr->value.coord.x= (yyvsp[-3].ival); - expr->value.coord.y= (yyvsp[-1].ival); + expr->value.coord.x= (yyvsp[(2) - (5)].ival); + expr->value.coord.y= (yyvsp[(4) - (5)].ival); (yyval.expr)= expr; } break; case 111: -#line 548 "xkbparse.y" - { (yyval.doodad)= DoodadCreate((yyvsp[-5].uval),(yyvsp[-4].sval),(yyvsp[-2].var)); } +#line 548 "../xkbparse.y" + { (yyval.doodad)= DoodadCreate((yyvsp[(1) - (6)].uval),(yyvsp[(2) - (6)].sval),(yyvsp[(4) - (6)].var)); } break; case 112: -#line 551 "xkbparse.y" +#line 551 "../xkbparse.y" { (yyval.uval)= XkbTextDoodad; } break; case 113: -#line 552 "xkbparse.y" +#line 552 "../xkbparse.y" { (yyval.uval)= XkbOutlineDoodad; } break; case 114: -#line 553 "xkbparse.y" +#line 553 "../xkbparse.y" { (yyval.uval)= XkbSolidDoodad; } break; case 115: -#line 554 "xkbparse.y" +#line 554 "../xkbparse.y" { (yyval.uval)= XkbLogoDoodad; } break; case 116: -#line 557 "xkbparse.y" - { (yyval.sval)= (yyvsp[0].sval); } +#line 557 "../xkbparse.y" + { (yyval.sval)= (yyvsp[(1) - (1)].sval); } break; case 117: -#line 558 "xkbparse.y" - { (yyval.sval)= (yyvsp[0].sval); } +#line 558 "../xkbparse.y" + { (yyval.sval)= (yyvsp[(1) - (1)].sval); } break; case 118: -#line 562 "xkbparse.y" +#line 562 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"action",False); } break; case 119: -#line 564 "xkbparse.y" +#line 564 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"interpret",False); } break; case 120: -#line 566 "xkbparse.y" +#line 566 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"type",False); } break; case 121: -#line 568 "xkbparse.y" +#line 568 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"key",False); } break; case 122: -#line 570 "xkbparse.y" +#line 570 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"group",False); } break; case 123: -#line 572 "xkbparse.y" +#line 572 "../xkbparse.y" {(yyval.sval)=XkbInternAtom(NULL,"modifier_map",False);} break; case 124: -#line 574 "xkbparse.y" +#line 574 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"indicator",False); } break; case 125: -#line 576 "xkbparse.y" +#line 576 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"shape",False); } break; case 126: -#line 578 "xkbparse.y" +#line 578 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"row",False); } break; case 127: -#line 580 "xkbparse.y" +#line 580 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"section",False); } break; case 128: -#line 582 "xkbparse.y" +#line 582 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,"text",False); } break; case 129: -#line 585 "xkbparse.y" - { (yyval.uval)= (yyvsp[0].uval); } +#line 585 "../xkbparse.y" + { (yyval.uval)= (yyvsp[(1) - (1)].uval); } break; case 130: -#line 586 "xkbparse.y" +#line 586 "../xkbparse.y" { (yyval.uval)= MergeDefault; } break; case 131: -#line 589 "xkbparse.y" +#line 589 "../xkbparse.y" { (yyval.uval)= MergeDefault; } break; case 132: -#line 590 "xkbparse.y" +#line 590 "../xkbparse.y" { (yyval.uval)= MergeAugment; } break; case 133: -#line 591 "xkbparse.y" +#line 591 "../xkbparse.y" { (yyval.uval)= MergeOverride; } break; case 134: -#line 592 "xkbparse.y" +#line 592 "../xkbparse.y" { (yyval.uval)= MergeReplace; } break; case 135: -#line 593 "xkbparse.y" +#line 593 "../xkbparse.y" { (yyval.uval)= MergeAltForm; } break; case 136: -#line 596 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 596 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 137: -#line 597 "xkbparse.y" +#line 597 "../xkbparse.y" { (yyval.expr)= NULL; } break; case 138: -#line 601 "xkbparse.y" - { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[-2].expr)->common,&(yyvsp[0].expr)->common); } +#line 601 "../xkbparse.y" + { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[(1) - (3)].expr)->common,&(yyvsp[(3) - (3)].expr)->common); } break; case 139: -#line 603 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 603 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 140: -#line 607 "xkbparse.y" - { (yyval.expr)= ExprCreateBinary(OpDivide,(yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 607 "../xkbparse.y" + { (yyval.expr)= ExprCreateBinary(OpDivide,(yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 141: -#line 609 "xkbparse.y" - { (yyval.expr)= ExprCreateBinary(OpAdd,(yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 609 "../xkbparse.y" + { (yyval.expr)= ExprCreateBinary(OpAdd,(yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 142: -#line 611 "xkbparse.y" - { (yyval.expr)= ExprCreateBinary(OpSubtract,(yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 611 "../xkbparse.y" + { (yyval.expr)= ExprCreateBinary(OpSubtract,(yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 143: -#line 613 "xkbparse.y" - { (yyval.expr)= ExprCreateBinary(OpMultiply,(yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 613 "../xkbparse.y" + { (yyval.expr)= ExprCreateBinary(OpMultiply,(yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 144: -#line 615 "xkbparse.y" - { (yyval.expr)= ExprCreateBinary(OpAssign,(yyvsp[-2].expr),(yyvsp[0].expr)); } +#line 615 "../xkbparse.y" + { (yyval.expr)= ExprCreateBinary(OpAssign,(yyvsp[(1) - (3)].expr),(yyvsp[(3) - (3)].expr)); } break; case 145: -#line 617 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 617 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 146: -#line 621 "xkbparse.y" - { (yyval.expr)= ExprCreateUnary(OpNegate,(yyvsp[0].expr)->type,(yyvsp[0].expr)); } +#line 621 "../xkbparse.y" + { (yyval.expr)= ExprCreateUnary(OpNegate,(yyvsp[(2) - (2)].expr)->type,(yyvsp[(2) - (2)].expr)); } break; case 147: -#line 623 "xkbparse.y" - { (yyval.expr)= ExprCreateUnary(OpUnaryPlus,(yyvsp[0].expr)->type,(yyvsp[0].expr)); } +#line 623 "../xkbparse.y" + { (yyval.expr)= ExprCreateUnary(OpUnaryPlus,(yyvsp[(2) - (2)].expr)->type,(yyvsp[(2) - (2)].expr)); } break; case 148: -#line 625 "xkbparse.y" - { (yyval.expr)= ExprCreateUnary(OpNot,TypeBoolean,(yyvsp[0].expr)); } +#line 625 "../xkbparse.y" + { (yyval.expr)= ExprCreateUnary(OpNot,TypeBoolean,(yyvsp[(2) - (2)].expr)); } break; case 149: -#line 627 "xkbparse.y" - { (yyval.expr)= ExprCreateUnary(OpInvert,(yyvsp[0].expr)->type,(yyvsp[0].expr)); } +#line 627 "../xkbparse.y" + { (yyval.expr)= ExprCreateUnary(OpInvert,(yyvsp[(2) - (2)].expr)->type,(yyvsp[(2) - (2)].expr)); } break; case 150: -#line 629 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 629 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 151: -#line 631 "xkbparse.y" - { (yyval.expr)= ActionCreate((yyvsp[-3].sval),(yyvsp[-1].expr)); } +#line 631 "../xkbparse.y" + { (yyval.expr)= ActionCreate((yyvsp[(1) - (4)].sval),(yyvsp[(3) - (4)].expr)); } break; case 152: -#line 633 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 633 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 153: -#line 635 "xkbparse.y" - { (yyval.expr)= (yyvsp[-1].expr); } +#line 635 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(2) - (3)].expr); } break; case 154: -#line 639 "xkbparse.y" - { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[-2].expr)->common,&(yyvsp[0].expr)->common); } +#line 639 "../xkbparse.y" + { (yyval.expr)= (ExprDef *)AppendStmt(&(yyvsp[(1) - (3)].expr)->common,&(yyvsp[(3) - (3)].expr)->common); } break; case 155: -#line 641 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 641 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 156: -#line 645 "xkbparse.y" - { (yyval.expr)= ActionCreate((yyvsp[-3].sval),(yyvsp[-1].expr)); } +#line 645 "../xkbparse.y" + { (yyval.expr)= ActionCreate((yyvsp[(1) - (4)].sval),(yyvsp[(3) - (4)].expr)); } break; case 157: -#line 649 "xkbparse.y" +#line 649 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprIdent,TypeUnknown); - expr->value.str= (yyvsp[0].sval); + expr->value.str= (yyvsp[(1) - (1)].sval); (yyval.expr)= expr; } break; case 158: -#line 656 "xkbparse.y" +#line 656 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprFieldRef,TypeUnknown); - expr->value.field.element= (yyvsp[-2].sval); - expr->value.field.field= (yyvsp[0].sval); + expr->value.field.element= (yyvsp[(1) - (3)].sval); + expr->value.field.field= (yyvsp[(3) - (3)].sval); (yyval.expr)= expr; } break; case 159: -#line 664 "xkbparse.y" +#line 664 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprArrayRef,TypeUnknown); expr->value.array.element= None; - expr->value.array.field= (yyvsp[-3].sval); - expr->value.array.entry= (yyvsp[-1].expr); + expr->value.array.field= (yyvsp[(1) - (4)].sval); + expr->value.array.entry= (yyvsp[(3) - (4)].expr); (yyval.expr)= expr; } break; case 160: -#line 673 "xkbparse.y" +#line 673 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprArrayRef,TypeUnknown); - expr->value.array.element= (yyvsp[-5].sval); - expr->value.array.field= (yyvsp[-3].sval); - expr->value.array.entry= (yyvsp[-1].expr); + expr->value.array.element= (yyvsp[(1) - (6)].sval); + expr->value.array.field= (yyvsp[(3) - (6)].sval); + expr->value.array.entry= (yyvsp[(5) - (6)].expr); (yyval.expr)= expr; } break; case 161: -#line 684 "xkbparse.y" +#line 684 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprValue,TypeString); - expr->value.str= (yyvsp[0].sval); + expr->value.str= (yyvsp[(1) - (1)].sval); (yyval.expr)= expr; } break; case 162: -#line 691 "xkbparse.y" +#line 691 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprValue,TypeInt); - expr->value.ival= (yyvsp[0].ival); + expr->value.ival= (yyvsp[(1) - (1)].ival); (yyval.expr)= expr; } break; case 163: -#line 698 "xkbparse.y" +#line 698 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprValue,TypeFloat); - expr->value.ival= (yyvsp[0].ival); + expr->value.ival= (yyvsp[(1) - (1)].ival); (yyval.expr)= expr; } break; case 164: -#line 705 "xkbparse.y" +#line 705 "../xkbparse.y" { ExprDef *expr; expr= ExprCreate(ExprValue,TypeKeyName); - memcpy(expr->value.keyName,(yyvsp[0].str),4); - free((yyvsp[0].str)); + memcpy(expr->value.keyName,(yyvsp[(1) - (1)].str),4); + free((yyvsp[(1) - (1)].str)); (yyval.expr)= expr; } break; case 165: -#line 714 "xkbparse.y" - { (yyval.expr)= (yyvsp[0].expr); } +#line 714 "../xkbparse.y" + { (yyval.expr)= (yyvsp[(1) - (1)].expr); } break; case 166: -#line 715 "xkbparse.y" +#line 715 "../xkbparse.y" { (yyval.expr)= NULL; } break; case 167: -#line 719 "xkbparse.y" - { (yyval.expr)= AppendKeysymList((yyvsp[-2].expr),(KeySym)(yyvsp[0].uval)); } +#line 719 "../xkbparse.y" + { (yyval.expr)= AppendKeysymList((yyvsp[(1) - (3)].expr),(KeySym)(yyvsp[(3) - (3)].uval)); } break; case 168: -#line 721 "xkbparse.y" - { (yyval.expr)= CreateKeysymList((KeySym)(yyvsp[0].uval)); } +#line 721 "../xkbparse.y" + { (yyval.expr)= CreateKeysymList((KeySym)(yyvsp[(1) - (1)].uval)); } break; case 169: -#line 725 "xkbparse.y" +#line 725 "../xkbparse.y" { KeySym sym; if (LookupKeysym(scanStr,&sym)) @@ -2621,86 +2843,94 @@ yyreduce: break; case 170: -#line 739 "xkbparse.y" +#line 739 "../xkbparse.y" { (yyval.uval)= XK_section; } break; case 171: -#line 743 "xkbparse.y" +#line 743 "../xkbparse.y" { - if ((yyvsp[0].ival)<10) (yyval.uval)= (yyvsp[0].ival)+'0'; /* XK_0 .. XK_9 */ - else (yyval.uval)= (yyvsp[0].ival); + if ((yyvsp[(1) - (1)].ival)<10) (yyval.uval)= (yyvsp[(1) - (1)].ival)+'0'; /* XK_0 .. XK_9 */ + else (yyval.uval)= (yyvsp[(1) - (1)].ival); } break; case 172: -#line 749 "xkbparse.y" - { (yyval.ival)= scanInt; } +#line 749 "../xkbparse.y" + { (yyval.ival)= -(yyvsp[(2) - (2)].ival); } break; case 173: -#line 750 "xkbparse.y" - { (yyval.ival)= scanInt*XkbGeomPtsPerMM; } +#line 750 "../xkbparse.y" + { (yyval.ival)= (yyvsp[(1) - (1)].ival); } break; case 174: -#line 753 "xkbparse.y" +#line 753 "../xkbparse.y" { (yyval.ival)= scanInt; } break; case 175: -#line 756 "xkbparse.y" - { (yyval.ival)= scanInt; } +#line 754 "../xkbparse.y" + { (yyval.ival)= scanInt*XkbGeomPtsPerMM; } break; case 176: -#line 759 "xkbparse.y" - { (yyval.str)= scanStr; scanStr= NULL; } +#line 757 "../xkbparse.y" + { (yyval.ival)= scanInt; } break; case 177: -#line 762 "xkbparse.y" - { (yyval.sval)= XkbInternAtom(NULL,scanStr,False); } +#line 760 "../xkbparse.y" + { (yyval.ival)= scanInt; } break; case 178: -#line 763 "xkbparse.y" - { (yyval.sval)= XkbInternAtom(NULL,"default",False); } +#line 763 "../xkbparse.y" + { (yyval.str)= scanStr; scanStr= NULL; } break; case 179: -#line 766 "xkbparse.y" +#line 766 "../xkbparse.y" { (yyval.sval)= XkbInternAtom(NULL,scanStr,False); } break; case 180: -#line 769 "xkbparse.y" - { (yyval.str)= (yyvsp[0].str); } +#line 767 "../xkbparse.y" + { (yyval.sval)= XkbInternAtom(NULL,"default",False); } break; case 181: -#line 770 "xkbparse.y" - { (yyval.str)= NULL; } +#line 770 "../xkbparse.y" + { (yyval.sval)= XkbInternAtom(NULL,scanStr,False); } break; case 182: -#line 773 "xkbparse.y" +#line 773 "../xkbparse.y" + { (yyval.str)= (yyvsp[(1) - (1)].str); } + break; + + case 183: +#line 774 "../xkbparse.y" + { (yyval.str)= NULL; } + break; + + case 184: +#line 777 "../xkbparse.y" { (yyval.str)= scanStr; scanStr= NULL; } break; +/* Line 1267 of yacc.c. */ +#line 2928 "xkbparse.c" default: break; } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -/* Line 1126 of yacc.c. */ -#line 2699 "xkbparse.c" - - yyvsp -= yylen; - yyssp -= yylen; - - + YYPOPSTACK (yylen); + yylen = 0; YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -2729,110 +2959,41 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (YYPACT_NINF < yyn && yyn < YYLAST) - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - char *yymsg = 0; -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -#if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -#endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - 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 = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yymsg; - int yyi = 0; - while ((*yyp = *yyf)) - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - yyerror (yymsg); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); - } - else - { - yyerror (YY_("syntax error")); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) goto yyexhaustedlab; - } - } - else -#endif /* YYERROR_VERBOSE */ - yyerror (YY_("syntax error")); + } + } +#endif } @@ -2843,14 +3004,15 @@ yyerrlab: error, discard it. */ if (yychar <= YYEOF) - { + { /* Return failure if at end of input. */ if (yychar == YYEOF) YYABORT; - } + } else { - yydestruct ("Error: discarding", yytoken, &yylval); + yydestruct ("Error: discarding", + yytoken, &yylval); yychar = YYEMPTY; } } @@ -2868,11 +3030,14 @@ yyerrorlab: /* Pacify compilers like GCC when the user code never invokes YYERROR and the label yyerrorlab therefore never appears in user code. */ - if (0) + if (/*CONSTCOND*/ 0) goto yyerrorlab; -yyvsp -= yylen; - yyssp -= yylen; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); yystate = *yyssp; goto yyerrlab1; @@ -2902,8 +3067,9 @@ yyerrlab1: YYABORT; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -2914,7 +3080,7 @@ yyerrlab1: *++yyvsp = yylval; - /* Shift the error token. */ + /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; @@ -2949,21 +3115,30 @@ yyreturn: if (yychar != YYEOF && yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", yystos[*yyssp], yyvsp); - YYPOPSTACK; + YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 775 "xkbparse.y" +#line 779 "../xkbparse.y" void yyerror(char *s) @@ -2985,4 +3160,3 @@ yywrap(void) } - diff --git a/xkbcomp/xkbparse.y b/xkbcomp/xkbparse.y index b50b9e8..662325b 100644 --- a/xkbcomp/xkbparse.y +++ b/xkbcomp/xkbparse.y @@ -136,7 +136,7 @@ DoodadDef *doodad; XkbFile *file; } -%type Number Integer Float +%type Number Integer Float SignedNumber %type XkbCompositeType FileType MergeMode OptMergeMode KeySym %type DoodadType Flag Flags OptFlags %type KeyName MapName OptMapName @@ -534,7 +534,7 @@ CoordList : CoordList COMMA Coord { $$= $1; } ; -Coord : OBRACKET Number COMMA Number CBRACKET +Coord : OBRACKET SignedNumber COMMA SignedNumber CBRACKET { ExprDef *expr; expr= ExprCreate(ExprCoord,TypeUnknown); @@ -746,6 +746,10 @@ KeySym : IDENT } ; +SignedNumber : MINUS Number { $$= -$2; } + | Number { $$= $1; } + ; + Number : FLOAT { $$= scanInt; } | INTEGER { $$= scanInt*XkbGeomPtsPerMM; } ;