This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository mig.
commit 7f7add4c3dc42217b25e3293157fbe7a8fee18aa Author: Samuel Thibault <[email protected]> Date: Sat May 21 22:16:40 2016 +0000 Imported Upstream version 1.7 --- ChangeLog | 17 +++ NEWS | 4 +- build-aux/config.guess | 111 +++++++++-------- build-aux/config.sub | 20 +-- configure | 20 +-- configure.ac | 2 +- lexxer.c | 324 ++++++++++++++++++++++++++----------------------- parser.c | 180 +++++++++++++-------------- parser.h | 2 +- 9 files changed, 364 insertions(+), 316 deletions(-) diff --git a/ChangeLog b/ChangeLog index c463000..92e90fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2016-05-18 Thomas Schwinge <[email protected]> + + GNU MIG 1.7 + * configure.ac (AC_INIT): Set version to 1.7. + * NEWS: Finalize for 1.7. + +2016-05-03 Samuel Thibault <[email protected]> + + Add missing EXTRA_DIST + * tests/Makefile.am (EXTRA_DIST): Add base_types.defs test_lib.sh + includes/all.h includes/mach/mig_support.h includes/server.h + includes/types.h includes/user.h. + * tests/bad/Makefile.am (EXTRA_DIST): Add $(TESTS) run_bad_test.sh. + * tests/generate-only/Makefile.am (EXTRA_DIST): Add $(TESTS) + run_generate_only_test.sh. + * tests/good/Makefile.am (EXTRA_DIST): Add $(TESTS) run_good_test.sh. + 2016-04-26 Flavio Cruz <[email protected]> Simplify ArgumentType production rule. diff --git a/NEWS b/NEWS index 03fa1c5..bd1f00c 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,11 @@ -Version 1.7 (2016-04-XX) +Version 1.7 (2016-05-18) * MIG now has a test suite. It includes a set of valid and invalid definition files that MIG will try to process. For valid definitions, GCC will compile the stubs to check if valid C code was generated. -* The generated code uses integer types from 'stdint.h' now instead of +* The generated code uses integer types from <stdint.h> now instead of the old Mach types. * Code that was hard-coding the word size has been identified and diff --git a/build-aux/config.guess b/build-aux/config.guess index 1659250..0967f2a 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-04-02' # 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 @@ -27,7 +27,7 @@ timestamp='2015-08-20' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <[email protected]>. @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -268,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -376,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -410,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -635,13 +639,13 @@ EOF sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -680,11 +684,11 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -697,12 +701,12 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -807,14 +811,14 @@ EOF echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -896,7 +900,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -919,7 +923,7 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -965,6 +969,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1120,7 +1127,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1269,6 +1276,9 @@ EOF SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1282,9 +1292,9 @@ EOF UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1306,7 +1316,7 @@ EOF exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1337,7 +1347,7 @@ EOF # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1379,7 +1389,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1390,6 +1400,9 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <<EOF @@ -1399,9 +1412,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/build-aux/config.sub b/build-aux/config.sub index 1acc966..8d39c4b 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-03-30' # 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 @@ -33,7 +33,7 @@ timestamp='2015-08-20' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ timestamp='2015-08-20' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ Report bugs and patches to <[email protected]>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -521,7 +520,7 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -1383,7 +1382,7 @@ case $os in | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1399,7 +1398,8 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1531,6 +1531,8 @@ case $os in ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff --git a/configure b/configure index 8005eca..83eee48 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU MIG 1.6+git20160502. +# Generated by GNU Autoconf 2.69 for GNU MIG 1.7. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU MIG' PACKAGE_TARNAME='mig' -PACKAGE_VERSION='1.6+git20160502' -PACKAGE_STRING='GNU MIG 1.6+git20160502' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='GNU MIG 1.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.gnu.org/software/mig/' @@ -1265,7 +1265,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 GNU MIG 1.6+git20160502 to adapt to many kinds of systems. +\`configure' configures GNU MIG 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1337,7 +1337,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU MIG 1.6+git20160502:";; + short | recursive ) echo "Configuration of GNU MIG 1.7:";; esac cat <<\_ACEOF @@ -1436,7 +1436,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU MIG configure 1.6+git20160502 +GNU MIG configure 1.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1683,7 +1683,7 @@ 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 GNU MIG $as_me 1.6+git20160502, which was +It was created by GNU MIG $as_me 1.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2660,7 +2660,7 @@ fi # Define the identity of the package. PACKAGE='mig' - VERSION='1.6+git20160502' + VERSION='1.7' # Some tools Automake needs. @@ -5103,7 +5103,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU MIG $as_me 1.6+git20160502, which was +This file was extended by GNU MIG $as_me 1.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5162,7 +5162,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU MIG config.status 1.6+git20160502 +GNU MIG config.status 1.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ddd0d4e..0fff2f5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl configure script for GNU MIG. AC_PREREQ([2.53]) -AC_INIT([GNU MIG], [1.6+git20160502], [[email protected]]) +AC_INIT([GNU MIG], [1.7], [[email protected]]) AC_CONFIG_SRCDIR([migcom.c]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/lexxer.c b/lexxer.c index 6025a2b..99ce928 100644 --- a/lexxer.c +++ b/lexxer.c @@ -7,8 +7,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -210,7 +210,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -280,7 +280,7 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +static int yy_n_chars; /* number of characters read into yy_ch_buf */ yy_size_t yyleng; /* Points to current character in buffer. */ @@ -352,11 +352,17 @@ extern int yylineno; int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the @@ -438,7 +444,7 @@ static yyconst flex_int16_t yy_accept[509] = 46, 86, 86, 86, 62, 63, 67, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -470,7 +476,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[82] = +static yyconst YY_CHAR yy_meta[82] = { 0, 1, 1, 2, 1, 1, 1, 3, 1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 4, 4, 4, @@ -483,7 +489,7 @@ static yyconst flex_int32_t yy_meta[82] = 1 } ; -static yyconst flex_int16_t yy_base[518] = +static yyconst flex_uint16_t yy_base[518] = { 0, 0, 3, 9, 977, 90, 171, 101, 105, 115, 128, 119, 133, 982, 984, 984, 984, 143, 984, 984, 984, @@ -605,7 +611,7 @@ static yyconst flex_int16_t yy_def[518] = 508, 508, 508, 508, 508, 508, 508 } ; -static yyconst flex_int16_t yy_nxt[1066] = +static yyconst flex_uint16_t yy_nxt[1066] = { 0, 508, 15, 16, 15, 15, 16, 15, 66, 17, 14, 15, 16, 15, 14, 14, 14, 18, 19, 20, 21, @@ -861,8 +867,8 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "lexxer.l" -#line 17 "lexxer.l" +#line 1 "../release/lexxer.l" +#line 17 "../release/lexxer.l" /* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University @@ -957,7 +963,7 @@ static struct yysvf *oldYYBegin; static void doSharp(const char *body); /* process body of # directives */ -#line 961 "lexxer.c" +#line 967 "lexxer.c" #define INITIAL 0 #define Normal 1 @@ -995,11 +1001,11 @@ void yyset_extra (YY_EXTRA_TYPE user_defined ); FILE *yyget_in (void ); -void yyset_in (FILE * in_str ); +void yyset_in (FILE * _in_str ); FILE *yyget_out (void ); -void yyset_out (FILE * out_str ); +void yyset_out (FILE * _out_str ); yy_size_t yyget_leng (void ); @@ -1007,7 +1013,7 @@ char *yyget_text (void ); int yyget_lineno (void ); -void yyset_lineno (int line_number ); +void yyset_lineno (int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1021,6 +1027,10 @@ extern int yywrap (void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -1133,7 +1143,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1146,9 +1156,9 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; if ( !(yy_init) ) { @@ -1177,12 +1187,12 @@ YY_DECL } { -#line 114 "lexxer.l" +#line 114 "../release/lexxer.l" -#line 1184 "lexxer.c" +#line 1194 "lexxer.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1199,7 +1209,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1240,483 +1250,483 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 116 "lexxer.l" +#line 116 "../release/lexxer.l" RETURN(syRoutine); YY_BREAK case 2: YY_RULE_SETUP -#line 117 "lexxer.l" +#line 117 "../release/lexxer.l" RETURN(sySimpleRoutine); YY_BREAK case 3: YY_RULE_SETUP -#line 118 "lexxer.l" +#line 118 "../release/lexxer.l" RETURN(sySubsystem); YY_BREAK case 4: YY_RULE_SETUP -#line 119 "lexxer.l" +#line 119 "../release/lexxer.l" RETURN(syMsgOption); YY_BREAK case 5: YY_RULE_SETUP -#line 120 "lexxer.l" +#line 120 "../release/lexxer.l" RETURN(syMsgSeqno); YY_BREAK case 6: YY_RULE_SETUP -#line 121 "lexxer.l" +#line 121 "../release/lexxer.l" RETURN(syWaitTime); YY_BREAK case 7: YY_RULE_SETUP -#line 122 "lexxer.l" +#line 122 "../release/lexxer.l" RETURN(syNoWaitTime); YY_BREAK case 8: YY_RULE_SETUP -#line 123 "lexxer.l" +#line 123 "../release/lexxer.l" RETURN(syIn); YY_BREAK case 9: YY_RULE_SETUP -#line 124 "lexxer.l" +#line 124 "../release/lexxer.l" RETURN(syOut); YY_BREAK case 10: YY_RULE_SETUP -#line 125 "lexxer.l" +#line 125 "../release/lexxer.l" RETURN(syInOut); YY_BREAK case 11: YY_RULE_SETUP -#line 126 "lexxer.l" +#line 126 "../release/lexxer.l" RETURN(syRequestPort); YY_BREAK case 12: YY_RULE_SETUP -#line 127 "lexxer.l" +#line 127 "../release/lexxer.l" RETURN(syReplyPort); YY_BREAK case 13: YY_RULE_SETUP -#line 128 "lexxer.l" +#line 128 "../release/lexxer.l" RETURN(syUReplyPort); YY_BREAK case 14: YY_RULE_SETUP -#line 129 "lexxer.l" +#line 129 "../release/lexxer.l" RETURN(sySReplyPort); YY_BREAK case 15: YY_RULE_SETUP -#line 130 "lexxer.l" +#line 130 "../release/lexxer.l" RETURN(syArray); YY_BREAK case 16: YY_RULE_SETUP -#line 131 "lexxer.l" +#line 131 "../release/lexxer.l" RETURN(syOf); YY_BREAK case 17: YY_RULE_SETUP -#line 132 "lexxer.l" +#line 132 "../release/lexxer.l" RETURN(syErrorProc); YY_BREAK case 18: YY_RULE_SETUP -#line 133 "lexxer.l" +#line 133 "../release/lexxer.l" RETURN(syServerPrefix); YY_BREAK case 19: YY_RULE_SETUP -#line 134 "lexxer.l" +#line 134 "../release/lexxer.l" RETURN(syUserPrefix); YY_BREAK case 20: YY_RULE_SETUP -#line 135 "lexxer.l" +#line 135 "../release/lexxer.l" RETURN(syServerDemux); YY_BREAK case 21: YY_RULE_SETUP -#line 136 "lexxer.l" +#line 136 "../release/lexxer.l" RETURN(syRCSId); YY_BREAK case 22: YY_RULE_SETUP -#line 137 "lexxer.l" +#line 137 "../release/lexxer.l" RETURN(syImport); YY_BREAK case 23: YY_RULE_SETUP -#line 138 "lexxer.l" +#line 138 "../release/lexxer.l" RETURN(syUImport); YY_BREAK case 24: YY_RULE_SETUP -#line 139 "lexxer.l" +#line 139 "../release/lexxer.l" RETURN(sySImport); YY_BREAK case 25: YY_RULE_SETUP -#line 140 "lexxer.l" +#line 140 "../release/lexxer.l" RETURN(syType); YY_BREAK case 26: YY_RULE_SETUP -#line 141 "lexxer.l" +#line 141 "../release/lexxer.l" RETURN(syKernelServer); YY_BREAK case 27: YY_RULE_SETUP -#line 142 "lexxer.l" +#line 142 "../release/lexxer.l" RETURN(syKernelUser); YY_BREAK case 28: YY_RULE_SETUP -#line 143 "lexxer.l" +#line 143 "../release/lexxer.l" RETURN(sySkip); YY_BREAK case 29: YY_RULE_SETUP -#line 144 "lexxer.l" +#line 144 "../release/lexxer.l" RETURN(syStruct); YY_BREAK case 30: YY_RULE_SETUP -#line 145 "lexxer.l" +#line 145 "../release/lexxer.l" RETURN(syInTran); YY_BREAK case 31: YY_RULE_SETUP -#line 146 "lexxer.l" +#line 146 "../release/lexxer.l" RETURN(syInTranPayload); YY_BREAK case 32: YY_RULE_SETUP -#line 147 "lexxer.l" +#line 147 "../release/lexxer.l" RETURN(syOutTran); YY_BREAK case 33: YY_RULE_SETUP -#line 148 "lexxer.l" +#line 148 "../release/lexxer.l" RETURN(syDestructor); YY_BREAK case 34: YY_RULE_SETUP -#line 149 "lexxer.l" +#line 149 "../release/lexxer.l" RETURN(syCType); YY_BREAK case 35: YY_RULE_SETUP -#line 150 "lexxer.l" +#line 150 "../release/lexxer.l" RETURN(syCUserType); YY_BREAK case 36: YY_RULE_SETUP -#line 151 "lexxer.l" +#line 151 "../release/lexxer.l" RETURN(syCServerType); YY_BREAK case 37: YY_RULE_SETUP -#line 152 "lexxer.l" +#line 152 "../release/lexxer.l" RETURN(syCString); YY_BREAK case 38: YY_RULE_SETUP -#line 154 "lexxer.l" +#line 154 "../release/lexxer.l" FRETURN(flLong); YY_BREAK case 39: YY_RULE_SETUP -#line 155 "lexxer.l" +#line 155 "../release/lexxer.l" FRETURN(flNotLong); YY_BREAK case 40: YY_RULE_SETUP -#line 156 "lexxer.l" +#line 156 "../release/lexxer.l" FRETURN(flDealloc); YY_BREAK case 41: YY_RULE_SETUP -#line 157 "lexxer.l" +#line 157 "../release/lexxer.l" FRETURN(flNotDealloc); YY_BREAK case 42: YY_RULE_SETUP -#line 158 "lexxer.l" +#line 158 "../release/lexxer.l" FRETURN(flServerCopy); YY_BREAK case 43: YY_RULE_SETUP -#line 159 "lexxer.l" +#line 159 "../release/lexxer.l" FRETURN(flCountInOut); YY_BREAK case 44: YY_RULE_SETUP -#line 160 "lexxer.l" +#line 160 "../release/lexxer.l" FRETURN(flNone); YY_BREAK case 45: YY_RULE_SETUP -#line 162 "lexxer.l" +#line 162 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_POLYMORPHIC,word_size_in_bits); YY_BREAK case 46: YY_RULE_SETUP -#line 164 "lexxer.l" +#line 164 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_UNSTRUCTURED,0); YY_BREAK case 47: YY_RULE_SETUP -#line 165 "lexxer.l" +#line 165 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_BIT,1); YY_BREAK case 48: YY_RULE_SETUP -#line 166 "lexxer.l" +#line 166 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_BOOLEAN,32); YY_BREAK case 49: YY_RULE_SETUP -#line 167 "lexxer.l" +#line 167 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_INTEGER_16,16); YY_BREAK case 50: YY_RULE_SETUP -#line 168 "lexxer.l" +#line 168 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_INTEGER_32,32); YY_BREAK case 51: YY_RULE_SETUP -#line 169 "lexxer.l" +#line 169 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_INTEGER_64,64); YY_BREAK case 52: YY_RULE_SETUP -#line 170 "lexxer.l" +#line 170 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_CHAR,8); YY_BREAK case 53: YY_RULE_SETUP -#line 171 "lexxer.l" +#line 171 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_BYTE,8); YY_BREAK case 54: YY_RULE_SETUP -#line 172 "lexxer.l" +#line 172 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_INTEGER_8,8); YY_BREAK case 55: YY_RULE_SETUP -#line 173 "lexxer.l" +#line 173 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_REAL,0); YY_BREAK case 56: YY_RULE_SETUP -#line 174 "lexxer.l" +#line 174 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_STRING,0); YY_BREAK case 57: YY_RULE_SETUP -#line 175 "lexxer.l" +#line 175 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_STRING_C,0); YY_BREAK case 58: YY_RULE_SETUP -#line 177 "lexxer.l" +#line 177 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_MOVE_RECEIVE,MACH_MSG_TYPE_PORT_RECEIVE,word_size_in_bits); YY_BREAK case 59: YY_RULE_SETUP -#line 178 "lexxer.l" +#line 178 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_COPY_SEND,MACH_MSG_TYPE_PORT_SEND,word_size_in_bits); YY_BREAK case 60: YY_RULE_SETUP -#line 179 "lexxer.l" +#line 179 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_MAKE_SEND,MACH_MSG_TYPE_PORT_SEND,word_size_in_bits); YY_BREAK case 61: YY_RULE_SETUP -#line 180 "lexxer.l" +#line 180 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_MOVE_SEND,MACH_MSG_TYPE_PORT_SEND,word_size_in_bits); YY_BREAK case 62: YY_RULE_SETUP -#line 181 "lexxer.l" +#line 181 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_MAKE_SEND_ONCE,MACH_MSG_TYPE_PORT_SEND_ONCE,word_size_in_bits); YY_BREAK case 63: YY_RULE_SETUP -#line 182 "lexxer.l" +#line 182 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_MOVE_SEND_ONCE,MACH_MSG_TYPE_PORT_SEND_ONCE,word_size_in_bits); YY_BREAK case 64: YY_RULE_SETUP -#line 184 "lexxer.l" +#line 184 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_PORT_NAME,word_size_in_bits); YY_BREAK case 65: YY_RULE_SETUP -#line 185 "lexxer.l" +#line 185 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_POLYMORPHIC,MACH_MSG_TYPE_PORT_RECEIVE,word_size_in_bits); YY_BREAK case 66: YY_RULE_SETUP -#line 186 "lexxer.l" +#line 186 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_POLYMORPHIC,MACH_MSG_TYPE_PORT_SEND,word_size_in_bits); YY_BREAK case 67: YY_RULE_SETUP -#line 187 "lexxer.l" +#line 187 "../release/lexxer.l" TPRETURN(MACH_MSG_TYPE_POLYMORPHIC,MACH_MSG_TYPE_PORT_SEND_ONCE,word_size_in_bits); YY_BREAK case 68: YY_RULE_SETUP -#line 188 "lexxer.l" +#line 188 "../release/lexxer.l" TRETURN(MACH_MSG_TYPE_POLYMORPHIC,0); YY_BREAK case 69: YY_RULE_SETUP -#line 190 "lexxer.l" +#line 190 "../release/lexxer.l" RETURN(syColon); YY_BREAK case 70: YY_RULE_SETUP -#line 191 "lexxer.l" +#line 191 "../release/lexxer.l" RETURN(sySemi); YY_BREAK case 71: YY_RULE_SETUP -#line 192 "lexxer.l" +#line 192 "../release/lexxer.l" RETURN(syComma); YY_BREAK case 72: YY_RULE_SETUP -#line 193 "lexxer.l" +#line 193 "../release/lexxer.l" RETURN(syPlus); YY_BREAK case 73: YY_RULE_SETUP -#line 194 "lexxer.l" +#line 194 "../release/lexxer.l" RETURN(syMinus); YY_BREAK case 74: YY_RULE_SETUP -#line 195 "lexxer.l" +#line 195 "../release/lexxer.l" RETURN(syStar); YY_BREAK case 75: YY_RULE_SETUP -#line 196 "lexxer.l" +#line 196 "../release/lexxer.l" RETURN(syDiv); YY_BREAK case 76: YY_RULE_SETUP -#line 197 "lexxer.l" +#line 197 "../release/lexxer.l" RETURN(syLParen); YY_BREAK case 77: YY_RULE_SETUP -#line 198 "lexxer.l" +#line 198 "../release/lexxer.l" RETURN(syRParen); YY_BREAK case 78: YY_RULE_SETUP -#line 199 "lexxer.l" +#line 199 "../release/lexxer.l" RETURN(syEqual); YY_BREAK case 79: YY_RULE_SETUP -#line 200 "lexxer.l" +#line 200 "../release/lexxer.l" RETURN(syCaret); YY_BREAK case 80: YY_RULE_SETUP -#line 201 "lexxer.l" +#line 201 "../release/lexxer.l" RETURN(syTilde); YY_BREAK case 81: YY_RULE_SETUP -#line 202 "lexxer.l" +#line 202 "../release/lexxer.l" RETURN(syLAngle); YY_BREAK case 82: YY_RULE_SETUP -#line 203 "lexxer.l" +#line 203 "../release/lexxer.l" RETURN(syRAngle); YY_BREAK case 83: YY_RULE_SETUP -#line 204 "lexxer.l" +#line 204 "../release/lexxer.l" RETURN(syLBrack); YY_BREAK case 84: YY_RULE_SETUP -#line 205 "lexxer.l" +#line 205 "../release/lexxer.l" RETURN(syRBrack); YY_BREAK case 85: YY_RULE_SETUP -#line 206 "lexxer.l" +#line 206 "../release/lexxer.l" RETURN(syBar); YY_BREAK case 86: YY_RULE_SETUP -#line 208 "lexxer.l" +#line 208 "../release/lexxer.l" { yylval.identifier = strmake(yytext); RETURN(syIdentifier); } YY_BREAK case 87: YY_RULE_SETUP -#line 210 "lexxer.l" +#line 210 "../release/lexxer.l" { yylval.number = atoi(yytext); RETURN(syNumber); } YY_BREAK case 88: YY_RULE_SETUP -#line 212 "lexxer.l" +#line 212 "../release/lexxer.l" { yylval.string = strmake(yytext); BEGIN Normal; RETURN(syString); } YY_BREAK case 89: YY_RULE_SETUP -#line 214 "lexxer.l" +#line 214 "../release/lexxer.l" { yylval.string = strmake(yytext); BEGIN Normal; RETURN(syFileName); } YY_BREAK case 90: YY_RULE_SETUP -#line 216 "lexxer.l" +#line 216 "../release/lexxer.l" { yylval.string = strmake(yytext); BEGIN Normal; RETURN(syQString); } YY_BREAK case 91: /* rule 91 can match eol */ YY_RULE_SETUP -#line 219 "lexxer.l" +#line 219 "../release/lexxer.l" { doSharp(yytext+1); SAVE_BEGIN; BEGIN SkipToEOL; } YY_BREAK case 92: YY_RULE_SETUP -#line 222 "lexxer.l" +#line 222 "../release/lexxer.l" { doSharp(yytext+1); SAVE_BEGIN; BEGIN SkipToEOL; } YY_BREAK case 93: YY_RULE_SETUP -#line 225 "lexxer.l" +#line 225 "../release/lexxer.l" { /* GCC's pre-processor might emit those. */ SAVE_BEGIN; BEGIN SkipToEOL; } YY_BREAK case 94: YY_RULE_SETUP -#line 228 "lexxer.l" +#line 228 "../release/lexxer.l" { yyerror("illegal # directive"); SAVE_BEGIN; BEGIN SkipToEOL; } @@ -1724,36 +1734,36 @@ YY_RULE_SETUP case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 232 "lexxer.l" +#line 232 "../release/lexxer.l" RSTR_BEGIN; YY_BREAK case 96: YY_RULE_SETUP -#line 233 "lexxer.l" +#line 233 "../release/lexxer.l" ; YY_BREAK case 97: YY_RULE_SETUP -#line 235 "lexxer.l" +#line 235 "../release/lexxer.l" ; YY_BREAK case 98: /* rule 98 can match eol */ YY_RULE_SETUP -#line 236 "lexxer.l" +#line 236 "../release/lexxer.l" { lineno++; } YY_BREAK case 99: YY_RULE_SETUP -#line 237 "lexxer.l" +#line 237 "../release/lexxer.l" { BEGIN Normal; RETURN(syError); } YY_BREAK case 100: YY_RULE_SETUP -#line 239 "lexxer.l" +#line 239 "../release/lexxer.l" ECHO; YY_BREAK -#line 1757 "lexxer.c" +#line 1767 "lexxer.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(Normal): case YY_STATE_EOF(String): @@ -1901,9 +1911,9 @@ case YY_STATE_EOF(SkipToEOL): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1932,7 +1942,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2014,9 +2024,9 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); @@ -2035,15 +2045,15 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); yy_current_state += YY_AT_BOL(); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2068,10 +2078,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2089,6 +2099,10 @@ static int yy_get_next_buffer (void) return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2240,7 +2254,7 @@ static void yy_load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -2395,7 +2409,7 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -2412,7 +2426,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2520,7 +2534,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len static void yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2586,29 +2600,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2616,9 +2630,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -2678,7 +2692,8 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2687,7 +2702,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2697,11 +2712,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2714,12 +2730,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 238 "lexxer.l" +#line 239 "../release/lexxer.l" diff --git a/parser.c b/parser.c index ae6c890..a640151 100644 --- a/parser.c +++ b/parser.c @@ -62,7 +62,7 @@ /* Copy the first part of user declarations. */ -#line 115 "parser.y" /* yacc.c:339 */ +#line 115 "../release/parser.y" /* yacc.c:339 */ #include <stdio.h> @@ -251,7 +251,7 @@ extern int yydebug; union YYSTYPE { -#line 137 "parser.y" /* yacc.c:355 */ +#line 137 "../release/parser.y" /* yacc.c:355 */ u_int number; identifier_t identifier; @@ -1529,7 +1529,7 @@ yyreduce: switch (yyn) { case 12: -#line 172 "parser.y" /* yacc.c:1646 */ +#line 172 "../release/parser.y" /* yacc.c:1646 */ { statement_t *st = stAlloc(); @@ -1543,25 +1543,25 @@ yyreduce: break; case 13: -#line 182 "parser.y" /* yacc.c:1646 */ +#line 182 "../release/parser.y" /* yacc.c:1646 */ { rtSkip(1); } #line 1549 "parser.c" /* yacc.c:1646 */ break; case 14: -#line 184 "parser.y" /* yacc.c:1646 */ +#line 184 "../release/parser.y" /* yacc.c:1646 */ { rtSkip((yyvsp[-1].number)); } #line 1555 "parser.c" /* yacc.c:1646 */ break; case 18: -#line 189 "parser.y" /* yacc.c:1646 */ +#line 189 "../release/parser.y" /* yacc.c:1646 */ { yyerrok; } #line 1561 "parser.c" /* yacc.c:1646 */ break; case 19: -#line 194 "parser.y" /* yacc.c:1646 */ +#line 194 "../release/parser.y" /* yacc.c:1646 */ { if (BeVerbose) { @@ -1575,7 +1575,7 @@ yyreduce: break; case 20: -#line 206 "parser.y" /* yacc.c:1646 */ +#line 206 "../release/parser.y" /* yacc.c:1646 */ { if (SubsystemName != strNULL) { @@ -1589,7 +1589,7 @@ yyreduce: break; case 23: -#line 222 "parser.y" /* yacc.c:1646 */ +#line 222 "../release/parser.y" /* yacc.c:1646 */ { if (IsKernelUser) warn("duplicate KernelUser keyword"); @@ -1599,7 +1599,7 @@ yyreduce: break; case 24: -#line 228 "parser.y" /* yacc.c:1646 */ +#line 228 "../release/parser.y" /* yacc.c:1646 */ { if (IsKernelServer) warn("duplicate KernelServer keyword"); @@ -1609,19 +1609,19 @@ yyreduce: break; case 25: -#line 235 "parser.y" /* yacc.c:1646 */ +#line 235 "../release/parser.y" /* yacc.c:1646 */ { SubsystemName = (yyvsp[0].identifier); } #line 1615 "parser.c" /* yacc.c:1646 */ break; case 26: -#line 238 "parser.y" /* yacc.c:1646 */ +#line 238 "../release/parser.y" /* yacc.c:1646 */ { SubsystemBase = (yyvsp[0].number); } #line 1621 "parser.c" /* yacc.c:1646 */ break; case 27: -#line 242 "parser.y" /* yacc.c:1646 */ +#line 242 "../release/parser.y" /* yacc.c:1646 */ { if (streql((yyvsp[0].string), "MACH_MSG_OPTION_NONE")) { @@ -1640,7 +1640,7 @@ yyreduce: break; case 28: -#line 259 "parser.y" /* yacc.c:1646 */ +#line 259 "../release/parser.y" /* yacc.c:1646 */ { WaitTime = (yyvsp[0].string); if (BeVerbose) @@ -1650,7 +1650,7 @@ yyreduce: break; case 29: -#line 265 "parser.y" /* yacc.c:1646 */ +#line 265 "../release/parser.y" /* yacc.c:1646 */ { WaitTime = strNULL; if (BeVerbose) @@ -1660,7 +1660,7 @@ yyreduce: break; case 30: -#line 273 "parser.y" /* yacc.c:1646 */ +#line 273 "../release/parser.y" /* yacc.c:1646 */ { ErrorProc = (yyvsp[0].identifier); if (BeVerbose) @@ -1670,7 +1670,7 @@ yyreduce: break; case 31: -#line 281 "parser.y" /* yacc.c:1646 */ +#line 281 "../release/parser.y" /* yacc.c:1646 */ { ServerPrefix = (yyvsp[0].identifier); if (BeVerbose) @@ -1680,7 +1680,7 @@ yyreduce: break; case 32: -#line 289 "parser.y" /* yacc.c:1646 */ +#line 289 "../release/parser.y" /* yacc.c:1646 */ { UserPrefix = (yyvsp[0].identifier); if (BeVerbose) @@ -1690,7 +1690,7 @@ yyreduce: break; case 33: -#line 297 "parser.y" /* yacc.c:1646 */ +#line 297 "../release/parser.y" /* yacc.c:1646 */ { ServerDemux = (yyvsp[0].identifier); if (BeVerbose) @@ -1700,7 +1700,7 @@ yyreduce: break; case 34: -#line 305 "parser.y" /* yacc.c:1646 */ +#line 305 "../release/parser.y" /* yacc.c:1646 */ { statement_t *st = stAlloc(); st->stKind = (yyvsp[-1].statement_kind); @@ -1713,25 +1713,25 @@ yyreduce: break; case 35: -#line 315 "parser.y" /* yacc.c:1646 */ +#line 315 "../release/parser.y" /* yacc.c:1646 */ { (yyval.statement_kind) = skImport; } #line 1719 "parser.c" /* yacc.c:1646 */ break; case 36: -#line 316 "parser.y" /* yacc.c:1646 */ +#line 316 "../release/parser.y" /* yacc.c:1646 */ { (yyval.statement_kind) = skUImport; } #line 1725 "parser.c" /* yacc.c:1646 */ break; case 37: -#line 317 "parser.y" /* yacc.c:1646 */ +#line 317 "../release/parser.y" /* yacc.c:1646 */ { (yyval.statement_kind) = skSImport; } #line 1731 "parser.c" /* yacc.c:1646 */ break; case 38: -#line 321 "parser.y" /* yacc.c:1646 */ +#line 321 "../release/parser.y" /* yacc.c:1646 */ { if (RCSId != strNULL) warn("previous RCS decl will be ignored"); @@ -1743,7 +1743,7 @@ yyreduce: break; case 39: -#line 331 "parser.y" /* yacc.c:1646 */ +#line 331 "../release/parser.y" /* yacc.c:1646 */ { identifier_t name = (yyvsp[0].type)->itName; @@ -1755,19 +1755,19 @@ yyreduce: break; case 40: -#line 341 "parser.y" /* yacc.c:1646 */ +#line 341 "../release/parser.y" /* yacc.c:1646 */ { itTypeDecl((yyvsp[-2].identifier), (yyval.type) = (yyvsp[0].type)); } #line 1761 "parser.c" /* yacc.c:1646 */ break; case 41: -#line 345 "parser.y" /* yacc.c:1646 */ +#line 345 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itResetType((yyvsp[0].type)); } #line 1767 "parser.c" /* yacc.c:1646 */ break; case 42: -#line 348 "parser.y" /* yacc.c:1646 */ +#line 348 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-7].type); @@ -1790,7 +1790,7 @@ yyreduce: break; case 43: -#line 368 "parser.y" /* yacc.c:1646 */ +#line 368 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-4].type); @@ -1808,7 +1808,7 @@ yyreduce: break; case 44: -#line 383 "parser.y" /* yacc.c:1646 */ +#line 383 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-7].type); @@ -1831,7 +1831,7 @@ yyreduce: break; case 45: -#line 403 "parser.y" /* yacc.c:1646 */ +#line 403 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-6].type); @@ -1849,7 +1849,7 @@ yyreduce: break; case 46: -#line 417 "parser.y" /* yacc.c:1646 */ +#line 417 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-3].type); @@ -1867,7 +1867,7 @@ yyreduce: break; case 47: -#line 431 "parser.y" /* yacc.c:1646 */ +#line 431 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-3].type); @@ -1880,7 +1880,7 @@ yyreduce: break; case 48: -#line 441 "parser.y" /* yacc.c:1646 */ +#line 441 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[-3].type); @@ -1893,49 +1893,49 @@ yyreduce: break; case 49: -#line 452 "parser.y" /* yacc.c:1646 */ +#line 452 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[0].type); } #line 1899 "parser.c" /* yacc.c:1646 */ break; case 50: -#line 454 "parser.y" /* yacc.c:1646 */ +#line 454 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[0].type); } #line 1905 "parser.c" /* yacc.c:1646 */ break; case 51: -#line 456 "parser.y" /* yacc.c:1646 */ +#line 456 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itVarArrayDecl((yyvsp[-1].number), (yyvsp[0].type)); } #line 1911 "parser.c" /* yacc.c:1646 */ break; case 52: -#line 458 "parser.y" /* yacc.c:1646 */ +#line 458 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itArrayDecl((yyvsp[-1].number), (yyvsp[0].type)); } #line 1917 "parser.c" /* yacc.c:1646 */ break; case 53: -#line 460 "parser.y" /* yacc.c:1646 */ +#line 460 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itPtrDecl((yyvsp[0].type)); } #line 1923 "parser.c" /* yacc.c:1646 */ break; case 54: -#line 462 "parser.y" /* yacc.c:1646 */ +#line 462 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itStructDecl((yyvsp[-1].number), (yyvsp[0].type)); } #line 1929 "parser.c" /* yacc.c:1646 */ break; case 55: -#line 464 "parser.y" /* yacc.c:1646 */ +#line 464 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[0].type); } #line 1935 "parser.c" /* yacc.c:1646 */ break; case 56: -#line 468 "parser.y" /* yacc.c:1646 */ +#line 468 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itShortDecl((yyvsp[0].symtype).innumber, (yyvsp[0].symtype).instr, (yyvsp[0].symtype).outnumber, (yyvsp[0].symtype).outstr, @@ -1945,7 +1945,7 @@ yyreduce: break; case 57: -#line 475 "parser.y" /* yacc.c:1646 */ +#line 475 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itLongDecl((yyvsp[-4].symtype).innumber, (yyvsp[-4].symtype).instr, (yyvsp[-4].symtype).outnumber, (yyvsp[-4].symtype).outstr, @@ -1955,13 +1955,13 @@ yyreduce: break; case 58: -#line 483 "parser.y" /* yacc.c:1646 */ +#line 483 "../release/parser.y" /* yacc.c:1646 */ { (yyval.flag) = flNone; } #line 1961 "parser.c" /* yacc.c:1646 */ break; case 59: -#line 485 "parser.y" /* yacc.c:1646 */ +#line 485 "../release/parser.y" /* yacc.c:1646 */ { if ((yyvsp[-2].flag) & (yyvsp[0].flag)) warn("redundant IPC flag ignored"); @@ -1972,7 +1972,7 @@ yyreduce: break; case 60: -#line 492 "parser.y" /* yacc.c:1646 */ +#line 492 "../release/parser.y" /* yacc.c:1646 */ { if ((yyvsp[-2].flag) != flDealloc) warn("only Dealloc is variable"); @@ -1983,7 +1983,7 @@ yyreduce: break; case 61: -#line 501 "parser.y" /* yacc.c:1646 */ +#line 501 "../release/parser.y" /* yacc.c:1646 */ { (yyval.symtype).innumber = (yyval.symtype).outnumber = (yyvsp[0].number); (yyval.symtype).instr = (yyval.symtype).outstr = strNULL; @@ -1993,19 +1993,19 @@ yyreduce: break; case 62: -#line 507 "parser.y" /* yacc.c:1646 */ +#line 507 "../release/parser.y" /* yacc.c:1646 */ { (yyval.symtype) = (yyvsp[0].symtype); } #line 1999 "parser.c" /* yacc.c:1646 */ break; case 63: -#line 511 "parser.y" /* yacc.c:1646 */ +#line 511 "../release/parser.y" /* yacc.c:1646 */ { (yyval.symtype) = (yyvsp[0].symtype); } #line 2005 "parser.c" /* yacc.c:1646 */ break; case 64: -#line 513 "parser.y" /* yacc.c:1646 */ +#line 513 "../release/parser.y" /* yacc.c:1646 */ { if ((yyvsp[-2].symtype).size != (yyvsp[0].symtype).size) { @@ -2031,133 +2031,133 @@ yyreduce: break; case 65: -#line 537 "parser.y" /* yacc.c:1646 */ +#line 537 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itPrevDecl((yyvsp[0].identifier)); } #line 2037 "parser.c" /* yacc.c:1646 */ break; case 66: -#line 541 "parser.y" /* yacc.c:1646 */ +#line 541 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = 0; } #line 2043 "parser.c" /* yacc.c:1646 */ break; case 67: -#line 543 "parser.y" /* yacc.c:1646 */ +#line 543 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = 0; } #line 2049 "parser.c" /* yacc.c:1646 */ break; case 68: -#line 546 "parser.y" /* yacc.c:1646 */ +#line 546 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number); } #line 2055 "parser.c" /* yacc.c:1646 */ break; case 69: -#line 550 "parser.y" /* yacc.c:1646 */ +#line 550 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number); } #line 2061 "parser.c" /* yacc.c:1646 */ break; case 70: -#line 554 "parser.y" /* yacc.c:1646 */ +#line 554 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number); } #line 2067 "parser.c" /* yacc.c:1646 */ break; case 71: -#line 558 "parser.y" /* yacc.c:1646 */ +#line 558 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itCStringDecl((yyvsp[-1].number), FALSE); } #line 2073 "parser.c" /* yacc.c:1646 */ break; case 72: -#line 561 "parser.y" /* yacc.c:1646 */ +#line 561 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itCStringDecl((yyvsp[-1].number), TRUE); } #line 2079 "parser.c" /* yacc.c:1646 */ break; case 73: -#line 565 "parser.y" /* yacc.c:1646 */ +#line 565 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); } #line 2085 "parser.c" /* yacc.c:1646 */ break; case 74: -#line 567 "parser.y" /* yacc.c:1646 */ +#line 567 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number) - (yyvsp[0].number); } #line 2091 "parser.c" /* yacc.c:1646 */ break; case 75: -#line 569 "parser.y" /* yacc.c:1646 */ +#line 569 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number) * (yyvsp[0].number); } #line 2097 "parser.c" /* yacc.c:1646 */ break; case 76: -#line 571 "parser.y" /* yacc.c:1646 */ +#line 571 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-2].number) / (yyvsp[0].number); } #line 2103 "parser.c" /* yacc.c:1646 */ break; case 77: -#line 573 "parser.y" /* yacc.c:1646 */ +#line 573 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].number); } #line 2109 "parser.c" /* yacc.c:1646 */ break; case 78: -#line 575 "parser.y" /* yacc.c:1646 */ +#line 575 "../release/parser.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[-1].number); } #line 2115 "parser.c" /* yacc.c:1646 */ break; case 79: -#line 579 "parser.y" /* yacc.c:1646 */ +#line 579 "../release/parser.y" /* yacc.c:1646 */ { (yyval.routine) = (yyvsp[0].routine); } #line 2121 "parser.c" /* yacc.c:1646 */ break; case 80: -#line 580 "parser.y" /* yacc.c:1646 */ +#line 580 "../release/parser.y" /* yacc.c:1646 */ { (yyval.routine) = (yyvsp[0].routine); } #line 2127 "parser.c" /* yacc.c:1646 */ break; case 81: -#line 584 "parser.y" /* yacc.c:1646 */ +#line 584 "../release/parser.y" /* yacc.c:1646 */ { (yyval.routine) = rtMakeRoutine((yyvsp[-1].identifier), (yyvsp[0].argument)); } #line 2133 "parser.c" /* yacc.c:1646 */ break; case 82: -#line 588 "parser.y" /* yacc.c:1646 */ +#line 588 "../release/parser.y" /* yacc.c:1646 */ { (yyval.routine) = rtMakeSimpleRoutine((yyvsp[-1].identifier), (yyvsp[0].argument)); } #line 2139 "parser.c" /* yacc.c:1646 */ break; case 83: -#line 592 "parser.y" /* yacc.c:1646 */ +#line 592 "../release/parser.y" /* yacc.c:1646 */ { (yyval.argument) = argNULL; } #line 2145 "parser.c" /* yacc.c:1646 */ break; case 84: -#line 594 "parser.y" /* yacc.c:1646 */ +#line 594 "../release/parser.y" /* yacc.c:1646 */ { (yyval.argument) = (yyvsp[-1].argument); } #line 2151 "parser.c" /* yacc.c:1646 */ break; case 85: -#line 599 "parser.y" /* yacc.c:1646 */ +#line 599 "../release/parser.y" /* yacc.c:1646 */ { (yyval.argument) = (yyvsp[0].argument); } #line 2157 "parser.c" /* yacc.c:1646 */ break; case 86: -#line 601 "parser.y" /* yacc.c:1646 */ +#line 601 "../release/parser.y" /* yacc.c:1646 */ { (yyval.argument) = (yyvsp[-2].argument); (yyval.argument)->argNext = (yyvsp[0].argument); @@ -2166,7 +2166,7 @@ yyreduce: break; case 87: -#line 608 "parser.y" /* yacc.c:1646 */ +#line 608 "../release/parser.y" /* yacc.c:1646 */ { (yyval.argument) = argAlloc(); (yyval.argument)->argKind = (yyvsp[-4].direction); @@ -2178,73 +2178,73 @@ yyreduce: break; case 88: -#line 617 "parser.y" /* yacc.c:1646 */ +#line 617 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akNone; } #line 2184 "parser.c" /* yacc.c:1646 */ break; case 89: -#line 618 "parser.y" /* yacc.c:1646 */ +#line 618 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akIn; } #line 2190 "parser.c" /* yacc.c:1646 */ break; case 90: -#line 619 "parser.y" /* yacc.c:1646 */ +#line 619 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akOut; } #line 2196 "parser.c" /* yacc.c:1646 */ break; case 91: -#line 620 "parser.y" /* yacc.c:1646 */ +#line 620 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akInOut; } #line 2202 "parser.c" /* yacc.c:1646 */ break; case 92: -#line 621 "parser.y" /* yacc.c:1646 */ +#line 621 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akRequestPort; } #line 2208 "parser.c" /* yacc.c:1646 */ break; case 93: -#line 622 "parser.y" /* yacc.c:1646 */ +#line 622 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akReplyPort; } #line 2214 "parser.c" /* yacc.c:1646 */ break; case 94: -#line 623 "parser.y" /* yacc.c:1646 */ +#line 623 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akSReplyPort; } #line 2220 "parser.c" /* yacc.c:1646 */ break; case 95: -#line 624 "parser.y" /* yacc.c:1646 */ +#line 624 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akUReplyPort; } #line 2226 "parser.c" /* yacc.c:1646 */ break; case 96: -#line 625 "parser.y" /* yacc.c:1646 */ +#line 625 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akWaitTime; } #line 2232 "parser.c" /* yacc.c:1646 */ break; case 97: -#line 626 "parser.y" /* yacc.c:1646 */ +#line 626 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akMsgOption; } #line 2238 "parser.c" /* yacc.c:1646 */ break; case 98: -#line 627 "parser.y" /* yacc.c:1646 */ +#line 627 "../release/parser.y" /* yacc.c:1646 */ { (yyval.direction) = akMsgSeqno; } #line 2244 "parser.c" /* yacc.c:1646 */ break; case 99: -#line 631 "parser.y" /* yacc.c:1646 */ +#line 631 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = itLookUp((yyvsp[0].identifier)); if ((yyval.type) == itNULL) @@ -2254,25 +2254,25 @@ yyreduce: break; case 100: -#line 637 "parser.y" /* yacc.c:1646 */ +#line 637 "../release/parser.y" /* yacc.c:1646 */ { (yyval.type) = (yyvsp[0].type); } #line 2260 "parser.c" /* yacc.c:1646 */ break; case 101: -#line 641 "parser.y" /* yacc.c:1646 */ +#line 641 "../release/parser.y" /* yacc.c:1646 */ { LookString(); } #line 2266 "parser.c" /* yacc.c:1646 */ break; case 102: -#line 645 "parser.y" /* yacc.c:1646 */ +#line 645 "../release/parser.y" /* yacc.c:1646 */ { LookFileName(); } #line 2272 "parser.c" /* yacc.c:1646 */ break; case 103: -#line 649 "parser.y" /* yacc.c:1646 */ +#line 649 "../release/parser.y" /* yacc.c:1646 */ { LookQString(); } #line 2278 "parser.c" /* yacc.c:1646 */ break; @@ -2506,7 +2506,7 @@ yyreturn: #endif return yyresult; } -#line 652 "parser.y" /* yacc.c:1906 */ +#line 652 "../release/parser.y" /* yacc.c:1906 */ static const char * diff --git a/parser.h b/parser.h index 0188b64..0a0f7dc 100644 --- a/parser.h +++ b/parser.h @@ -178,7 +178,7 @@ extern int yydebug; union YYSTYPE { -#line 137 "parser.y" /* yacc.c:1909 */ +#line 137 "../release/parser.y" /* yacc.c:1909 */ u_int number; identifier_t identifier; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/mig.git
