diff -Nru php7.1-7.1.6/acinclude.m4 php7.1-7.1.8/acinclude.m4 --- php7.1-7.1.6/acinclude.m4 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/acinclude.m4 2017-08-01 17:36:55.000000000 +0000 @@ -2687,7 +2687,7 @@ done echo "'[$]0' \\" >> $1 - if test `expr -- [$]0 : "'.*"` = 0; then + if test `expr " [$]0" : " '.*"` = 0; then CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" diff -Nru php7.1-7.1.6/aclocal.m4 php7.1-7.1.8/aclocal.m4 --- php7.1-7.1.6/aclocal.m4 2017-06-07 08:09:37.000000000 +0000 +++ php7.1-7.1.8/aclocal.m4 2017-08-01 17:36:55.000000000 +0000 @@ -2687,7 +2687,7 @@ done echo "'[$]0' \\" >> $1 - if test `expr -- [$]0 : "'.*"` = 0; then + if test `expr " [$]0" : " '.*"` = 0; then CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" diff -Nru php7.1-7.1.6/appveyor/build.bat php7.1-7.1.8/appveyor/build.bat --- php7.1-7.1.6/appveyor/build.bat 2017-06-07 08:09:37.000000000 +0000 +++ php7.1-7.1.8/appveyor/build.bat 2017-08-01 17:36:55.000000000 +0000 @@ -29,5 +29,8 @@ exit /b 3 ) -call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat +cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat +if %errorlevel% neq 0 exit /b 3 + +exit /b 0 diff -Nru php7.1-7.1.6/appveyor/build_task.bat php7.1-7.1.8/appveyor/build_task.bat --- php7.1-7.1.6/appveyor/build_task.bat 2017-06-07 08:09:37.000000000 +0000 +++ php7.1-7.1.8/appveyor/build_task.bat 2017-08-01 17:36:55.000000000 +0000 @@ -19,18 +19,25 @@ set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH% rem SDK is cached, deps info is cached as well echo Updating dependencies in %DEPS_DIR% -call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% +cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% if %errorlevel% neq 0 exit /b 3 -call buildconf.bat --force +rem Something went wrong, most likely when concurrent builds were to fetch deps +rem updates. It might be, that some locking mechanism is needed. +if not exist "%DEPS_DIR%" ( + cmd /c phpsdk_deps --update --force --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% +) +if %errorlevel% neq 0 exit /b 3 + +cmd /c buildconf.bat --force if %errorlevel% neq 0 exit /b 3 if "%THREAD_SAFE%" equ "0" set ADD_CONF=--disable-zts -set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap,dba +set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap,dba,ftp if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache -call configure.bat ^ +cmd /c configure.bat ^ --enable-snapshot-build ^ --disable-debug-pack ^ --with-mcrypt=shared ^ diff -Nru php7.1-7.1.6/appveyor/test.bat php7.1-7.1.8/appveyor/test.bat --- php7.1-7.1.6/appveyor/test.bat 2017-06-07 08:09:37.000000000 +0000 +++ php7.1-7.1.8/appveyor/test.bat 2017-08-01 17:36:55.000000000 +0000 @@ -6,5 +6,8 @@ exit /b 3 ) -call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat +cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat +if %errorlevel% neq 0 exit /b 3 + +exit /b 0 diff -Nru php7.1-7.1.6/appveyor/test_task.bat php7.1-7.1.8/appveyor/test_task.bat --- php7.1-7.1.6/appveyor/test_task.bat 2017-06-07 08:09:37.000000000 +0000 +++ php7.1-7.1.8/appveyor/test_task.bat 2017-08-01 17:36:55.000000000 +0000 @@ -12,6 +12,10 @@ set STABILITY=staging ) set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH% +if not exist "%DEPS_DIR%" ( + echo "%DEPS_DIR%" doesn't exist + exit /b 3 +) rem setup MySQL related exts set MYSQL_PWD=Password12! @@ -25,6 +29,7 @@ set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT% set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST% port=%PDO_MYSQL_TEST_PORT% dbname=test user=%PDO_MYSQL_TEST_USER% password=%MYSQL_PW% "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test" +if %errorlevel% neq 0 exit /b 3 rem setup PostgreSQL related exts set PGUSER=postgres @@ -33,12 +38,15 @@ echo ^ >> "./ext/pgsql/tests/config.inc" set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD% "C:\Program Files\PostgreSQL\9.5\bin\createdb.exe" test +if %errorlevel% neq 0 exit /b 3 rem prepare for ext/openssl if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL mkdir c:\usr\local\ssl +if %errorlevel% neq 0 exit /b 3 copy %DEPS_DIR%\template\ssl\openssl.cnf c:\usr\local\ssl +if %errorlevel% neq 0 exit /b 3 set OPENSSL_CONF=c:\usr\local\ssl\openssl.cnf rem set OPENSSL_CONF= rem set SSLEAY_CONF= @@ -48,9 +56,13 @@ rem prepare for enchant mkdir c:\enchant_plugins +if %errorlevel% neq 0 exit /b 3 copy %DEPS_DIR%\bin\libenchant_ispell.dll c:\enchant_plugins +if %errorlevel% neq 0 exit /b 3 copy %DEPS_DIR%\bin\libenchant_myspell.dll c:\enchant_plugins +if %errorlevel% neq 0 exit /b 3 reg add HKEY_CURRENT_USER\SOFTWARE\Enchant\Config /v Module_Dir /t REG_SZ /d c:\enchant_plugins +if %errorlevel% neq 0 exit /b 3 set PHP_BUILD_CACHE_ENCHANT_DICT_DIR=%PHP_BUILD_CACHE_BASE_DIR%\enchant_dict if not exist "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%" ( echo Creating %PHP_BUILD_CACHE_ENCHANT_DICT_DIR% @@ -73,3 +85,5 @@ cd "%APPVEYOR_BUILD_FOLDER%" nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp" +exit /b %errorlevel% + diff -Nru php7.1-7.1.6/.appveyor.yml php7.1-7.1.8/.appveyor.yml --- php7.1-7.1.6/.appveyor.yml 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/.appveyor.yml 2017-08-01 17:36:48.000000000 +0000 @@ -24,7 +24,7 @@ PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: php-sdk-2.0.4 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.7 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root diff -Nru php7.1-7.1.6/configure php7.1-7.1.8/configure --- php7.1-7.1.6/configure 2017-06-07 08:09:38.000000000 +0000 +++ php7.1-7.1.8/configure 2017-08-01 17:36:57.000000000 +0000 @@ -3469,7 +3469,7 @@ done echo "'$0' \\" >> config.nice - if test `expr -- $0 : "'.*"` = 0; then + if test `expr " $0" : " '.*"` = 0; then CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$0'" else CONFIGURE_COMMAND="$CONFIGURE_COMMAND $0" @@ -3662,7 +3662,7 @@ PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=1 -PHP_RELEASE_VERSION=6 +PHP_RELEASE_VERSION=8 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION` @@ -54459,7 +54459,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -54508,7 +54508,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -54638,7 +54638,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -54684,7 +54684,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -55097,7 +55097,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -55146,7 +55146,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -55276,7 +55276,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -55322,7 +55322,7 @@ old_IFS=$IFS - for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do + for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c; do IFS=. set $ac_src @@ -62869,7 +62869,19 @@ -SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped +if test -z "$SED"; then + PHP_PDO_OCI_SED="sed"; +else + PHP_PDO_OCI_SED="$SED"; +fi + +PHP_PDO_OCI_TAIL1=`echo a | tail -n1 2>/dev/null` +if test "$PHP_PDO_OCI_TAIL1" = "a"; then + PHP_PDO_OCI_TAIL1="tail -n1" +else + PHP_PDO_OCI_TAIL1="tail -1" +fi + @@ -63562,13 +63574,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5 $as_echo_n "checking Oracle version... " >&6; } - for OCI_VER in $SUPPORTED_LIB_VERS; do - if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then - PDO_OCI_VERSION="$OCI_VER" - fi - done - if test -z "$PDO_OCI_VERSION"; then - as_fn_error $? "Oracle required OCI8 libraries not found under $PDO_OCI_DIR" "$LINENO" 5 + PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME + PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1` # Oracle 10g, 11g, 12c etc + if test -f "$PDO_OCI_LCS"; then + PDO_OCI_VERSION=`echo $PDO_OCI_LCS | $PHP_PDO_OCI_SED -e 's/.*\.\(.*\)\.1$/\1.1/'` + elif test -f $PDO_OCI_LCS_BASE.9.0; then + PDO_OCI_VERSION=9.0 + else + as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5 $as_echo "$PDO_OCI_VERSION" >&6; } @@ -63576,7 +63589,10 @@ fi case $PDO_OCI_VERSION in - 9.0|10.1|10.2|11.1|11.2|12.1) + 7.3|8.0|8.1) + as_fn_error $? "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5 + ;; + *) case clntsh in @@ -63601,10 +63617,6 @@ ;; - - *) - as_fn_error $? "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5 - ;; esac @@ -95876,7 +95888,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 97944 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -99327,7 +99339,7 @@ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <&5) + (eval echo "\"configure:99500: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:99492: \$? = $ac_status" >&5 + echo "configure:99504: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -99783,11 +99795,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:99786: $lt_compile\"" >&5) + (eval echo "\"configure:99798: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:99790: \$? = $ac_status" >&5 + echo "configure:99802: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -99887,11 +99899,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:99890: $lt_compile\"" >&5) + (eval echo "\"configure:99902: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:99894: \$? = $ac_status" >&5 + echo "configure:99906: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -100351,7 +100363,7 @@ # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"configure:104385: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:104377: \$? = $ac_status" >&5 + echo "configure:104389: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -104474,11 +104486,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:104477: $lt_compile\"" >&5) + (eval echo "\"configure:104489: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:104481: \$? = $ac_status" >&5 + echo "configure:104493: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff -Nru php7.1-7.1.6/configure.in php7.1-7.1.8/configure.in --- php7.1-7.1.6/configure.in 2017-06-07 08:09:27.000000000 +0000 +++ php7.1-7.1.8/configure.in 2017-08-01 17:36:48.000000000 +0000 @@ -119,7 +119,7 @@ PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=1 -PHP_RELEASE_VERSION=6 +PHP_RELEASE_VERSION=8 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff -Nru php7.1-7.1.6/debian/changelog php7.1-7.1.8/debian/changelog --- php7.1-7.1.6/debian/changelog 2017-06-16 22:33:57.000000000 +0000 +++ php7.1-7.1.8/debian/changelog 2017-08-08 15:57:37.000000000 +0000 @@ -1,3 +1,32 @@ +php7.1 (7.1.8-1ubuntu1) artful; urgency=medium + + * Merge with Debian unstable (LP: #1709363). Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Tue, 08 Aug 2017 08:57:37 -0700 + +php7.1 (7.1.8-1) unstable; urgency=medium + + * New upstream version 7.1.8 + * Rebase patches for PHP 7.1.8 + + -- Ondřej Surý Thu, 03 Aug 2017 20:35:23 +0200 + +php7.1 (7.1.7.retag-1) unstable; urgency=medium + + * New upstream version 7.1.7 (retagged) + + -- Ondřej Surý Fri, 07 Jul 2017 11:37:12 +0200 + +php7.1 (7.1.7-1) unstable; urgency=medium + + * New upstream version 7.1.7 + * Rebase patches on top of PHP 7.1.7 + + -- Ondřej Surý Thu, 06 Jul 2017 11:11:57 +0200 + php7.1 (7.1.6-2ubuntu1) artful; urgency=medium * Merge with Debian unstable. Remaining changes: diff -Nru php7.1-7.1.6/debian/control php7.1-7.1.8/debian/control --- php7.1-7.1.6/debian/control 2017-06-16 22:33:57.000000000 +0000 +++ php7.1-7.1.8/debian/control 2017-08-08 15:57:37.000000000 +0000 @@ -75,8 +75,8 @@ Build-Conflicts: bind-dev, libxmlrpc-core-c3-dev Standards-Version: 3.9.7 -Vcs-Git: https://gitlab.sury.org/pkg-php/php.git -Vcs-Browser: https://gitlab.sury.org/pkg-php/php +Vcs-Git: https://gitlab.com/deb.sury.org/php.git +Vcs-Browser: https://gitlab.com/deb.sury.org/php Homepage: http://www.php.net/ Package: libapache2-mod-php7.1 @@ -295,29 +295,6 @@ This package is a transitional dummy package and can be safely removed. -Package: php7.1-intl -Architecture: any -Depends: php-common (>= 1:35), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-intl:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-intl:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-intl:Replaces} -Breaks: ${php-intl:Breaks} -Conflicts: ${php-intl:Conflicts} -Provides: ${php-intl:Provides} -Recommends: ${php-intl:Recommends} -Description: Internationalisation module for PHP - This package provides the Internationalisation module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.1-odbc Architecture: any Depends: php-common (>= 1:35), @@ -571,24 +548,24 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.1-tidy +Package: php7.1-intl Architecture: any Depends: php-common (>= 1:35), ucf, ${misc:Depends}, ${php:Depends}, - ${php-tidy:Depends}, + ${php-intl:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends}, - ${php-tidy:Pre-Depends} + ${php-intl:Pre-Depends} Built-Using: ${php:Built-Using} -Replaces: ${php-tidy:Replaces} -Breaks: ${php-tidy:Breaks} -Conflicts: ${php-tidy:Conflicts} -Provides: ${php-tidy:Provides} -Recommends: ${php-tidy:Recommends} -Description: tidy module for PHP - This package provides the tidy module(s) for PHP. +Replaces: ${php-intl:Replaces} +Breaks: ${php-intl:Breaks} +Conflicts: ${php-intl:Conflicts} +Provides: ${php-intl:Provides} +Recommends: ${php-intl:Recommends} +Description: Internationalisation module for PHP + This package provides the Internationalisation module(s) for PHP. . PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open source general-purpose scripting language that is especially suited @@ -845,6 +822,29 @@ . PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open source general-purpose scripting language that is especially suited + for web development and can be embedded into HTML. + +Package: php7.1-tidy +Architecture: any +Depends: php-common (>= 1:35), + ucf, + ${misc:Depends}, + ${php:Depends}, + ${php-tidy:Depends}, + ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, + ${php-tidy:Pre-Depends} +Built-Using: ${php:Built-Using} +Replaces: ${php-tidy:Replaces} +Breaks: ${php-tidy:Breaks} +Conflicts: ${php-tidy:Conflicts} +Provides: ${php-tidy:Provides} +Recommends: ${php-tidy:Recommends} +Description: tidy module for PHP + This package provides the tidy module(s) for PHP. + . + PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used + open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. Package: php7.1-soap diff -Nru php7.1-7.1.6/debian/control.in php7.1-7.1.8/debian/control.in --- php7.1-7.1.6/debian/control.in 2017-06-16 22:33:57.000000000 +0000 +++ php7.1-7.1.8/debian/control.in 2017-08-08 15:57:37.000000000 +0000 @@ -75,8 +75,8 @@ Build-Conflicts: bind-dev, libxmlrpc-core-c3-dev Standards-Version: 3.9.7 -Vcs-Git: https://gitlab.sury.org/pkg-php/php.git -Vcs-Browser: https://gitlab.sury.org/pkg-php/php +Vcs-Git: https://gitlab.com/deb.sury.org/php.git +Vcs-Browser: https://gitlab.com/deb.sury.org/php Homepage: http://www.php.net/ Package: libapache2-mod-php@PHP_VERSION@ diff -Nru php7.1-7.1.6/debian/patches/0001-libtool_fixes.patch php7.1-7.1.8/debian/patches/0001-libtool_fixes.patch --- php7.1-7.1.6/debian/patches/0001-libtool_fixes.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0001-libtool_fixes.patch 2017-08-08 15:52:21.000000000 +0000 @@ -22,7 +22,7 @@ dnl TSRM_PTHREAD diff --git a/configure.in b/configure.in -index 52c26cf..46bc4ac 100644 +index a48d7da..651c828 100644 --- a/configure.in +++ b/configure.in @@ -1427,8 +1427,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ diff -Nru php7.1-7.1.6/debian/patches/0002-static_openssl.patch php7.1-7.1.8/debian/patches/0002-static_openssl.patch --- php7.1-7.1.6/debian/patches/0002-static_openssl.patch 2017-05-19 21:16:45.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0002-static_openssl.patch 2017-08-08 15:52:21.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index 51b397f..41b020c 100644 +index 151722d..18626a2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2396,9 +2396,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ diff -Nru php7.1-7.1.6/debian/patches/0003-debian_quirks.patch php7.1-7.1.8/debian/patches/0003-debian_quirks.patch --- php7.1-7.1.6/debian/patches/0003-debian_quirks.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0003-debian_quirks.patch 2017-08-08 15:52:21.000000000 +0000 @@ -14,7 +14,7 @@ 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in -index 46bc4ac..49a2f38 100644 +index 651c828..0978259 100644 --- a/configure.in +++ b/configure.in @@ -1095,7 +1095,7 @@ if test "$PHP_CLI" = "no"; then @@ -65,7 +65,7 @@ ## convert skel_dir to full path diff --git a/php.ini-development b/php.ini-development -index d870195..b72ba77 100644 +index e371ca5..59c0d52 100644 --- a/php.ini-development +++ b/php.ini-development @@ -710,7 +710,7 @@ default_charset = "UTF-8" @@ -78,7 +78,7 @@ ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" diff --git a/php.ini-production b/php.ini-production -index a8ac882..ae03cdd 100644 +index 0a28d3b..b24f91b 100644 --- a/php.ini-production +++ b/php.ini-production @@ -710,7 +710,7 @@ default_charset = "UTF-8" diff -Nru php7.1-7.1.6/debian/patches/0007-extension_api.patch php7.1-7.1.8/debian/patches/0007-extension_api.patch --- php7.1-7.1.6/debian/patches/0007-extension_api.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0007-extension_api.patch 2017-08-08 15:52:21.000000000 +0000 @@ -8,7 +8,7 @@ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 49a2f38..d2eac81 100644 +index 0978259..6a7f415 100644 --- a/configure.in +++ b/configure.in @@ -1207,8 +1207,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul diff -Nru php7.1-7.1.6/debian/patches/0011-php.ini_securitynotes.patch php7.1-7.1.8/debian/patches/0011-php.ini_securitynotes.patch --- php7.1-7.1.6/debian/patches/0011-php.ini_securitynotes.patch 2017-06-16 19:31:59.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0011-php.ini_securitynotes.patch 2017-08-08 15:52:21.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 6 insertions(+) diff --git a/php.ini-development b/php.ini-development -index b72ba77..f0b3e4c 100644 +index 59c0d52..06de6c6 100644 --- a/php.ini-development +++ b/php.ini-development @@ -306,6 +306,12 @@ serialize_precision = -1 diff -Nru php7.1-7.1.6/debian/patches/0018-session_save_path.patch php7.1-7.1.8/debian/patches/0018-session_save_path.patch --- php7.1-7.1.6/debian/patches/0018-session_save_path.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0018-session_save_path.patch 2017-08-08 15:52:21.000000000 +0000 @@ -22,7 +22,7 @@ PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler) STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_PERDIR, OnUpdateBool, auto_start, php_ps_globals, ps_globals) diff --git a/php.ini-development b/php.ini-development -index f0b3e4c..b6b2936 100644 +index 06de6c6..0f8f177 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1358,7 +1358,7 @@ session.save_handler = files @@ -35,7 +35,7 @@ ; Whether to use strict session mode. ; Strict session mode does not accept uninitialized session ID and regenerate diff --git a/php.ini-production b/php.ini-production -index ae03cdd..594e261 100644 +index b24f91b..dae99b0 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1352,7 +1352,7 @@ session.save_handler = files diff -Nru php7.1-7.1.6/debian/patches/0023-temporary-path-fixes-for-multiarch.patch php7.1-7.1.8/debian/patches/0023-temporary-path-fixes-for-multiarch.patch --- php7.1-7.1.6/debian/patches/0023-temporary-path-fixes-for-multiarch.patch 2017-05-19 21:16:45.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0023-temporary-path-fixes-for-multiarch.patch 2017-08-08 15:52:21.000000000 +0000 @@ -12,7 +12,7 @@ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index 41b020c..1483973 100644 +index 18626a2..3e08554 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2286,7 +2286,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[ diff -Nru php7.1-7.1.6/debian/patches/0026-php-5.3.9-gnusrc.patch php7.1-7.1.8/debian/patches/0026-php-5.3.9-gnusrc.patch --- php7.1-7.1.6/debian/patches/0026-php-5.3.9-gnusrc.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0026-php-5.3.9-gnusrc.patch 2017-08-08 15:52:21.000000000 +0000 @@ -29,7 +29,7 @@ /* +----------------------------------------------------------------------+ diff --git a/configure.in b/configure.in -index d2eac81..39adaa0 100644 +index 6a7f415..0ed22a9 100644 --- a/configure.in +++ b/configure.in @@ -136,6 +136,8 @@ AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl diff -Nru php7.1-7.1.6/debian/patches/0028-php-5.2.4-norpath.patch php7.1-7.1.8/debian/patches/0028-php-5.2.4-norpath.patch --- php7.1-7.1.6/debian/patches/0028-php-5.2.4-norpath.patch 2017-05-19 21:16:45.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0028-php-5.2.4-norpath.patch 2017-08-08 15:52:21.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 2 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 -index 1483973..c188851 100644 +index 3e08554..2e06e64 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[ diff -Nru php7.1-7.1.6/debian/patches/0032-Use-system-timezone.patch php7.1-7.1.8/debian/patches/0032-Use-system-timezone.patch --- php7.1-7.1.6/debian/patches/0032-Use-system-timezone.patch 2017-06-16 19:31:59.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0032-Use-system-timezone.patch 2017-08-08 15:52:21.000000000 +0000 @@ -14,7 +14,7 @@ 1 file changed, 17 insertions(+) diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index c4e5fcb..e618f9d 100644 +index dcc71a4..d7b53e1 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1009,6 +1009,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) diff -Nru php7.1-7.1.6/debian/patches/0033-zlib-largefile-function-renaming.patch php7.1-7.1.8/debian/patches/0033-zlib-largefile-function-renaming.patch --- php7.1-7.1.6/debian/patches/0033-zlib-largefile-function-renaming.patch 2017-05-19 21:16:45.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0033-zlib-largefile-function-renaming.patch 2017-08-08 15:52:21.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 12 insertions(+) diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c -index dd0a1c2..17b322f 100644 +index e840fb4..a861083 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -49,6 +49,18 @@ diff -Nru php7.1-7.1.6/debian/patches/0036-php-5.4.9-fixheader.patch php7.1-7.1.8/debian/patches/0036-php-5.4.9-fixheader.patch --- php7.1-7.1.6/debian/patches/0036-php-5.4.9-fixheader.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0036-php-5.4.9-fixheader.patch 2017-08-08 15:52:21.000000000 +0000 @@ -8,7 +8,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index 39adaa0..d004048 100644 +index 0ed22a9..248b27c 100644 --- a/configure.in +++ b/configure.in @@ -1292,7 +1292,7 @@ fi diff -Nru php7.1-7.1.6/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch php7.1-7.1.8/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch --- php7.1-7.1.6/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2017-06-16 19:32:26.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2017-08-08 15:52:21.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index d004048..2211371 100644 +index 248b27c..5fae1dc 100644 --- a/configure.in +++ b/configure.in @@ -1254,9 +1254,9 @@ EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` diff -Nru php7.1-7.1.6/debian/patches/0048-Fixed-bug-74600.patch php7.1-7.1.8/debian/patches/0048-Fixed-bug-74600.patch --- php7.1-7.1.6/debian/patches/0048-Fixed-bug-74600.patch 2017-06-16 22:33:50.000000000 +0000 +++ php7.1-7.1.8/debian/patches/0048-Fixed-bug-74600.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From: Manuel Mausz -Date: Fri, 9 Jun 2017 01:43:08 +0200 -Subject: Fixed bug #74600 - -Make sure the hash entry is an array. - -The origin fix broke support for HOST/PATH ini sections. Only the -beginning of the string has to match. Revert this check but use -zend_binary_strncasecmp instead of strncasecmp. ---- - main/php_ini.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/main/php_ini.c b/main/php_ini.c -index 12dba2a..75b1695 100644 ---- a/main/php_ini.c -+++ b/main/php_ini.c -@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t - size_t key_len; - - /* PATH sections */ -- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { -+ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) { - key = Z_STRVAL_P(arg1); - key = key + sizeof("PATH") - 1; - key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1; -@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t - TRANSLATE_SLASHES_LOWER(key); - - /* HOST sections */ -- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { -+ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) { - key = Z_STRVAL_P(arg1); - key = key + sizeof("HOST") - 1; - key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; -@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t - zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1); - entry = zend_hash_str_update(target_hash, key, key_len, §ion_arr); - } -- active_ini_hash = Z_ARRVAL_P(entry); -+ if (Z_TYPE_P(entry) == IS_ARRAY) { -+ active_ini_hash = Z_ARRVAL_P(entry); -+ } - } - } - break; diff -Nru php7.1-7.1.6/debian/patches/series php7.1-7.1.8/debian/patches/series --- php7.1-7.1.6/debian/patches/series 2017-06-16 22:33:50.000000000 +0000 +++ php7.1-7.1.8/debian/patches/series 2017-08-08 15:52:21.000000000 +0000 @@ -45,4 +45,3 @@ 0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 0046-Fix-ext-date-lib-parse_tz-PATH_MAX-HURD-FTBFS.patch 0049-Fix-check-for-CURL-include-in-M-A-directory.patch -0048-Fixed-bug-74600.patch diff -Nru php7.1-7.1.6/ext/date/lib/parse_date.c php7.1-7.1.8/ext/date/lib/parse_date.c --- php7.1-7.1.6/ext/date/lib/parse_date.c 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/date/lib/parse_date.c 2017-08-01 17:36:53.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.15.3 on Fri Oct 7 13:19:24 2016 */ +/* Generated by re2c 0.15.3 on Tue Jul 4 21:15:17 2017 */ /* * The MIT License (MIT) * @@ -877,7 +877,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - if ((YYLIMIT - YYCURSOR) < 31) YYFILL(31); + if ((YYLIMIT - YYCURSOR) < 33) YYFILL(33); yych = *YYCURSOR; switch (yych) { case 0x00: @@ -962,14 +962,14 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy165; - goto yy1581; + goto yy1521; } } else { if (yych <= 'd') { if (yych <= 'Z') goto yy165; if (yych >= 'a') goto yy170; } else { - if (yych <= 'e') goto yy1590; + if (yych <= 'e') goto yy1530; if (yych <= 'z') goto yy170; } } @@ -995,7 +995,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy165; - goto yy1581; + goto yy1521; } } else { if (yych <= 'd') { @@ -1003,7 +1003,7 @@ if (yych <= '`') goto yy3; goto yy165; } else { - if (yych <= 'e') goto yy1581; + if (yych <= 'e') goto yy1521; if (yych <= 'z') goto yy165; goto yy3; } @@ -1017,12 +1017,12 @@ goto yy165; } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1552; + if (yych <= 'E') goto yy1492; goto yy165; } else { - if (yych <= 'I') goto yy1553; + if (yych <= 'I') goto yy1493; if (yych <= 'N') goto yy165; - goto yy1551; + goto yy1491; } } } else { @@ -1031,15 +1031,15 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych == 'e') goto yy1568; + if (yych == 'e') goto yy1508; goto yy170; } } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1569; + if (yych <= 'i') goto yy1509; goto yy170; } else { - if (yych <= 'o') goto yy1567; + if (yych <= 'o') goto yy1507; if (yych <= 'z') goto yy170; goto yy3; } @@ -1054,12 +1054,12 @@ goto yy165; } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1552; + if (yych <= 'E') goto yy1492; goto yy165; } else { - if (yych <= 'I') goto yy1553; + if (yych <= 'I') goto yy1493; if (yych <= 'N') goto yy165; - goto yy1551; + goto yy1491; } } } else { @@ -1068,15 +1068,15 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych == 'e') goto yy1552; + if (yych == 'e') goto yy1492; goto yy165; } } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1553; + if (yych <= 'i') goto yy1493; goto yy165; } else { - if (yych <= 'o') goto yy1551; + if (yych <= 'o') goto yy1491; if (yych <= 'z') goto yy165; goto yy3; } @@ -1088,24 +1088,24 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1521; + goto yy1461; } else { - if (yych == 'I') goto yy1522; + if (yych == 'I') goto yy1462; if (yych <= 'N') goto yy165; - goto yy1523; + goto yy1463; } } else { if (yych <= 'h') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1536; + if (yych <= 'a') goto yy1476; goto yy170; } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1537; + if (yych <= 'i') goto yy1477; goto yy170; } else { - if (yych <= 'o') goto yy1538; + if (yych <= 'o') goto yy1478; if (yych <= 'z') goto yy170; goto yy3; } @@ -1117,24 +1117,24 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1521; + goto yy1461; } else { - if (yych == 'I') goto yy1522; + if (yych == 'I') goto yy1462; if (yych <= 'N') goto yy165; - goto yy1523; + goto yy1463; } } else { if (yych <= 'h') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1521; + if (yych <= 'a') goto yy1461; goto yy165; } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1522; + if (yych <= 'i') goto yy1462; goto yy165; } else { - if (yych <= 'o') goto yy1523; + if (yych <= 'o') goto yy1463; if (yych <= 'z') goto yy165; goto yy3; } @@ -1146,15 +1146,15 @@ switch (yych) { case ')': goto yy164; case '0': - case '1': goto yy1451; - case '2': goto yy1452; + case '1': goto yy1391; + case '2': goto yy1392; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1453; + case '9': goto yy1393; case 'A': case 'B': case 'C': @@ -1176,11 +1176,11 @@ case 'X': case 'Y': case 'Z': goto yy165; - case 'E': goto yy1446; - case 'H': goto yy1447; - case 'O': goto yy1448; - case 'U': goto yy1449; - case 'W': goto yy1450; + case 'E': goto yy1386; + case 'H': goto yy1387; + case 'O': goto yy1388; + case 'U': goto yy1389; + case 'W': goto yy1390; case 'a': case 'b': case 'c': @@ -1202,11 +1202,11 @@ case 'x': case 'y': case 'z': goto yy170; - case 'e': goto yy1489; - case 'h': goto yy1490; - case 'o': goto yy1491; - case 'u': goto yy1492; - case 'w': goto yy1493; + case 'e': goto yy1429; + case 'h': goto yy1430; + case 'o': goto yy1431; + case 'u': goto yy1432; + case 'w': goto yy1433; default: goto yy3; } yy10: @@ -1215,15 +1215,15 @@ switch (yych) { case ')': goto yy164; case '0': - case '1': goto yy1451; - case '2': goto yy1452; + case '1': goto yy1391; + case '2': goto yy1392; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1453; + case '9': goto yy1393; case 'A': case 'B': case 'C': @@ -1267,23 +1267,23 @@ case 'y': case 'z': goto yy165; case 'E': - case 'e': goto yy1446; + case 'e': goto yy1386; case 'H': - case 'h': goto yy1447; + case 'h': goto yy1387; case 'O': - case 'o': goto yy1448; + case 'o': goto yy1388; case 'U': - case 'u': goto yy1449; + case 'u': goto yy1389; case 'W': - case 'w': goto yy1450; + case 'w': goto yy1390; default: goto yy3; } yy11: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy1434; + if (yych == '-') goto yy1374; if (yych <= '/') goto yy12; - if (yych <= '9') goto yy1435; + if (yych <= '9') goto yy1375; yy12: { add_error(s, "Unexpected character"); @@ -1299,16 +1299,16 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy165; - goto yy1370; + goto yy1310; } } else { if (yych <= 'N') { - if (yych == 'I') goto yy1371; + if (yych == 'I') goto yy1311; goto yy165; } else { - if (yych <= 'O') goto yy1372; + if (yych <= 'O') goto yy1312; if (yych <= 'Q') goto yy165; - goto yy1373; + goto yy1313; } } } else { @@ -1318,16 +1318,16 @@ if (yych <= '`') goto yy3; goto yy170; } else { - if (yych <= 'e') goto yy1411; + if (yych <= 'e') goto yy1351; if (yych <= 'h') goto yy170; - goto yy1412; + goto yy1352; } } else { if (yych <= 'q') { - if (yych == 'o') goto yy1413; + if (yych == 'o') goto yy1353; goto yy170; } else { - if (yych <= 'r') goto yy1414; + if (yych <= 'r') goto yy1354; if (yych <= 'z') goto yy170; goto yy3; } @@ -1343,16 +1343,16 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy165; - goto yy1370; + goto yy1310; } } else { if (yych <= 'N') { - if (yych == 'I') goto yy1371; + if (yych == 'I') goto yy1311; goto yy165; } else { - if (yych <= 'O') goto yy1372; + if (yych <= 'O') goto yy1312; if (yych <= 'Q') goto yy165; - goto yy1373; + goto yy1313; } } } else { @@ -1362,16 +1362,16 @@ if (yych <= '`') goto yy3; goto yy165; } else { - if (yych <= 'e') goto yy1370; + if (yych <= 'e') goto yy1310; if (yych <= 'h') goto yy165; - goto yy1371; + goto yy1311; } } else { if (yych <= 'q') { - if (yych == 'o') goto yy1372; + if (yych == 'o') goto yy1312; goto yy165; } else { - if (yych <= 'r') goto yy1373; + if (yych <= 'r') goto yy1313; if (yych <= 'z') goto yy165; goto yy3; } @@ -1382,13 +1382,13 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1356; + goto yy1296; } else { if (yych <= '`') { if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1367; + if (yych <= 'a') goto yy1307; if (yych <= 'z') goto yy170; goto yy3; } @@ -1398,13 +1398,13 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1356; + goto yy1296; } else { if (yych <= '`') { if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1356; + if (yych <= 'a') goto yy1296; if (yych <= 'z') goto yy165; goto yy3; } @@ -1414,13 +1414,13 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1336; + goto yy1276; } else { if (yych <= '`') { if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1353; + if (yych <= 'a') goto yy1293; if (yych <= 'z') goto yy170; goto yy3; } @@ -1430,13 +1430,13 @@ if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1336; + goto yy1276; } else { if (yych <= '`') { if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1336; + if (yych <= 'a') goto yy1276; if (yych <= 'z') goto yy165; goto yy3; } @@ -1450,17 +1450,17 @@ goto yy164; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy1279; + if (yych <= 'A') goto yy1219; goto yy165; } } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1278; + if (yych <= 'E') goto yy1218; goto yy165; } else { - if (yych <= 'I') goto yy1280; + if (yych <= 'I') goto yy1220; if (yych <= 'T') goto yy165; - goto yy1281; + goto yy1221; } } } else { @@ -1469,16 +1469,16 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1308; + if (yych <= 'a') goto yy1248; if (yych <= 'd') goto yy170; - goto yy1307; + goto yy1247; } } else { if (yych <= 't') { - if (yych == 'i') goto yy1309; + if (yych == 'i') goto yy1249; goto yy170; } else { - if (yych <= 'u') goto yy1310; + if (yych <= 'u') goto yy1250; if (yych <= 'z') goto yy170; goto yy3; } @@ -1493,17 +1493,17 @@ goto yy164; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy1279; + if (yych <= 'A') goto yy1219; goto yy165; } } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1278; + if (yych <= 'E') goto yy1218; goto yy165; } else { - if (yych <= 'I') goto yy1280; + if (yych <= 'I') goto yy1220; if (yych <= 'T') goto yy165; - goto yy1281; + goto yy1221; } } } else { @@ -1512,16 +1512,16 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych <= 'a') goto yy1279; + if (yych <= 'a') goto yy1219; if (yych <= 'd') goto yy165; - goto yy1278; + goto yy1218; } } else { if (yych <= 't') { - if (yych == 'i') goto yy1280; + if (yych == 'i') goto yy1220; goto yy165; } else { - if (yych <= 'u') goto yy1281; + if (yych <= 'u') goto yy1221; if (yych <= 'z') goto yy165; goto yy3; } @@ -1534,18 +1534,18 @@ if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'I') goto yy1248; + if (yych == 'I') goto yy1188; if (yych <= 'K') goto yy165; - goto yy1249; + goto yy1189; } } else { if (yych <= 'i') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; if (yych <= 'h') goto yy170; - goto yy1266; + goto yy1206; } else { - if (yych == 'l') goto yy1267; + if (yych == 'l') goto yy1207; if (yych <= 'z') goto yy170; goto yy3; } @@ -1557,18 +1557,18 @@ if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'I') goto yy1248; + if (yych == 'I') goto yy1188; if (yych <= 'K') goto yy165; - goto yy1249; + goto yy1189; } } else { if (yych <= 'i') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; if (yych <= 'h') goto yy165; - goto yy1248; + goto yy1188; } else { - if (yych == 'l') goto yy1249; + if (yych == 'l') goto yy1189; if (yych <= 'z') goto yy165; goto yy3; } @@ -1582,7 +1582,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'Q') goto yy165; - goto yy1122; + goto yy1062; } } else { if (yych <= 'q') { @@ -1590,7 +1590,7 @@ if (yych <= '`') goto yy3; goto yy170; } else { - if (yych <= 'r') goto yy1241; + if (yych <= 'r') goto yy1181; if (yych <= 'z') goto yy170; goto yy3; } @@ -1604,7 +1604,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'Q') goto yy165; - goto yy1122; + goto yy1062; } } else { if (yych <= 'q') { @@ -1612,7 +1612,7 @@ if (yych <= '`') goto yy3; goto yy165; } else { - if (yych <= 'r') goto yy1122; + if (yych <= 'r') goto yy1062; if (yych <= 'z') goto yy165; goto yy3; } @@ -1624,42 +1624,42 @@ if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1076; + if (yych == '\t') goto yy1016; goto yy12; } else { - if (yych <= ' ') goto yy1078; + if (yych <= ' ') goto yy1018; if (yych <= ',') goto yy12; - goto yy497; + goto yy437; } } else { if (yych <= '0') { - if (yych <= '.') goto yy1088; - if (yych <= '/') goto yy496; - goto yy1121; + if (yych <= '.') goto yy1028; + if (yych <= '/') goto yy436; + goto yy1061; } else { - if (yych <= '9') goto yy1120; - if (yych <= ':') goto yy1089; + if (yych <= '9') goto yy1060; + if (yych <= ':') goto yy1029; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy1078; + if (yych <= 'A') goto yy1018; if (yych <= 'C') goto yy12; - goto yy1078; + goto yy1018; } else { - if (yych == 'F') goto yy1078; + if (yych == 'F') goto yy1018; goto yy12; } } else { if (yych <= 'O') { - if (yych <= 'J') goto yy1078; + if (yych <= 'J') goto yy1018; if (yych <= 'L') goto yy12; - goto yy1078; + goto yy1018; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy1078; + if (yych <= 'Y') goto yy1018; goto yy12; } } @@ -1668,41 +1668,41 @@ if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy1078; + if (yych <= 'a') goto yy1018; if (yych <= 'c') goto yy12; - goto yy1078; + goto yy1018; } else { - if (yych == 'f') goto yy1078; + if (yych == 'f') goto yy1018; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy1078; + goto yy1018; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy1078; - goto yy494; + if (yych <= 'm') goto yy1018; + goto yy434; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'o') goto yy1078; + if (yych <= 'o') goto yy1018; if (yych <= 'q') goto yy12; - goto yy495; + goto yy435; } else { - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy1078; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy1018; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy1078; + if (yych == 'w') goto yy1018; goto yy12; } else { - if (yych <= 'y') goto yy1078; - if (yych == 0xC2) goto yy1078; + if (yych <= 'y') goto yy1018; + if (yych == 0xC2) goto yy1018; goto yy12; } } @@ -1715,42 +1715,42 @@ if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy484; + if (yych == '\t') goto yy424; goto yy12; } else { - if (yych <= ' ') goto yy486; + if (yych <= ' ') goto yy426; if (yych <= ',') goto yy12; - goto yy497; + goto yy437; } } else { if (yych <= '2') { - if (yych <= '.') goto yy498; - if (yych <= '/') goto yy496; - goto yy1120; + if (yych <= '.') goto yy438; + if (yych <= '/') goto yy436; + goto yy1060; } else { - if (yych <= '9') goto yy1087; - if (yych <= ':') goto yy507; + if (yych <= '9') goto yy1027; + if (yych <= ':') goto yy447; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy486; + if (yych <= 'A') goto yy426; if (yych <= 'C') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'F') goto yy486; + if (yych == 'F') goto yy426; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy486; + if (yych <= 'J') goto yy426; if (yych <= 'L') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy486; + if (yych <= 'Y') goto yy426; goto yy12; } } @@ -1759,41 +1759,41 @@ if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy486; + if (yych <= 'a') goto yy426; if (yych <= 'c') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'f') goto yy486; + if (yych == 'f') goto yy426; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy486; - goto yy494; + if (yych <= 'm') goto yy426; + goto yy434; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy486; + if (yych <= 'p') goto yy426; if (yych <= 'q') goto yy12; - goto yy495; + goto yy435; } else { - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy486; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy426; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy486; + if (yych == 'w') goto yy426; goto yy12; } else { - if (yych <= 'y') goto yy486; - if (yych == 0xC2) goto yy486; + if (yych <= 'y') goto yy426; + if (yych == 0xC2) goto yy426; goto yy12; } } @@ -1806,42 +1806,42 @@ if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy484; + if (yych == '\t') goto yy424; goto yy12; } else { - if (yych <= ' ') goto yy486; + if (yych <= ' ') goto yy426; if (yych <= ',') goto yy12; - goto yy497; + goto yy437; } } else { if (yych <= '4') { - if (yych <= '.') goto yy498; - if (yych <= '/') goto yy496; - goto yy1087; + if (yych <= '.') goto yy438; + if (yych <= '/') goto yy436; + goto yy1027; } else { - if (yych <= '9') goto yy1074; - if (yych <= ':') goto yy507; + if (yych <= '9') goto yy1014; + if (yych <= ':') goto yy447; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy486; + if (yych <= 'A') goto yy426; if (yych <= 'C') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'F') goto yy486; + if (yych == 'F') goto yy426; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy486; + if (yych <= 'J') goto yy426; if (yych <= 'L') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy486; + if (yych <= 'Y') goto yy426; goto yy12; } } @@ -1850,41 +1850,41 @@ if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy486; + if (yych <= 'a') goto yy426; if (yych <= 'c') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'f') goto yy486; + if (yych == 'f') goto yy426; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy486; - goto yy494; + if (yych <= 'm') goto yy426; + goto yy434; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy486; + if (yych <= 'p') goto yy426; if (yych <= 'q') goto yy12; - goto yy495; + goto yy435; } else { - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy486; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy426; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy486; + if (yych == 'w') goto yy426; goto yy12; } else { - if (yych <= 'y') goto yy486; - if (yych == 0xC2) goto yy486; + if (yych <= 'y') goto yy426; + if (yych == 0xC2) goto yy426; goto yy12; } } @@ -1897,42 +1897,42 @@ if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy484; + if (yych == '\t') goto yy424; goto yy12; } else { - if (yych <= ' ') goto yy486; + if (yych <= ' ') goto yy426; if (yych <= ',') goto yy12; - goto yy497; + goto yy437; } } else { if (yych <= '1') { - if (yych <= '.') goto yy498; - if (yych <= '/') goto yy496; - goto yy1074; + if (yych <= '.') goto yy438; + if (yych <= '/') goto yy436; + goto yy1014; } else { - if (yych <= '9') goto yy493; - if (yych <= ':') goto yy507; + if (yych <= '9') goto yy433; + if (yych <= ':') goto yy447; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy486; + if (yych <= 'A') goto yy426; if (yych <= 'C') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'F') goto yy486; + if (yych == 'F') goto yy426; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy486; + if (yych <= 'J') goto yy426; if (yych <= 'L') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy486; + if (yych <= 'Y') goto yy426; goto yy12; } } @@ -1941,41 +1941,41 @@ if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy486; + if (yych <= 'a') goto yy426; if (yych <= 'c') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 'f') goto yy486; + if (yych == 'f') goto yy426; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy486; + goto yy426; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy486; - goto yy494; + if (yych <= 'm') goto yy426; + goto yy434; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy486; + if (yych <= 'p') goto yy426; if (yych <= 'q') goto yy12; - goto yy495; + goto yy435; } else { - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy486; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy426; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy486; + if (yych == 'w') goto yy426; goto yy12; } else { - if (yych <= 'y') goto yy486; - if (yych == 0xC2) goto yy486; + if (yych <= 'y') goto yy426; + if (yych == 0xC2) goto yy426; goto yy12; } } @@ -1988,42 +1988,42 @@ if (yych <= 'A') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy484; + if (yych == '\t') goto yy424; goto yy12; } else { - if (yych <= ' ') goto yy486; + if (yych <= ' ') goto yy426; if (yych <= ',') goto yy12; - goto yy497; + goto yy437; } } else { if (yych <= '9') { - if (yych <= '.') goto yy498; - if (yych <= '/') goto yy496; - goto yy493; + if (yych <= '.') goto yy438; + if (yych <= '/') goto yy436; + goto yy433; } else { - if (yych <= ':') goto yy507; + if (yych <= ':') goto yy447; if (yych <= '@') goto yy12; - goto yy486; + goto yy426; } } } else { if (yych <= 'J') { if (yych <= 'E') { - if (yych == 'D') goto yy486; + if (yych == 'D') goto yy426; goto yy12; } else { if (yych == 'G') goto yy12; - goto yy486; + goto yy426; } } else { if (yych <= 'R') { if (yych <= 'L') goto yy12; - if (yych <= 'P') goto yy486; + if (yych <= 'P') goto yy426; goto yy12; } else { - if (yych <= 'Y') goto yy486; + if (yych <= 'Y') goto yy426; if (yych <= '`') goto yy12; - goto yy486; + goto yy426; } } } @@ -2031,38 +2031,38 @@ if (yych <= 'p') { if (yych <= 'h') { if (yych <= 'e') { - if (yych == 'd') goto yy486; + if (yych == 'd') goto yy426; goto yy12; } else { if (yych == 'g') goto yy12; - goto yy486; + goto yy426; } } else { if (yych <= 'l') { - if (yych == 'j') goto yy486; + if (yych == 'j') goto yy426; goto yy12; } else { - if (yych == 'n') goto yy494; - goto yy486; + if (yych == 'n') goto yy434; + goto yy426; } } } else { if (yych <= 'v') { if (yych <= 's') { if (yych <= 'q') goto yy12; - if (yych <= 'r') goto yy495; - goto yy489; + if (yych <= 'r') goto yy435; + goto yy429; } else { - if (yych <= 't') goto yy492; - if (yych <= 'u') goto yy486; + if (yych <= 't') goto yy432; + if (yych <= 'u') goto yy426; goto yy12; } } else { if (yych <= 'y') { if (yych == 'x') goto yy12; - goto yy486; + goto yy426; } else { - if (yych == 0xC2) goto yy486; + if (yych == 0xC2) goto yy426; goto yy12; } } @@ -2076,17 +2076,17 @@ } switch (yych) { case '+': - case '-': goto yy464; + case '-': goto yy404; case '0': - case '1': goto yy461; - case '2': goto yy462; + case '1': goto yy401; + case '2': goto yy402; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy463; + case '9': goto yy403; default: goto yy12; } yy31: @@ -2116,13 +2116,13 @@ if (yych <= '@') goto yy3; goto yy165; } else { - if (yych <= 'I') goto yy460; + if (yych <= 'I') goto yy400; if (yych <= 'U') goto yy165; - goto yy459; + goto yy399; } } else { if (yych <= 'Z') { - if (yych == 'X') goto yy459; + if (yych == 'X') goto yy399; goto yy165; } else { if (yych <= '`') goto yy3; @@ -2152,7 +2152,7 @@ goto yy165; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy456; + if (yych <= 'I') goto yy396; goto yy165; } else { if (yych <= '`') goto yy3; @@ -2182,7 +2182,7 @@ goto yy165; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy454; + if (yych <= 'I') goto yy394; goto yy165; } else { if (yych <= '`') goto yy3; @@ -2198,17 +2198,17 @@ if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'A') goto yy437; + if (yych <= 'A') goto yy377; if (yych <= 'T') goto yy165; - goto yy436; + goto yy376; } } else { if (yych <= 'a') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; - goto yy446; + goto yy386; } else { - if (yych == 'u') goto yy445; + if (yych == 'u') goto yy385; if (yych <= 'z') goto yy170; goto yy3; } @@ -2220,17 +2220,17 @@ if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'A') goto yy437; + if (yych <= 'A') goto yy377; if (yych <= 'T') goto yy165; - goto yy436; + goto yy376; } } else { if (yych <= 'a') { if (yych <= 'Z') goto yy165; if (yych <= '`') goto yy3; - goto yy437; + goto yy377; } else { - if (yych == 'u') goto yy436; + if (yych == 'u') goto yy376; if (yych <= 'z') goto yy165; goto yy3; } @@ -2244,12 +2244,12 @@ goto yy165; } else { if (yych <= 'O') { - if (yych <= 'G') goto yy415; + if (yych <= 'G') goto yy355; goto yy165; } else { - if (yych <= 'P') goto yy414; + if (yych <= 'P') goto yy354; if (yych <= 'T') goto yy165; - goto yy413; + goto yy353; } } } else { @@ -2258,15 +2258,15 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych == 'g') goto yy427; + if (yych == 'g') goto yy367; goto yy170; } } else { if (yych <= 't') { - if (yych <= 'p') goto yy426; + if (yych <= 'p') goto yy366; goto yy170; } else { - if (yych <= 'u') goto yy425; + if (yych <= 'u') goto yy365; if (yych <= 'z') goto yy170; goto yy3; } @@ -2281,12 +2281,12 @@ goto yy165; } else { if (yych <= 'O') { - if (yych <= 'G') goto yy415; + if (yych <= 'G') goto yy355; goto yy165; } else { - if (yych <= 'P') goto yy414; + if (yych <= 'P') goto yy354; if (yych <= 'T') goto yy165; - goto yy413; + goto yy353; } } } else { @@ -2295,15 +2295,15 @@ if (yych <= 'Z') goto yy165; goto yy3; } else { - if (yych == 'g') goto yy415; + if (yych == 'g') goto yy355; goto yy165; } } else { if (yych <= 't') { - if (yych <= 'p') goto yy414; + if (yych <= 'p') goto yy354; goto yy165; } else { - if (yych <= 'u') goto yy413; + if (yych <= 'u') goto yy353; if (yych <= 'z') goto yy165; goto yy3; } @@ -2318,7 +2318,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'B') goto yy165; - goto yy403; + goto yy343; } } else { if (yych <= 'b') { @@ -2326,7 +2326,7 @@ if (yych <= '`') goto yy3; goto yy170; } else { - if (yych <= 'c') goto yy408; + if (yych <= 'c') goto yy348; if (yych <= 'z') goto yy170; goto yy3; } @@ -2340,7 +2340,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'B') goto yy165; - goto yy403; + goto yy343; } } else { if (yych <= 'b') { @@ -2348,7 +2348,7 @@ if (yych <= '`') goto yy3; goto yy165; } else { - if (yych <= 'c') goto yy403; + if (yych <= 'c') goto yy343; if (yych <= 'z') goto yy165; goto yy3; } @@ -2370,7 +2370,7 @@ if (yych <= '`') goto yy3; goto yy170; } else { - if (yych <= 'e') goto yy394; + if (yych <= 'e') goto yy334; if (yych <= 'z') goto yy170; goto yy3; } @@ -2582,7 +2582,7 @@ } yy56: YYCURSOR = YYMARKER; - if (yyaccept <= 17) { + if (yyaccept <= 16) { if (yyaccept <= 8) { if (yyaccept <= 4) { if (yyaccept <= 2) { @@ -2607,113 +2607,109 @@ if (yyaccept == 5) { goto yy218; } else { - goto yy223; + goto yy232; } } else { if (yyaccept == 7) { - goto yy247; + goto yy246; } else { - goto yy319; + goto yy357; } } } } else { - if (yyaccept <= 13) { - if (yyaccept <= 11) { - if (yyaccept <= 10) { - if (yyaccept == 9) { - goto yy417; - } else { - goto yy500; - } + if (yyaccept <= 12) { + if (yyaccept <= 10) { + if (yyaccept == 9) { + goto yy440; } else { - goto yy515; + goto yy455; } } else { - if (yyaccept == 12) { - goto yy636; + if (yyaccept == 11) { + goto yy576; } else { - goto yy681; + goto yy621; } } } else { - if (yyaccept <= 15) { - if (yyaccept == 14) { - goto yy691; + if (yyaccept <= 14) { + if (yyaccept == 13) { + goto yy631; } else { - goto yy788; + goto yy728; } } else { - if (yyaccept == 16) { - goto yy808; + if (yyaccept == 15) { + goto yy748; } else { - goto yy839; + goto yy779; } } } } } else { - if (yyaccept <= 26) { - if (yyaccept <= 22) { - if (yyaccept <= 20) { - if (yyaccept <= 19) { - if (yyaccept == 18) { - goto yy846; + if (yyaccept <= 25) { + if (yyaccept <= 21) { + if (yyaccept <= 19) { + if (yyaccept <= 18) { + if (yyaccept == 17) { + goto yy786; } else { - goto yy873; + goto yy813; } } else { - goto yy818; + goto yy758; } } else { - if (yyaccept == 21) { - goto yy479; + if (yyaccept == 20) { + goto yy419; } else { - goto yy998; + goto yy938; } } } else { - if (yyaccept <= 24) { - if (yyaccept == 23) { - goto yy867; + if (yyaccept <= 23) { + if (yyaccept == 22) { + goto yy807; } else { - goto yy1092; + goto yy1032; } } else { - if (yyaccept == 25) { - goto yy1100; + if (yyaccept == 24) { + goto yy1040; } else { - goto yy1144; + goto yy1084; } } } } else { - if (yyaccept <= 30) { - if (yyaccept <= 28) { - if (yyaccept == 27) { - goto yy1168; + if (yyaccept <= 29) { + if (yyaccept <= 27) { + if (yyaccept == 26) { + goto yy1108; } else { - goto yy1344; + goto yy1284; } } else { - if (yyaccept == 29) { - goto yy1437; + if (yyaccept == 28) { + goto yy1377; } else { - goto yy1475; + goto yy1415; } } } else { - if (yyaccept <= 32) { - if (yyaccept == 31) { - goto yy1478; + if (yyaccept <= 31) { + if (yyaccept == 30) { + goto yy1418; } else { - goto yy1558; + goto yy1498; } } else { - if (yyaccept == 33) { - goto yy1566; + if (yyaccept == 32) { + goto yy1506; } else { - goto yy1589; + goto yy1529; } } } @@ -4218,14 +4214,14 @@ if (yych <= '@') { if (yych <= '9') goto yy220; } else { - if (yych == 'E') goto yy226; + if (yych == 'E') goto yy225; goto yy167; } } else { if (yych <= 'd') { if (yych >= 'a') goto yy167; } else { - if (yych <= 'e') goto yy226; + if (yych <= 'e') goto yy225; if (yych <= 'z') goto yy167; } } @@ -4241,7 +4237,7 @@ } yy219: ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21); + if ((YYLIMIT - YYCURSOR) < 23) YYFILL(23); yych = *YYCURSOR; yy220: if (yybm[0+yych] & 32) { @@ -4249,102 +4245,147 @@ } if (yych <= '/') goto yy56; if (yych <= '2') goto yy222; - if (yych <= '3') goto yy224; - if (yych <= '9') goto yy225; + if (yych <= '3') goto yy223; + if (yych <= '9') goto yy224; goto yy56; yy221: yych = *++YYCURSOR; if (yych <= '/') goto yy220; - if (yych <= '0') goto yy381; - if (yych <= '2') goto yy382; - if (yych <= '3') goto yy383; + if (yych <= '0') goto yy324; + if (yych <= '2') goto yy325; + if (yych <= '3') goto yy326; goto yy220; yy222: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy322; - goto yy323; + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '2') goto yy379; - if (yych <= '9') goto yy380; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy323; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } yy223: - { - int length = 0; - DEBUG_OUTPUT("datetextual | datenoyear"); - TIMELIB_INIT; - TIMELIB_HAVE_DATE(); - s->time->m = timelib_get_month((char **) &ptr); - s->time->d = timelib_get_nr((char **) &ptr, 2); - s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length); - TIMELIB_PROCESS_YEAR(s->time->y, length); - TIMELIB_DEINIT; - return TIMELIB_DATE_TEXT; - } -yy224: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy322; - goto yy323; + yych = *++YYCURSOR; + if (yych <= '1') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '2') goto yy233; - if (yych <= '9') goto yy234; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy323; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= '9') goto yy230; + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy225: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy231; - goto yy232; +yy224: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '2') goto yy233; - if (yych <= '9') goto yy234; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy230; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy226: +yy225: yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { @@ -4360,12 +4401,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'm') goto yy227; + if (yych <= 'm') goto yy226; if (yych <= 'z') goto yy168; goto yy3; } } -yy227: +yy226: yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { @@ -4381,26 +4422,26 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'b') goto yy228; + if (yych <= 'b') goto yy227; if (yych <= 'z') goto yy169; goto yy3; } } -yy228: +yy227: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'E') goto yy229; + if (yych <= 'E') goto yy228; if (yych != 'e') goto yy3; } -yy229: +yy228: yych = *++YYCURSOR; - if (yych == 'R') goto yy230; + if (yych == 'R') goto yy229; if (yych != 'r') goto yy56; -yy230: +yy229: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { @@ -4417,129 +4458,141 @@ goto yy218; } } -yy231: +yy230: yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy245; - goto yy56; - } else { - if (yych <= '0') goto yy320; - if (yych <= '9') goto yy321; - if (yych <= ':') goto yy245; - goto yy56; - } + if (yych <= '/') goto yy56; + if (yych <= '9') goto yy320; + goto yy56; +yy231: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == 't') goto yy319; + goto yy237; yy232: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '2') goto yy321; - if (yych <= '9') goto yy320; - if (yych <= ':') goto yy288; - goto yy56; + { + int length = 0; + DEBUG_OUTPUT("datetextual | datenoyear"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->m = timelib_get_month((char **) &ptr); + s->time->d = timelib_get_nr((char **) &ptr, 2); + s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length); + TIMELIB_PROCESS_YEAR(s->time->y, length); + TIMELIB_DEINIT; + return TIMELIB_DATE_TEXT; } yy233: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '4') goto yy320; - if (yych <= '9') goto yy317; - if (yych <= ':') goto yy288; - goto yy56; - } -yy234: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '9') goto yy317; - if (yych <= ':') goto yy288; - goto yy56; - } -yy235: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy240; -yy236: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - goto yy240; -yy237: + if (yych == 'd') goto yy319; + goto yy237; +yy234: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy240; -yy238: + if (yych == 'd') goto yy319; + goto yy237; +yy235: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy240; -yy239: + if (yych == 'h') goto yy319; + goto yy237; +yy236: yyaccept = 6; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 18) YYFILL(18); yych = *YYCURSOR; -yy240: +yy237: if (yybm[0+yych] & 64) { - goto yy239; + goto yy236; } if (yych <= '2') { - if (yych <= '/') goto yy223; - if (yych <= '0') goto yy283; - if (yych <= '1') goto yy284; - goto yy285; + if (yych <= '/') goto yy232; + if (yych <= '0') goto yy310; + if (yych <= '1') goto yy311; + goto yy312; + } else { + if (yych <= '9') goto yy313; + if (yych == 'T') goto yy239; + goto yy232; + } +yy238: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '9') { + if (yych <= '0') { + if (yych <= '/') goto yy232; + goto yy240; + } else { + if (yych <= '1') goto yy241; + if (yych <= '2') goto yy242; + goto yy243; + } } else { - if (yych <= '9') goto yy286; - if (yych != 'T') goto yy223; + if (yych <= 'T') { + if (yych <= 'S') goto yy232; + } else { + if (yych != 't') goto yy232; + } } +yy239: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy242; - if (yych <= '2') goto yy243; - if (yych <= '9') goto yy244; + if (yych <= '1') goto yy308; + if (yych <= '2') goto yy309; + if (yych <= '9') goto yy298; goto yy56; -yy242: +yy240: yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy245; + if (yych == '.') goto yy299; goto yy56; } else { - if (yych <= '9') goto yy244; - if (yych <= ':') goto yy245; + if (yych <= '0') goto yy298; + if (yych <= '9') goto yy243; + if (yych <= ':') goto yy299; goto yy56; } -yy243: +yy241: yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy245; + if (yych == '.') goto yy244; goto yy56; } else { - if (yych <= '4') goto yy244; - if (yych == ':') goto yy245; + if (yych <= '2') goto yy243; + if (yych <= '9') goto yy298; + if (yych <= ':') goto yy244; goto yy56; } -yy244: +yy242: + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych == '.') goto yy244; + goto yy56; + } else { + if (yych <= '4') goto yy298; + if (yych == ':') goto yy244; + goto yy56; + } +yy243: yych = *++YYCURSOR; - if (yych == '.') goto yy245; + if (yych == '.') goto yy244; if (yych != ':') goto yy56; -yy245: +yy244: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy246; - if (yych <= '9') goto yy248; + if (yych <= '5') goto yy245; + if (yych <= '9') goto yy247; goto yy56; -yy246: +yy245: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy249; + if (yych == '.') goto yy248; } else { - if (yych <= '9') goto yy248; - if (yych <= ':') goto yy249; + if (yych <= '9') goto yy291; + if (yych <= ':') goto yy248; } -yy247: +yy246: { int tz_not_found; DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); @@ -4568,830 +4621,855 @@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -yy248: +yy247: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy249; - if (yych != ':') goto yy247; -yy249: + if (yych == '.') goto yy248; + if (yych != ':') goto yy246; +yy248: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy250; - if (yych <= '6') goto yy251; - if (yych <= '9') goto yy252; + if (yych <= '5') goto yy249; + if (yych <= '6') goto yy250; + if (yych <= '9') goto yy251; goto yy56; +yy249: + yych = *++YYCURSOR; + if (yych <= '/') goto yy246; + if (yych <= '9') goto yy252; + goto yy246; yy250: yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '9') goto yy253; - goto yy247; + if (yych == '0') goto yy252; + goto yy246; yy251: yych = *++YYCURSOR; - if (yych == '0') goto yy253; - goto yy247; + goto yy246; yy252: - yych = *++YYCURSOR; - goto yy247; -yy253: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '*') { if (yych <= 0x1F) { - if (yych == '\t') goto yy255; - goto yy247; + if (yych == '\t') goto yy254; + goto yy246; } else { - if (yych <= ' ') goto yy255; - if (yych == '(') goto yy255; - goto yy247; + if (yych <= ' ') goto yy254; + if (yych == '(') goto yy254; + goto yy246; } } else { if (yych <= '@') { - if (yych == ',') goto yy247; - if (yych <= '-') goto yy255; - goto yy247; - } else { - if (yych <= 'Z') goto yy255; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy255; - goto yy247; + if (yych == ',') goto yy246; + if (yych <= '-') goto yy254; + goto yy246; + } else { + if (yych <= 'Z') goto yy254; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy254; + goto yy246; } } -yy254: +yy253: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; -yy255: - if (yych <= '+') { - if (yych <= ' ') { - if (yych == '\t') goto yy254; - if (yych <= 0x1F) goto yy56; - goto yy254; +yy254: + if (yych <= '@') { + if (yych <= '\'') { + if (yych <= '\t') { + if (yych <= 0x08) goto yy56; + goto yy253; + } else { + if (yych == ' ') goto yy253; + goto yy56; + } } else { - if (yych == '(') goto yy258; - if (yych <= '*') goto yy56; - goto yy257; + if (yych <= '+') { + if (yych <= '(') goto yy257; + if (yych <= '*') goto yy56; + goto yy256; + } else { + if (yych == '-') goto yy256; + goto yy56; + } } } else { - if (yych <= 'F') { - if (yych == '-') goto yy257; - if (yych <= '@') goto yy56; - goto yy259; - } else { - if (yych <= 'Z') { - if (yych >= 'H') goto yy259; + if (yych <= 'Z') { + if (yych <= 'G') { + if (yych <= 'A') goto yy258; + if (yych <= 'F') goto yy259; } else { + if (yych == 'P') goto yy258; + goto yy259; + } + } else { + if (yych <= 'o') { if (yych <= '`') goto yy56; - if (yych <= 'z') goto yy260; + if (yych <= 'a') goto yy260; + goto yy261; + } else { + if (yych <= 'p') goto yy260; + if (yych <= 'z') goto yy261; goto yy56; } } } -yy256: +yy255: yych = *++YYCURSOR; if (yych <= 'L') { - if (yych == ')') goto yy252; - if (yych <= '@') goto yy247; - goto yy261; + if (yych == ')') goto yy251; + if (yych <= '@') goto yy246; + goto yy262; } else { if (yych <= 'Z') { - if (yych <= 'M') goto yy281; - goto yy261; + if (yych <= 'M') goto yy289; + goto yy262; } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy266; - goto yy247; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy273; + goto yy246; } } -yy257: +yy256: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy276; - if (yych <= '2') goto yy277; - if (yych <= '9') goto yy278; + if (yych <= '1') goto yy284; + if (yych <= '2') goto yy285; + if (yych <= '9') goto yy286; goto yy56; -yy258: +yy257: yych = *++YYCURSOR; if (yych <= '@') goto yy56; - if (yych <= 'Z') goto yy260; + if (yych <= 'Z') goto yy261; if (yych <= '`') goto yy56; - if (yych <= 'z') goto yy260; + if (yych <= 'z') goto yy261; goto yy56; +yy258: + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'L') { + if (yych <= '-') { + if (yych == ')') goto yy251; + goto yy246; + } else { + if (yych <= '.') goto yy267; + if (yych <= '@') goto yy246; + goto yy262; + } + } else { + if (yych <= '`') { + if (yych <= 'M') goto yy268; + if (yych <= 'Z') goto yy262; + goto yy246; + } else { + if (yych == 'm') goto yy283; + if (yych <= 'z') goto yy273; + goto yy246; + } + } yy259: yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { - if (yych <= 'Z') goto yy261; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy266; - goto yy247; + if (yych <= 'Z') goto yy262; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy273; + goto yy246; } yy260: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'L') { + if (yych <= '-') { + if (yych == ')') goto yy251; + goto yy246; + } else { + if (yych <= '.') goto yy267; + if (yych <= '@') goto yy246; + goto yy262; + } } else { - if (yych <= 'Z') goto yy261; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') { + if (yych <= 'M') goto yy268; + if (yych <= 'Z') goto yy262; + goto yy246; + } else { + if (yych == 'm') goto yy268; + if (yych <= 'z') goto yy262; + goto yy246; + } } yy261: yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { if (yych <= 'Z') goto yy262; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } yy262: yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { if (yych <= 'Z') goto yy263; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } yy263: yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { if (yych <= 'Z') goto yy264; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } yy264: yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { if (yych <= 'Z') goto yy265; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } yy265: yych = *++YYCURSOR; - if (yych == ')') goto yy252; - goto yy247; + if (yych <= '@') { + if (yych == ')') goto yy251; + goto yy246; + } else { + if (yych <= 'Z') goto yy266; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; + } yy266: + yych = *++YYCURSOR; + if (yych == ')') goto yy251; + goto yy246; +yy267: + yych = *++YYCURSOR; + if (yych == 'M') goto yy272; + if (yych == 'm') goto yy272; + goto yy56; +yy268: + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ')') { + if (yych <= '\t') { + if (yych <= 0x00) goto yy270; + if (yych <= 0x08) goto yy246; + goto yy270; + } else { + if (yych == ' ') goto yy270; + if (yych <= '(') goto yy246; + goto yy251; + } + } else { + if (yych <= '@') { + if (yych != '.') goto yy246; + } else { + if (yych <= 'Z') goto yy263; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy263; + goto yy246; + } + } +yy269: + yych = *++YYCURSOR; + if (yych <= '\t') { + if (yych <= 0x00) goto yy270; + if (yych <= 0x08) goto yy56; + } else { + if (yych != ' ') goto yy56; + } +yy270: + ++YYCURSOR; + { + DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->m = timelib_get_month((char **) &ptr); + s->time->d = timelib_get_nr((char **) &ptr, 2); + + TIMELIB_HAVE_TIME(); + s->time->h = timelib_get_nr((char **) &ptr, 2); + s->time->i = timelib_get_nr((char **) &ptr, 2); + if (*ptr == ':' || *ptr == '.') { + s->time->s = timelib_get_nr((char **) &ptr, 2); + + if (*ptr == '.') { + s->time->f = timelib_get_frac_nr((char **) &ptr, 8); + } + } + + s->time->h += timelib_meridian((char **) &ptr, s->time->h); + TIMELIB_DEINIT; + return TIMELIB_SHORTDATE_WITH_TIME; + } +yy272: + yych = *++YYCURSOR; + if (yych <= 0x1F) { + if (yych <= 0x00) goto yy270; + if (yych == '\t') goto yy270; + goto yy56; + } else { + if (yych <= ' ') goto yy270; + if (yych == '.') goto yy269; + goto yy56; + } +yy273: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { - if (yych == '.') goto yy247; - goto yy268; + if (yych == '.') goto yy246; + goto yy275; } } else { if (yych <= '^') { - if (yych <= '@') goto yy247; - if (yych <= 'Z') goto yy262; - goto yy247; + if (yych <= '@') goto yy246; + if (yych <= 'Z') goto yy263; + goto yy246; } else { - if (yych <= '_') goto yy268; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '_') goto yy275; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } } -yy267: +yy274: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { - if (yych == '.') goto yy247; + if (yych == '.') goto yy246; } } else { if (yych <= '^') { - if (yych <= '@') goto yy247; - if (yych <= 'Z') goto yy263; - goto yy247; + if (yych <= '@') goto yy246; + if (yych <= 'Z') goto yy264; + goto yy246; } else { - if (yych <= '_') goto yy268; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy271; - goto yy247; + if (yych <= '_') goto yy275; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy278; + goto yy246; } } -yy268: +yy275: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '@') goto yy56; - if (yych <= 'Z') goto yy269; + if (yych <= 'Z') goto yy276; if (yych <= '`') goto yy56; if (yych >= '{') goto yy56; -yy269: +yy276: yyaccept = 7; YYMARKER = ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '@') { if (yych <= '-') { - if (yych <= ',') goto yy247; - goto yy268; + if (yych <= ',') goto yy246; + goto yy275; } else { - if (yych == '/') goto yy268; - goto yy247; + if (yych == '/') goto yy275; + goto yy246; } } else { if (yych <= '_') { - if (yych <= 'Z') goto yy269; - if (yych <= '^') goto yy247; - goto yy268; + if (yych <= 'Z') goto yy276; + if (yych <= '^') goto yy246; + goto yy275; } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy269; - goto yy247; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy276; + goto yy246; } } -yy271: +yy278: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { - if (yych == '.') goto yy247; - goto yy268; + if (yych == '.') goto yy246; + goto yy275; } } else { if (yych <= '^') { - if (yych <= '@') goto yy247; - if (yych <= 'Z') goto yy264; - goto yy247; + if (yych <= '@') goto yy246; + if (yych <= 'Z') goto yy265; + goto yy246; } else { - if (yych <= '_') goto yy268; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '_') goto yy275; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } } yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy252; - goto yy247; + if (yych == ')') goto yy251; + goto yy246; } else { - if (yych == '.') goto yy247; - goto yy268; + if (yych == '.') goto yy246; + goto yy275; } } else { if (yych <= '^') { - if (yych <= '@') goto yy247; - if (yych <= 'Z') goto yy265; - goto yy247; - } else { - if (yych <= '_') goto yy268; - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '@') goto yy246; + if (yych <= 'Z') goto yy266; + goto yy246; + } else { + if (yych <= '_') goto yy275; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } } yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ')') { - if (yych <= '(') goto yy247; - goto yy252; + if (yych <= '(') goto yy246; + goto yy251; } else { - if (yych == '-') goto yy268; - goto yy247; + if (yych == '-') goto yy275; + goto yy246; } } else { if (yych <= '_') { - if (yych <= '/') goto yy268; - if (yych <= '^') goto yy247; - goto yy268; + if (yych <= '/') goto yy275; + if (yych <= '^') goto yy246; + goto yy275; } else { - if (yych <= '`') goto yy247; - if (yych >= '{') goto yy247; + if (yych <= '`') goto yy246; + if (yych >= '{') goto yy246; } } -yy274: +yy281: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '/') { - if (yych == '-') goto yy268; + if (yych == '-') goto yy275; if (yych <= '.') goto yy56; - goto yy268; + goto yy275; } else { if (yych <= '_') { if (yych <= '^') goto yy56; - goto yy268; + goto yy275; } else { if (yych <= '`') goto yy56; - if (yych <= 'z') goto yy274; + if (yych <= 'z') goto yy281; goto yy56; } } -yy276: +yy283: + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '-') { + if (yych <= 0x1F) { + if (yych <= 0x00) goto yy270; + if (yych == '\t') goto yy270; + goto yy246; + } else { + if (yych <= '(') { + if (yych <= ' ') goto yy270; + goto yy246; + } else { + if (yych <= ')') goto yy251; + if (yych <= ',') goto yy246; + goto yy275; + } + } + } else { + if (yych <= 'Z') { + if (yych <= '.') goto yy269; + if (yych <= '/') goto yy275; + if (yych <= '@') goto yy246; + goto yy263; + } else { + if (yych <= '_') { + if (yych <= '^') goto yy246; + goto yy275; + } else { + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy274; + goto yy246; + } + } + } +yy284: yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '9') goto yy278; - if (yych <= ':') goto yy279; - goto yy247; -yy277: + if (yych <= '/') goto yy246; + if (yych <= '9') goto yy286; + if (yych <= ':') goto yy287; + goto yy246; +yy285: yych = *++YYCURSOR; if (yych <= '5') { - if (yych <= '/') goto yy247; - if (yych >= '5') goto yy280; + if (yych <= '/') goto yy246; + if (yych >= '5') goto yy288; } else { - if (yych <= '9') goto yy252; - if (yych <= ':') goto yy279; - goto yy247; + if (yych <= '9') goto yy251; + if (yych <= ':') goto yy287; + goto yy246; } -yy278: +yy286: yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '5') goto yy280; - if (yych <= '9') goto yy252; - if (yych >= ';') goto yy247; -yy279: + if (yych <= '/') goto yy246; + if (yych <= '5') goto yy288; + if (yych <= '9') goto yy251; + if (yych >= ';') goto yy246; +yy287: yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '5') goto yy280; - if (yych <= '9') goto yy252; - goto yy247; -yy280: + if (yych <= '/') goto yy246; + if (yych <= '5') goto yy288; + if (yych <= '9') goto yy251; + goto yy246; +yy288: yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '9') goto yy252; - goto yy247; -yy281: + if (yych <= '/') goto yy246; + if (yych <= '9') goto yy251; + goto yy246; +yy289: yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == ')') goto yy252; - if (yych <= '@') goto yy247; - goto yy262; + if (yych == ')') goto yy251; + if (yych <= '@') goto yy246; + goto yy263; } else { if (yych <= 'Z') { - if (yych >= 'U') goto yy262; + if (yych >= 'U') goto yy263; } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy262; - goto yy247; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy263; + goto yy246; } } yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= ')') { - if (yych <= '(') goto yy247; - goto yy252; + if (yych <= '(') goto yy246; + goto yy251; } else { - if (yych == '+') goto yy257; - goto yy247; + if (yych == '+') goto yy256; + goto yy246; } } else { if (yych <= 'Z') { - if (yych <= '-') goto yy257; - if (yych <= '@') goto yy247; - goto yy263; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy263; - goto yy247; + if (yych <= '-') goto yy256; + if (yych <= '@') goto yy246; + goto yy264; + } else { + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy264; + goto yy246; } } -yy283: - yyaccept = 6; +yy291: + yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy245; - goto yy223; + if (yych <= ':') { + if (yych <= ' ') { + if (yych == '\t') goto yy292; + if (yych <= 0x1F) goto yy246; + } else { + if (yych == '.') goto yy248; + if (yych <= '9') goto yy246; + goto yy248; + } } else { - if (yych <= '0') goto yy315; - if (yych <= '9') goto yy316; - if (yych <= ':') goto yy245; - goto yy223; + if (yych <= 'P') { + if (yych == 'A') goto yy294; + if (yych <= 'O') goto yy246; + goto yy294; + } else { + if (yych <= 'a') { + if (yych <= '`') goto yy246; + goto yy294; + } else { + if (yych == 'p') goto yy294; + goto yy246; + } + } } -yy284: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy223; +yy292: + ++YYCURSOR; + if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); + yych = *YYCURSOR; + if (yych <= 'A') { + if (yych <= 0x1F) { + if (yych == '\t') goto yy292; + goto yy56; + } else { + if (yych <= ' ') goto yy292; + if (yych <= '@') goto yy56; + } } else { - if (yych <= '2') goto yy316; - if (yych <= '9') goto yy315; - if (yych <= ':') goto yy288; - goto yy223; + if (yych <= '`') { + if (yych != 'P') goto yy56; + } else { + if (yych <= 'a') goto yy294; + if (yych != 'p') goto yy56; + } } -yy285: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy223; +yy294: + yych = *++YYCURSOR; + if (yych <= 'L') { + if (yych != '.') goto yy56; } else { - if (yych <= '4') goto yy315; - if (yych <= '9') goto yy287; - if (yych <= ':') goto yy288; - goto yy223; + if (yych <= 'M') goto yy296; + if (yych == 'm') goto yy296; + goto yy56; } -yy286: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy223; + yych = *++YYCURSOR; + if (yych == 'M') goto yy296; + if (yych != 'm') goto yy56; +yy296: + yych = *++YYCURSOR; + if (yych <= 0x1F) { + if (yych <= 0x00) goto yy270; + if (yych == '\t') goto yy270; + goto yy56; } else { - if (yych <= '9') goto yy287; - if (yych <= ':') goto yy288; - goto yy223; + if (yych <= ' ') goto yy270; + if (yych != '.') goto yy56; } -yy287: yych = *++YYCURSOR; - if (yych <= '/') goto yy223; - if (yych <= '9') goto yy313; - goto yy223; -yy288: + if (yych <= '\t') { + if (yych <= 0x00) goto yy270; + if (yych <= 0x08) goto yy56; + goto yy270; + } else { + if (yych == ' ') goto yy270; + goto yy56; + } +yy298: + yych = *++YYCURSOR; + if (yych == '.') goto yy299; + if (yych != ':') goto yy56; +yy299: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy289; - if (yych <= '9') goto yy290; + if (yych <= '5') goto yy300; + if (yych <= '9') goto yy301; goto yy56; -yy289: +yy300: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy291; - goto yy247; + if (yych == '.') goto yy302; + goto yy246; } else { - if (yych <= '9') goto yy306; - if (yych <= ':') goto yy291; - goto yy247; + if (yych <= '9') goto yy301; + if (yych <= ':') goto yy302; + goto yy246; } -yy290: +yy301: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy291; - if (yych != ':') goto yy247; -yy291: + if (yych == '.') goto yy302; + if (yych != ':') goto yy246; +yy302: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy292; - if (yych <= '6') goto yy293; - if (yych <= '9') goto yy252; - goto yy56; -yy292: - yych = *++YYCURSOR; - if (yych <= '/') goto yy247; - if (yych <= '9') goto yy294; - goto yy247; -yy293: + if (yych <= '5') goto yy303; + if (yych <= '6') goto yy304; + if (yych <= '9') goto yy251; + goto yy56; +yy303: + yych = *++YYCURSOR; + if (yych <= '/') goto yy246; + if (yych <= '9') goto yy305; + goto yy246; +yy304: yych = *++YYCURSOR; - if (yych != '0') goto yy247; -yy294: + if (yych != '0') goto yy246; +yy305: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '*') { if (yych <= 0x1F) { - if (yych == '\t') goto yy296; - goto yy247; + if (yych == '\t') goto yy307; + goto yy246; } else { - if (yych <= ' ') goto yy296; - if (yych == '(') goto yy296; - goto yy247; + if (yych <= ' ') goto yy307; + if (yych == '(') goto yy307; + goto yy246; } } else { if (yych <= '@') { - if (yych == ',') goto yy247; - if (yych <= '-') goto yy296; - goto yy247; - } else { - if (yych <= 'Z') goto yy296; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy296; - goto yy247; + if (yych == ',') goto yy246; + if (yych <= '-') goto yy307; + goto yy246; + } else { + if (yych <= 'Z') goto yy307; + if (yych <= '`') goto yy246; + if (yych <= 'z') goto yy307; + goto yy246; } } -yy295: +yy306: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; -yy296: - if (yych <= '@') { - if (yych <= '\'') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy56; - goto yy295; - } else { - if (yych == ' ') goto yy295; - goto yy56; - } +yy307: + if (yych <= '+') { + if (yych <= ' ') { + if (yych == '\t') goto yy306; + if (yych <= 0x1F) goto yy56; + goto yy306; } else { - if (yych <= '+') { - if (yych <= '(') goto yy258; - if (yych <= '*') goto yy56; - goto yy257; - } else { - if (yych == '-') goto yy257; - goto yy56; - } + if (yych == '(') goto yy257; + if (yych <= '*') goto yy56; + goto yy256; } } else { - if (yych <= 'Z') { - if (yych <= 'G') { - if (yych <= 'A') goto yy297; - if (yych <= 'F') goto yy259; - goto yy256; - } else { - if (yych != 'P') goto yy259; - } + if (yych <= 'F') { + if (yych == '-') goto yy256; + if (yych <= '@') goto yy56; + goto yy259; } else { - if (yych <= 'o') { - if (yych <= '`') goto yy56; - if (yych <= 'a') goto yy298; - goto yy260; + if (yych <= 'Z') { + if (yych <= 'G') goto yy255; + goto yy259; } else { - if (yych <= 'p') goto yy298; - if (yych <= 'z') goto yy260; + if (yych <= '`') goto yy56; + if (yych <= 'z') goto yy261; goto yy56; } } } -yy297: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy299; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy300; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy305; - if (yych <= 'z') goto yy266; - goto yy247; - } - } -yy298: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy299; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy300; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy300; - if (yych <= 'z') goto yy261; - goto yy247; - } - } -yy299: - yych = *++YYCURSOR; - if (yych == 'M') goto yy304; - if (yych == 'm') goto yy304; - goto yy56; -yy300: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy247; - goto yy302; - } else { - if (yych == ' ') goto yy302; - if (yych <= '(') goto yy247; - goto yy252; - } - } else { - if (yych <= '@') { - if (yych != '.') goto yy247; - } else { - if (yych <= 'Z') goto yy262; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy262; - goto yy247; - } - } -yy301: +yy308: yych = *++YYCURSOR; - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy56; + if (yych <= '/') { + if (yych == '.') goto yy299; + goto yy56; } else { - if (yych != ' ') goto yy56; - } -yy302: - ++YYCURSOR; - { - DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); - TIMELIB_INIT; - TIMELIB_HAVE_DATE(); - s->time->m = timelib_get_month((char **) &ptr); - s->time->d = timelib_get_nr((char **) &ptr, 2); - - TIMELIB_HAVE_TIME(); - s->time->h = timelib_get_nr((char **) &ptr, 2); - s->time->i = timelib_get_nr((char **) &ptr, 2); - if (*ptr == ':' || *ptr == '.') { - s->time->s = timelib_get_nr((char **) &ptr, 2); - - if (*ptr == '.') { - s->time->f = timelib_get_frac_nr((char **) &ptr, 8); - } - } - - s->time->h += timelib_meridian((char **) &ptr, s->time->h); - TIMELIB_DEINIT; - return TIMELIB_SHORTDATE_WITH_TIME; + if (yych <= '9') goto yy298; + if (yych <= ':') goto yy299; + goto yy56; } -yy304: +yy309: yych = *++YYCURSOR; - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; + if (yych <= '/') { + if (yych == '.') goto yy299; goto yy56; } else { - if (yych <= ' ') goto yy302; - if (yych == '.') goto yy301; + if (yych <= '4') goto yy298; + if (yych == ':') goto yy299; goto yy56; } -yy305: - yyaccept = 7; +yy310: + yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; - goto yy247; - } else { - if (yych <= '(') { - if (yych <= ' ') goto yy302; - goto yy247; - } else { - if (yych <= ')') goto yy252; - if (yych <= ',') goto yy247; - goto yy268; - } - } + if (yych <= '/') { + if (yych == '.') goto yy299; + goto yy232; } else { - if (yych <= 'Z') { - if (yych <= '.') goto yy301; - if (yych <= '/') goto yy268; - if (yych <= '@') goto yy247; - goto yy262; - } else { - if (yych <= '_') { - if (yych <= '^') goto yy247; - goto yy268; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy267; - goto yy247; - } - } + if (yych <= '0') goto yy317; + if (yych <= '9') goto yy318; + if (yych <= ':') goto yy299; + goto yy232; } -yy306: - yyaccept = 7; +yy311: + yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy307; - if (yych <= 0x1F) goto yy247; - } else { - if (yych == '.') goto yy291; - if (yych <= '9') goto yy247; - goto yy291; - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy309; - if (yych <= 'O') goto yy247; - goto yy309; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy247; - goto yy309; - } else { - if (yych == 'p') goto yy309; - goto yy247; - } - } - } -yy307: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); - yych = *YYCURSOR; - if (yych <= 'A') { - if (yych <= 0x1F) { - if (yych == '\t') goto yy307; - goto yy56; - } else { - if (yych <= ' ') goto yy307; - if (yych <= '@') goto yy56; - } + if (yych <= '/') { + if (yych == '.') goto yy244; + goto yy232; } else { - if (yych <= '`') { - if (yych != 'P') goto yy56; - } else { - if (yych <= 'a') goto yy309; - if (yych != 'p') goto yy56; - } + if (yych <= '2') goto yy318; + if (yych <= '9') goto yy317; + if (yych <= ':') goto yy244; + goto yy232; } -yy309: - yych = *++YYCURSOR; - if (yych <= 'L') { - if (yych != '.') goto yy56; +yy312: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') { + if (yych == '.') goto yy244; + goto yy232; } else { - if (yych <= 'M') goto yy311; - if (yych == 'm') goto yy311; - goto yy56; + if (yych <= '4') goto yy317; + if (yych <= '9') goto yy314; + if (yych <= ':') goto yy244; + goto yy232; } -yy310: - yych = *++YYCURSOR; - if (yych == 'M') goto yy311; - if (yych != 'm') goto yy56; -yy311: - yych = *++YYCURSOR; - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; - goto yy56; +yy313: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') { + if (yych == '.') goto yy244; + goto yy232; } else { - if (yych <= ' ') goto yy302; - if (yych != '.') goto yy56; + if (yych <= '9') goto yy314; + if (yych <= ':') goto yy244; + goto yy232; } -yy312: +yy314: yych = *++YYCURSOR; - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy56; - goto yy302; - } else { - if (yych == ' ') goto yy302; - goto yy56; - } -yy313: + if (yych <= '/') goto yy232; + if (yych >= ':') goto yy232; +yy315: yych = *++YYCURSOR; - if (yych <= '/') goto yy223; - if (yych >= ':') goto yy223; + if (yych <= '/') goto yy232; + if (yych >= ':') goto yy232; yych = *++YYCURSOR; - goto yy223; -yy315: + goto yy232; +yy317: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy245; - goto yy223; + if (yych == '.') goto yy299; + goto yy232; } else { - if (yych <= '9') goto yy313; - if (yych <= ':') goto yy245; - goto yy223; + if (yych <= '9') goto yy315; + if (yych <= ':') goto yy299; + goto yy232; } -yy316: +yy318: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy223; + if (yych == '.') goto yy244; + goto yy232; } else { - if (yych <= '9') goto yy313; - if (yych <= ':') goto yy288; - goto yy223; + if (yych <= '9') goto yy315; + if (yych <= ':') goto yy244; + goto yy232; } -yy317: +yy319: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x00) goto yy238; + goto yy237; +yy320: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy318: ++YYCURSOR; -yy319: { int length = 0; DEBUG_OUTPUT("datenoday"); @@ -5404,1156 +5482,228 @@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -yy320: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy245; - goto yy56; - } else { - if (yych <= '9') goto yy318; - if (yych <= ':') goto yy245; - goto yy56; - } -yy321: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '9') goto yy318; - if (yych <= ':') goto yy288; - goto yy56; - } -yy322: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych == '.') goto yy355; - goto yy240; - } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy245; - if (yych == 'n') goto yy236; - goto yy240; - } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } yy323: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); + yych = *++YYCURSOR; if (yych <= '9') { - if (yych <= '/') { - if (yych != '.') goto yy240; - } else { - if (yych <= '0') goto yy325; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } -yy324: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy330; - goto yy331; - } else { - if (yych <= '2') goto yy332; - if (yych <= '5') goto yy333; - if (yych <= '9') goto yy334; - goto yy240; - } -yy325: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '0') goto yy328; - if (yych <= '9') goto yy329; - if (yych <= ':') goto yy288; - goto yy56; - } -yy326: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '2') goto yy329; - if (yych <= '9') goto yy328; - if (yych <= ':') goto yy288; - goto yy56; - } -yy327: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy288; - goto yy56; - } else { - if (yych <= '4') goto yy328; - if (yych <= '9') goto yy318; - if (yych <= ':') goto yy288; - goto yy56; - } -yy328: - yyaccept = 8; - yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy245; - if (yych == ':') goto yy245; - goto yy319; -yy329: - yyaccept = 8; - yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy288; - if (yych == ':') goto yy288; - goto yy319; -yy330: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy350; - goto yy223; - } else { - if (yych <= '0') goto yy349; - if (yych <= '9') goto yy354; - if (yych <= ':') goto yy350; - goto yy223; - } -yy331: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy335; - goto yy223; - } else { - if (yych <= '2') goto yy354; - if (yych <= '9') goto yy349; - if (yych <= ':') goto yy335; - goto yy223; - } -yy332: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy335; - goto yy223; - } else { - if (yych <= '4') goto yy349; - if (yych <= '9') goto yy348; - if (yych <= ':') goto yy335; - goto yy223; - } -yy333: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy335; - goto yy223; - } else { - if (yych <= '9') goto yy348; - if (yych <= ':') goto yy335; - goto yy223; - } -yy334: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy223; - } else { - if (yych <= '9') goto yy287; - if (yych >= ';') goto yy223; - } -yy335: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy336; - if (yych <= '6') goto yy337; - if (yych <= '9') goto yy290; - goto yy56; -yy336: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy291; - goto yy247; - } else { - if (yych <= '9') goto yy338; - if (yych <= ':') goto yy291; - goto yy247; - } -yy337: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy291; - goto yy247; - } else { - if (yych <= '0') goto yy294; - if (yych == ':') goto yy291; - goto yy247; - } -yy338: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy340; - if (yych <= 0x1F) goto yy247; - goto yy340; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy247; - goto yy340; - } else { - if (yych == '+') goto yy340; - goto yy247; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy340; - if (yych <= '.') goto yy291; - if (yych <= '9') goto yy247; - goto yy291; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy247; - goto yy340; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy340; - goto yy247; - } - } - } -yy339: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); - yych = *YYCURSOR; -yy340: - if (yych <= '@') { - if (yych <= '\'') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy56; - goto yy339; - } else { - if (yych == ' ') goto yy339; - goto yy56; - } - } else { - if (yych <= '+') { - if (yych <= '(') goto yy258; - if (yych <= '*') goto yy56; - goto yy257; - } else { - if (yych == '-') goto yy257; - goto yy56; - } - } - } else { - if (yych <= 'Z') { - if (yych <= 'G') { - if (yych <= 'A') goto yy341; - if (yych <= 'F') goto yy259; - goto yy256; - } else { - if (yych != 'P') goto yy259; - } - } else { - if (yych <= 'o') { - if (yych <= '`') goto yy56; - if (yych <= 'a') goto yy342; - goto yy260; - } else { - if (yych <= 'p') goto yy342; - if (yych <= 'z') goto yy260; - goto yy56; - } - } - } -yy341: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy344; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy343; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy347; - if (yych <= 'z') goto yy266; - goto yy247; - } - } -yy342: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy344; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy343; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy343; - if (yych <= 'z') goto yy261; - goto yy247; - } - } -yy343: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy247; - goto yy302; - } else { - if (yych == ' ') goto yy302; - if (yych <= '(') goto yy247; - goto yy252; - } - } else { - if (yych <= '@') { - if (yych == '.') goto yy346; - goto yy247; - } else { - if (yych <= 'Z') goto yy262; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy262; - goto yy247; - } - } -yy344: - yych = *++YYCURSOR; - if (yych == 'M') goto yy345; - if (yych != 'm') goto yy56; -yy345: - yych = *++YYCURSOR; - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; - goto yy56; - } else { - if (yych <= ' ') goto yy302; - if (yych != '.') goto yy56; - } -yy346: - yych = *++YYCURSOR; - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy56; - goto yy302; - } else { - if (yych == ' ') goto yy302; - goto yy56; - } -yy347: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; - goto yy247; - } else { - if (yych <= '(') { - if (yych <= ' ') goto yy302; - goto yy247; - } else { - if (yych <= ')') goto yy252; - if (yych <= ',') goto yy247; - goto yy268; - } - } - } else { - if (yych <= 'Z') { - if (yych <= '.') goto yy346; - if (yych <= '/') goto yy268; - if (yych <= '@') goto yy247; - goto yy262; - } else { - if (yych <= '_') { - if (yych <= '^') goto yy247; - goto yy268; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy267; - goto yy247; - } - } - } -yy348: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy307; - if (yych <= 0x1F) goto yy223; - goto yy307; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy223; - goto yy291; - } else { - if (yych <= '/') goto yy223; - if (yych <= '9') goto yy313; - goto yy291; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy309; - if (yych <= 'O') goto yy223; - goto yy309; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy223; - goto yy309; - } else { - if (yych == 'p') goto yy309; - goto yy223; - } - } - } -yy349: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy307; - if (yych <= 0x1F) goto yy223; - goto yy307; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy223; - } else { - if (yych <= '/') goto yy223; - if (yych <= '9') goto yy313; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy309; - if (yych <= 'O') goto yy223; - goto yy309; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy223; - goto yy309; - } else { - if (yych == 'p') goto yy309; - goto yy223; - } - } - } -yy350: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy351; - if (yych <= '6') goto yy352; - if (yych <= '9') goto yy248; - goto yy56; -yy351: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy249; - goto yy247; - } else { - if (yych <= '9') goto yy353; - if (yych <= ':') goto yy249; - goto yy247; - } -yy352: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy249; - goto yy247; - } else { - if (yych <= '0') goto yy294; - if (yych == ':') goto yy249; - goto yy247; - } -yy353: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy296; - if (yych <= 0x1F) goto yy247; - goto yy296; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy247; - goto yy296; - } else { - if (yych == '+') goto yy296; - goto yy247; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy296; - if (yych <= '.') goto yy249; - if (yych <= '9') goto yy247; - goto yy249; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy247; - goto yy296; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy296; - goto yy247; - } - } - } -yy354: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy307; - if (yych <= 0x1F) goto yy223; - goto yy307; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy223; - goto yy335; - } else { - if (yych <= '/') goto yy223; - if (yych <= '9') goto yy313; - goto yy335; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy309; - if (yych <= 'O') goto yy223; - goto yy309; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy223; - goto yy309; - } else { - if (yych == 'p') goto yy309; - goto yy223; - } - } - } -yy355: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy357; - goto yy358; - } else { - if (yych <= '2') goto yy359; - if (yych <= '5') goto yy360; - if (yych <= '9') goto yy361; - goto yy240; - } -yy356: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy245; - goto yy56; - } else { - if (yych <= '0') goto yy328; - if (yych <= '9') goto yy329; - if (yych <= ':') goto yy245; - goto yy56; - } -yy357: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy374; - goto yy223; - } else { - if (yych <= '0') goto yy373; - if (yych <= '9') goto yy378; - if (yych <= ':') goto yy374; - goto yy223; - } -yy358: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy362; - goto yy223; - } else { - if (yych <= '2') goto yy378; - if (yych <= '9') goto yy373; - if (yych <= ':') goto yy362; - goto yy223; - } -yy359: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy362; - goto yy223; - } else { - if (yych <= '4') goto yy373; - if (yych <= '9') goto yy372; - if (yych <= ':') goto yy362; - goto yy223; - } -yy360: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy362; - goto yy223; - } else { - if (yych <= '9') goto yy372; - if (yych <= ':') goto yy362; - goto yy223; - } -yy361: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy223; - } else { - if (yych <= '9') goto yy287; - if (yych >= ';') goto yy223; - } -yy362: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy363; - if (yych <= '6') goto yy364; - if (yych <= '9') goto yy290; - goto yy56; -yy363: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy291; - goto yy247; - } else { - if (yych <= '9') goto yy365; - if (yych <= ':') goto yy291; - goto yy247; - } -yy364: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy291; - goto yy247; - } else { - if (yych <= '0') goto yy253; - if (yych == ':') goto yy291; - goto yy247; - } -yy365: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy367; - if (yych <= 0x1F) goto yy247; - goto yy367; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy247; - goto yy367; - } else { - if (yych == '+') goto yy367; - goto yy247; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy367; - if (yych <= '.') goto yy291; - if (yych <= '9') goto yy247; - goto yy291; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy247; - goto yy367; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy367; - goto yy247; - } - } - } -yy366: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); - yych = *YYCURSOR; -yy367: - if (yych <= '@') { - if (yych <= '\'') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy56; - goto yy366; - } else { - if (yych == ' ') goto yy366; - goto yy56; - } - } else { - if (yych <= '+') { - if (yych <= '(') goto yy258; - if (yych <= '*') goto yy56; - goto yy257; - } else { - if (yych == '-') goto yy257; - goto yy56; - } - } - } else { - if (yych <= 'Z') { - if (yych <= 'G') { - if (yych <= 'A') goto yy368; - if (yych <= 'F') goto yy259; - goto yy256; - } else { - if (yych != 'P') goto yy259; - } - } else { - if (yych <= 'o') { - if (yych <= '`') goto yy56; - if (yych <= 'a') goto yy369; - goto yy260; - } else { - if (yych <= 'p') goto yy369; - if (yych <= 'z') goto yy260; - goto yy56; - } - } - } -yy368: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy310; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy370; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy371; - if (yych <= 'z') goto yy266; - goto yy247; - } - } -yy369: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy252; - goto yy247; - } else { - if (yych <= '.') goto yy310; - if (yych <= '@') goto yy247; - goto yy261; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy370; - if (yych <= 'Z') goto yy261; - goto yy247; - } else { - if (yych == 'm') goto yy370; - if (yych <= 'z') goto yy261; - goto yy247; - } - } -yy370: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { - if (yych <= '\t') { - if (yych <= 0x00) goto yy302; - if (yych <= 0x08) goto yy247; - goto yy302; - } else { - if (yych == ' ') goto yy302; - if (yych <= '(') goto yy247; - goto yy252; - } - } else { - if (yych <= '@') { - if (yych == '.') goto yy312; - goto yy247; - } else { - if (yych <= 'Z') goto yy262; - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy262; - goto yy247; - } - } -yy371: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy302; - if (yych == '\t') goto yy302; - goto yy247; - } else { - if (yych <= '(') { - if (yych <= ' ') goto yy302; - goto yy247; - } else { - if (yych <= ')') goto yy252; - if (yych <= ',') goto yy247; - goto yy268; - } - } - } else { - if (yych <= 'Z') { - if (yych <= '.') goto yy312; - if (yych <= '/') goto yy268; - if (yych <= '@') goto yy247; - goto yy262; - } else { - if (yych <= '_') { - if (yych <= '^') goto yy247; - goto yy268; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy267; - goto yy247; - } - } - } -yy372: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy249; - goto yy223; - } else { - if (yych <= '9') goto yy313; - if (yych <= ':') goto yy249; - goto yy223; - } -yy373: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy223; - } else { - if (yych <= '9') goto yy313; - if (yych >= ';') goto yy223; - } -yy374: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy375; - if (yych <= '6') goto yy376; - if (yych <= '9') goto yy248; - goto yy56; -yy375: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy249; - goto yy247; - } else { - if (yych <= '9') goto yy377; - if (yych <= ':') goto yy249; - goto yy247; - } -yy376: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy249; - goto yy247; - } else { - if (yych <= '0') goto yy253; - if (yych == ':') goto yy249; - goto yy247; - } -yy377: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy255; - if (yych <= 0x1F) goto yy247; - goto yy255; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy247; - goto yy255; - } else { - if (yych == '+') goto yy255; - goto yy247; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy255; - if (yych <= '.') goto yy249; - if (yych <= '9') goto yy247; - goto yy249; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy247; - goto yy255; - } else { - if (yych <= '`') goto yy247; - if (yych <= 'z') goto yy255; - goto yy247; - } - } - } -yy378: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy362; - goto yy223; - } else { - if (yych <= '9') goto yy313; - if (yych <= ':') goto yy362; - goto yy223; - } -yy379: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych == '.') goto yy324; - goto yy240; - } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; - } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } -yy380: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych == '.') goto yy324; - goto yy240; - } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; - } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } -yy381: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy384; - goto yy385; - } else { - if (yych <= '2') goto yy392; - if (yych <= '9') goto yy393; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy320; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy382: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych <= '0') goto yy384; - goto yy385; +yy324: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '2') goto yy392; - if (yych <= '9') goto yy393; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy327; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy383: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy240; - if (yych >= '1') goto yy385; +yy325: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '2') goto yy233; - if (yych <= '9') goto yy234; - goto yy240; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy327; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy236; - if (yych <= 'q') goto yy240; - goto yy237; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy384: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy240; - if (yych <= '-') goto yy386; - if (yych <= '.') goto yy355; - goto yy240; +yy326: + yych = *++YYCURSOR; + if (yych <= '1') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; + if (yych <= '-') { + if (yych == ',') goto yy236; + goto yy56; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + } } } else { - if (yych <= 'q') { - if (yych <= ':') goto yy245; - if (yych == 'n') goto yy236; - goto yy240; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= '9') goto yy230; + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy385: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); +yy327: + yych = *++YYCURSOR; if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy240; - if (yych <= '-') goto yy386; - if (yych <= '.') goto yy324; - goto yy240; + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy238; + goto yy56; + } else { + if (yych <= '\t') goto yy236; + if (yych <= 0x1F) goto yy56; + goto yy236; + } } else { - if (yych <= '0') goto yy325; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; + if (yych <= '-') { + if (yych <= '+') goto yy56; + if (yych <= ',') goto yy236; + } else { + if (yych <= '.') goto yy236; + if (yych <= '/') goto yy56; + goto yy320; + } } } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy236; + } else { + if (yych == 'h') goto yy236; + goto yy56; + } } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; + if (yych <= 'r') { + if (yych <= 'n') goto yy233; + if (yych <= 'q') goto yy56; + goto yy234; + } else { + if (yych <= 's') goto yy231; + if (yych <= 't') goto yy235; + goto yy56; + } } } -yy386: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy388; - if (yych <= '9') goto yy389; -yy388: + if ((yych = *YYCURSOR) <= '/') goto yy330; + if (yych <= '9') goto yy331; +yy330: { int length = 0; DEBUG_OUTPUT("pgtextshort"); @@ -6566,70 +5716,16 @@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -yy389: +yy331: yych = *++YYCURSOR; - if (yych <= '/') goto yy388; - if (yych >= ':') goto yy388; + if (yych <= '/') goto yy330; + if (yych >= ':') goto yy330; yych = *++YYCURSOR; - if (yych <= '/') goto yy388; - if (yych >= ':') goto yy388; + if (yych <= '/') goto yy330; + if (yych >= ':') goto yy330; yych = *++YYCURSOR; - goto yy388; -yy392: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy240; - if (yych <= '-') goto yy386; - if (yych <= '.') goto yy324; - goto yy240; - } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; - } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } -yy393: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy240; - if (yych <= '-') goto yy386; - if (yych <= '.') goto yy324; - goto yy240; - } else { - if (yych <= '0') goto yy356; - if (yych <= '1') goto yy326; - if (yych <= '2') goto yy327; - goto yy321; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy288; - if (yych == 'n') goto yy236; - goto yy240; - } else { - if (yych <= 'r') goto yy237; - if (yych <= 's') goto yy235; - if (yych <= 't') goto yy238; - goto yy240; - } - } -yy394: + goto yy330; +yy334: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { @@ -6653,13 +5749,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'c') goto yy395; + if (yych <= 'c') goto yy335; if (yych <= 'z') goto yy171; goto yy3; } } } -yy395: +yy335: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -6686,7 +5782,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'E') goto yy226; + if (yych <= 'E') goto yy225; if (yych <= 'Z') goto yy167; goto yy218; } @@ -6696,23 +5792,23 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'e') goto yy397; + if (yych <= 'e') goto yy337; if (yych <= 'z') goto yy175; goto yy218; } } } -yy396: +yy336: yych = *++YYCURSOR; if (yybm[0+yych] & 8) { goto yy173; } if (yych <= '/') goto yy220; - if (yych <= '0') goto yy381; - if (yych <= '2') goto yy382; - if (yych <= '3') goto yy383; + if (yych <= '0') goto yy324; + if (yych <= '2') goto yy325; + if (yych <= '3') goto yy326; goto yy220; -yy397: +yy337: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { @@ -6727,7 +5823,7 @@ } } else { if (yych <= '_') { - if (yych <= 'M') goto yy227; + if (yych <= 'M') goto yy226; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -6736,13 +5832,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'm') goto yy398; + if (yych <= 'm') goto yy338; if (yych <= 'z') goto yy176; goto yy3; } } } -yy398: +yy338: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { @@ -6757,7 +5853,7 @@ } } else { if (yych <= '_') { - if (yych <= 'B') goto yy228; + if (yych <= 'B') goto yy227; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -6766,13 +5862,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'b') goto yy399; + if (yych <= 'b') goto yy339; if (yych <= 'z') goto yy177; goto yy3; } } } -yy399: +yy339: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -6786,20 +5882,20 @@ } } else { if (yych <= '`') { - if (yych <= 'E') goto yy229; + if (yych <= 'E') goto yy228; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'e') goto yy400; + if (yych == 'e') goto yy340; if (yych <= 'z') goto yy178; goto yy3; } } -yy400: +yy340: yych = *++YYCURSOR; - if (yych == 'R') goto yy230; + if (yych == 'R') goto yy229; if (yych != 'r') goto yy179; -yy401: +yy341: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { @@ -6822,13 +5918,13 @@ goto yy218; } } -yy402: +yy342: yych = *++YYCURSOR; if (yybm[0+yych] & 8) { goto yy173; } goto yy220; -yy403: +yy343: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -6844,12 +5940,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 't') goto yy404; + if (yych <= 't') goto yy344; if (yych <= 'z') goto yy166; goto yy3; } } -yy404: +yy344: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -6884,13 +5980,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'o') goto yy405; + if (yych <= 'o') goto yy345; if (yych <= 'z') goto yy167; goto yy218; } } } -yy405: +yy345: yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { @@ -6906,12 +6002,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'b') goto yy406; + if (yych <= 'b') goto yy346; if (yych <= 'z') goto yy168; goto yy3; } } -yy406: +yy346: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -6927,22 +6023,22 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'e') goto yy407; + if (yych <= 'e') goto yy347; if (yych <= 'z') goto yy169; goto yy3; } } -yy407: +yy347: yych = *++YYCURSOR; if (yych <= 'Q') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'R') goto yy230; - if (yych == 'r') goto yy230; + if (yych <= 'R') goto yy229; + if (yych == 'r') goto yy229; goto yy3; } -yy408: +yy348: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -6957,7 +6053,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy404; + if (yych <= 'T') goto yy344; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -6966,13 +6062,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 't') goto yy409; + if (yych <= 't') goto yy349; if (yych <= 'z') goto yy171; goto yy3; } } } -yy409: +yy349: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -6988,7 +6084,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -7000,7 +6096,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'O') goto yy405; + if (yych <= 'O') goto yy345; if (yych <= 'Z') goto yy167; goto yy218; } @@ -7010,13 +6106,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'o') goto yy410; + if (yych <= 'o') goto yy350; if (yych <= 'z') goto yy175; goto yy218; } } } -yy410: +yy350: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { @@ -7031,7 +6127,7 @@ } } else { if (yych <= '_') { - if (yych <= 'B') goto yy406; + if (yych <= 'B') goto yy346; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -7040,13 +6136,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'b') goto yy411; + if (yych <= 'b') goto yy351; if (yych <= 'z') goto yy176; goto yy3; } } } -yy411: +yy351: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -7061,7 +6157,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy407; + if (yych <= 'E') goto yy347; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -7070,13 +6166,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'e') goto yy412; + if (yych <= 'e') goto yy352; if (yych <= 'z') goto yy177; goto yy3; } } } -yy412: +yy352: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -7090,16 +6186,16 @@ } } else { if (yych <= '`') { - if (yych <= 'R') goto yy230; + if (yych <= 'R') goto yy229; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'r') goto yy401; + if (yych == 'r') goto yy341; if (yych <= 'z') goto yy178; goto yy3; } } -yy413: +yy353: yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { @@ -7108,7 +6204,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'F') goto yy166; - goto yy421; + goto yy361; } } else { if (yych <= 'f') { @@ -7116,12 +6212,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'g') goto yy421; + if (yych <= 'g') goto yy361; if (yych <= 'z') goto yy166; goto yy3; } } -yy414: +yy354: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -7130,7 +6226,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'Q') goto yy166; - goto yy418; + goto yy358; } } else { if (yych <= 'q') { @@ -7138,12 +6234,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'r') goto yy418; + if (yych <= 'r') goto yy358; if (yych <= 'z') goto yy166; goto yy3; } } -yy415: +yy355: yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { @@ -7159,21 +6255,21 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'o') goto yy416; + if (yych <= 'o') goto yy356; if (yych <= 'z') goto yy166; goto yy3; } } -yy416: +yy356: ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { if (yych == ')') goto yy164; } else { if (yych <= 'Z') goto yy167; - if (yych <= '`') goto yy417; + if (yych <= '`') goto yy357; if (yych <= 'z') goto yy167; } -yy417: +yy357: { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@ -7193,7 +6289,7 @@ TIMELIB_DEINIT; return TIMELIB_AGO; } -yy418: +yy358: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -7228,13 +6324,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'i') goto yy419; + if (yych <= 'i') goto yy359; if (yych <= 'z') goto yy167; goto yy218; } } } -yy419: +yy359: yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= ')') { @@ -7250,12 +6346,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'l') goto yy420; + if (yych <= 'l') goto yy360; if (yych <= 'z') goto yy168; goto yy3; } } -yy420: +yy360: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { @@ -7279,7 +6375,7 @@ goto yy218; } } -yy421: +yy361: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -7314,13 +6410,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'u') goto yy422; + if (yych <= 'u') goto yy362; if (yych <= 'z') goto yy167; goto yy218; } } } -yy422: +yy362: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -7336,12 +6432,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 's') goto yy423; + if (yych <= 's') goto yy363; if (yych <= 'z') goto yy168; goto yy3; } } -yy423: +yy363: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -7357,12 +6453,12 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 't') goto yy424; + if (yych <= 't') goto yy364; if (yych <= 'z') goto yy169; goto yy3; } } -yy424: +yy364: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { @@ -7384,7 +6480,7 @@ goto yy218; } } -yy425: +yy365: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { @@ -7399,7 +6495,7 @@ } } else { if (yych <= '_') { - if (yych <= 'G') goto yy421; + if (yych <= 'G') goto yy361; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -7408,13 +6504,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'g') goto yy432; + if (yych <= 'g') goto yy372; if (yych <= 'z') goto yy171; goto yy3; } } } -yy426: +yy366: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -7429,7 +6525,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy418; + if (yych <= 'R') goto yy358; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -7438,13 +6534,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'r') goto yy429; + if (yych <= 'r') goto yy369; if (yych <= 'z') goto yy171; goto yy3; } } } -yy427: +yy367: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -7459,7 +6555,7 @@ } } else { if (yych <= '_') { - if (yych <= 'O') goto yy416; + if (yych <= 'O') goto yy356; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -7468,36 +6564,36 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'o') goto yy428; + if (yych <= 'o') goto yy368; if (yych <= 'z') goto yy171; goto yy3; } } } -yy428: - yyaccept = 9; +yy368: + yyaccept = 8; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { if (yych == ')') goto yy164; - goto yy417; + goto yy357; } else { - if (yych == '.') goto yy417; + if (yych == '.') goto yy357; goto yy172; } } else { if (yych <= '^') { - if (yych <= '@') goto yy417; + if (yych <= '@') goto yy357; if (yych <= 'Z') goto yy167; - goto yy417; + goto yy357; } else { if (yych <= '_') goto yy172; - if (yych <= '`') goto yy417; + if (yych <= '`') goto yy357; if (yych <= 'z') goto yy175; - goto yy417; + goto yy357; } } -yy429: +yy369: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -7513,7 +6609,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -7525,7 +6621,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'I') goto yy419; + if (yych <= 'I') goto yy359; if (yych <= 'Z') goto yy167; goto yy218; } @@ -7535,13 +6631,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'i') goto yy430; + if (yych <= 'i') goto yy370; if (yych <= 'z') goto yy175; goto yy218; } } } -yy430: +yy370: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'K') { @@ -7556,7 +6652,7 @@ } } else { if (yych <= '_') { - if (yych <= 'L') goto yy420; + if (yych <= 'L') goto yy360; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -7565,13 +6661,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'l') goto yy431; + if (yych <= 'l') goto yy371; if (yych <= 'z') goto yy176; goto yy3; } } } -yy431: +yy371: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -7585,7 +6681,7 @@ goto yy164; } else { if (yych <= ',') goto yy218; - if (yych <= '-') goto yy402; + if (yych <= '-') goto yy342; goto yy220; } } @@ -7606,7 +6702,7 @@ } } } -yy432: +yy372: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -7622,7 +6718,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -7634,7 +6730,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'U') goto yy422; + if (yych <= 'U') goto yy362; if (yych <= 'Z') goto yy167; goto yy218; } @@ -7644,13 +6740,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'u') goto yy433; + if (yych <= 'u') goto yy373; if (yych <= 'z') goto yy175; goto yy218; } } } -yy433: +yy373: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -7665,7 +6761,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy423; + if (yych <= 'S') goto yy363; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -7674,13 +6770,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 's') goto yy434; + if (yych <= 's') goto yy374; if (yych <= 'z') goto yy176; goto yy3; } } } -yy434: +yy374: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -7695,7 +6791,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy424; + if (yych <= 'T') goto yy364; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -7704,13 +6800,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 't') goto yy435; + if (yych <= 't') goto yy375; if (yych <= 'z') goto yy177; goto yy3; } } } -yy435: +yy375: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { @@ -7727,7 +6823,7 @@ } } else { if (yych <= '/') { - if (yych <= '-') goto yy402; + if (yych <= '-') goto yy342; if (yych <= '.') goto yy220; goto yy172; } else { @@ -7736,30 +6832,30 @@ goto yy218; } } -yy436: +yy376: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'L') goto yy443; + if (yych == 'L') goto yy383; if (yych <= 'M') goto yy166; - goto yy442; + goto yy382; } } else { if (yych <= 'l') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'k') goto yy166; - goto yy443; + goto yy383; } else { - if (yych == 'n') goto yy442; + if (yych == 'n') goto yy382; if (yych <= 'z') goto yy166; goto yy3; } } -yy437: +yy377: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -7775,12 +6871,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'n') goto yy438; + if (yych <= 'n') goto yy378; if (yych <= 'z') goto yy166; goto yy3; } } -yy438: +yy378: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -7815,13 +6911,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'u') goto yy439; + if (yych <= 'u') goto yy379; if (yych <= 'z') goto yy167; goto yy218; } } } -yy439: +yy379: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -7831,12 +6927,12 @@ if (yych <= 'Z') goto yy168; goto yy3; } else { - if (yych <= 'a') goto yy440; + if (yych <= 'a') goto yy380; if (yych <= 'z') goto yy168; goto yy3; } } -yy440: +yy380: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -7852,22 +6948,22 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'r') goto yy441; + if (yych <= 'r') goto yy381; if (yych <= 'z') goto yy169; goto yy3; } } -yy441: +yy381: yych = *++YYCURSOR; if (yych <= 'X') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'Y') goto yy230; - if (yych == 'y') goto yy230; + if (yych <= 'Y') goto yy229; + if (yych == 'y') goto yy229; goto yy3; } -yy442: +yy382: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -7895,7 +6991,7 @@ if (yych <= '9') goto yy220; goto yy218; } else { - if (yych == 'E') goto yy444; + if (yych == 'E') goto yy384; goto yy167; } } else { @@ -7903,13 +6999,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'e') goto yy444; + if (yych <= 'e') goto yy384; if (yych <= 'z') goto yy167; goto yy218; } } } -yy443: +yy383: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -7944,13 +7040,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'y') goto yy444; + if (yych <= 'y') goto yy384; if (yych <= 'z') goto yy167; goto yy218; } } } -yy444: +yy384: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { @@ -7974,7 +7070,7 @@ goto yy218; } } -yy445: +yy385: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -7991,14 +7087,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'L') goto yy443; + if (yych == 'L') goto yy383; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'N') goto yy442; + if (yych <= 'N') goto yy382; goto yy166; } else { if (yych == '_') goto yy172; @@ -8006,16 +7102,16 @@ } } else { if (yych <= 'm') { - if (yych == 'l') goto yy452; + if (yych == 'l') goto yy392; goto yy171; } else { - if (yych <= 'n') goto yy451; + if (yych <= 'n') goto yy391; if (yych <= 'z') goto yy171; goto yy3; } } } -yy446: +yy386: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -8030,7 +7126,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy438; + if (yych <= 'N') goto yy378; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -8039,13 +7135,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'n') goto yy447; + if (yych <= 'n') goto yy387; if (yych <= 'z') goto yy171; goto yy3; } } } -yy447: +yy387: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -8061,7 +7157,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -8073,7 +7169,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'U') goto yy439; + if (yych <= 'U') goto yy379; if (yych <= 'Z') goto yy167; goto yy218; } @@ -8083,13 +7179,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'u') goto yy448; + if (yych <= 'u') goto yy388; if (yych <= 'z') goto yy175; goto yy218; } } } -yy448: +yy388: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -8103,18 +7199,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy440; + if (yych <= 'A') goto yy380; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy449; + if (yych <= 'a') goto yy389; if (yych <= 'z') goto yy176; goto yy3; } } -yy449: +yy389: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -8129,7 +7225,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy441; + if (yych <= 'R') goto yy381; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -8138,13 +7234,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'r') goto yy450; + if (yych <= 'r') goto yy390; if (yych <= 'z') goto yy177; goto yy3; } } } -yy450: +yy390: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -8158,16 +7254,16 @@ } } else { if (yych <= '`') { - if (yych <= 'Y') goto yy230; + if (yych <= 'Y') goto yy229; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'y') goto yy401; + if (yych == 'y') goto yy341; if (yych <= 'z') goto yy178; goto yy3; } } -yy451: +yy391: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -8183,7 +7279,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -8195,7 +7291,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'E') goto yy444; + if (yych <= 'E') goto yy384; if (yych <= 'Z') goto yy167; goto yy218; } @@ -8205,13 +7301,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'e') goto yy453; + if (yych <= 'e') goto yy393; if (yych <= 'z') goto yy175; goto yy218; } } } -yy452: +yy392: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -8227,7 +7323,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -8239,7 +7335,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'Y') goto yy444; + if (yych <= 'Y') goto yy384; if (yych <= 'Z') goto yy167; goto yy218; } @@ -8249,13 +7345,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'y') goto yy453; + if (yych <= 'y') goto yy393; if (yych <= 'z') goto yy175; goto yy218; } } } -yy453: +yy393: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -8269,7 +7365,7 @@ goto yy164; } else { if (yych <= ',') goto yy218; - if (yych <= '-') goto yy402; + if (yych <= '-') goto yy342; goto yy220; } } @@ -8290,7 +7386,7 @@ } } } -yy454: +yy394: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -8319,7 +7415,7 @@ } } } -yy455: +yy395: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { @@ -8343,7 +7439,7 @@ goto yy3; } } -yy456: +yy396: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -8423,7 +7519,7 @@ goto yy3; } } -yy459: +yy399: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { @@ -8447,7 +7543,7 @@ goto yy3; } } -yy460: +yy400: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -8468,7 +7564,7 @@ goto yy166; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy455; + if (yych <= 'I') goto yy395; goto yy166; } else { if (yych <= '`') goto yy3; @@ -8477,7 +7573,7 @@ } } } -yy461: +yy401: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -8489,7 +7585,7 @@ } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy481; + goto yy421; } else { if (yych <= ':') goto yy187; if (yych <= 'C') goto yy3; @@ -8550,7 +7646,7 @@ } } } -yy462: +yy402: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@ -8565,10 +7661,10 @@ } } else { if (yych <= '5') { - if (yych <= '4') goto yy481; - goto yy466; + if (yych <= '4') goto yy421; + goto yy406; } else { - if (yych <= '9') goto yy467; + if (yych <= '9') goto yy407; if (yych <= ':') goto yy187; goto yy3; } @@ -8633,7 +7729,7 @@ } } } -yy463: +yy403: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@ -8645,9 +7741,9 @@ } else { if (yych <= '5') { if (yych <= '/') goto yy3; - goto yy466; + goto yy406; } else { - if (yych <= '9') goto yy467; + if (yych <= '9') goto yy407; if (yych <= ':') goto yy187; goto yy3; } @@ -8712,7 +7808,7 @@ } } } -yy464: +yy404: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -8720,15 +7816,15 @@ goto yy57; } if (yych <= ',') { - if (yych == '+') goto yy464; + if (yych == '+') goto yy404; goto yy56; } else { - if (yych <= '-') goto yy464; + if (yych <= '-') goto yy404; if (yych <= '/') goto yy56; if (yych <= '9') goto yy54; goto yy56; } -yy466: +yy406: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -8740,7 +7836,7 @@ } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy480; + goto yy420; } else { if (yych == 'D') goto yy60; goto yy3; @@ -8796,7 +7892,7 @@ } } } -yy467: +yy407: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -8866,53 +7962,53 @@ yych = *++YYCURSOR; if (yych <= '/') goto yy60; if (yych >= ':') goto yy60; -yy469: +yy409: yych = *++YYCURSOR; if (yybm[0+yych] & 2) { goto yy54; } if (yych != '-') goto yy60; -yy470: +yy410: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy471; - if (yych <= '1') goto yy472; + if (yych <= '0') goto yy411; + if (yych <= '1') goto yy412; goto yy56; -yy471: +yy411: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy473; + if (yych <= '9') goto yy413; goto yy56; -yy472: +yy412: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; -yy473: +yy413: yych = *++YYCURSOR; if (yych != '-') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy475; - if (yych <= '2') goto yy476; - if (yych <= '3') goto yy477; + if (yych <= '0') goto yy415; + if (yych <= '2') goto yy416; + if (yych <= '3') goto yy417; goto yy56; -yy475: +yy415: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy478; + if (yych <= '9') goto yy418; goto yy56; -yy476: +yy416: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy478; + if (yych <= '9') goto yy418; goto yy56; -yy477: +yy417: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '2') goto yy56; -yy478: +yy418: ++YYCURSOR; -yy479: +yy419: { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@ -8923,7 +8019,7 @@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -yy480: +yy420: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -8935,7 +8031,7 @@ } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy469; + goto yy409; } else { if (yych == 'D') goto yy60; goto yy3; @@ -8991,7 +8087,7 @@ } } } -yy481: +yy421: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@ -9004,7 +8100,7 @@ if (yych <= '5') { if (yych <= '/') goto yy3; } else { - if (yych <= '9') goto yy480; + if (yych <= '9') goto yy420; if (yych <= ':') goto yy187; goto yy3; } @@ -9149,7 +8245,7 @@ } else { if (yych <= '-') { if (yych <= ',') goto yy3; - goto yy470; + goto yy410; } else { if (yych == 'D') goto yy60; goto yy3; @@ -9205,36 +8301,36 @@ } } } -yy484: +yy424: yych = *++YYCURSOR; - if (yych <= '/') goto yy486; - if (yych <= '0') goto yy760; - if (yych <= '1') goto yy761; - if (yych <= '9') goto yy762; - goto yy486; -yy485: + if (yych <= '/') goto yy426; + if (yych <= '0') goto yy700; + if (yych <= '1') goto yy701; + if (yych <= '9') goto yy702; + goto yy426; +yy425: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy486: +yy426: if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy485; + if (yych == '\t') goto yy425; goto yy56; } else { - if (yych <= ' ') goto yy485; + if (yych <= ' ') goto yy425; if (yych <= ',') goto yy56; - goto yy601; + goto yy541; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy504; + if (yych == 'A') goto yy444; goto yy56; } else { - if (yych <= 'D') goto yy490; - if (yych == 'F') goto yy491; + if (yych <= 'D') goto yy430; + if (yych == 'F') goto yy431; goto yy56; } } @@ -9242,23 +8338,23 @@ if (yych <= 'O') { if (yych <= 'J') { if (yych <= 'H') goto yy65; - if (yych <= 'I') goto yy499; - goto yy503; + if (yych <= 'I') goto yy439; + goto yy443; } else { if (yych <= 'L') goto yy56; - if (yych <= 'M') goto yy487; - if (yych <= 'N') goto yy506; - goto yy505; + if (yych <= 'M') goto yy427; + if (yych <= 'N') goto yy446; + goto yy445; } } else { if (yych <= 'S') { - if (yych <= 'P') goto yy508; + if (yych <= 'P') goto yy448; if (yych <= 'R') goto yy56; - goto yy488; + goto yy428; } else { if (yych <= 'T') goto yy70; if (yych <= 'U') goto yy63; - if (yych <= 'V') goto yy501; + if (yych <= 'V') goto yy441; goto yy69; } } @@ -9267,33 +8363,33 @@ if (yych <= 'm') { if (yych <= 'e') { if (yych <= '`') { - if (yych <= 'X') goto yy502; + if (yych <= 'X') goto yy442; if (yych <= 'Y') goto yy68; goto yy56; } else { - if (yych <= 'a') goto yy504; - if (yych == 'd') goto yy490; + if (yych <= 'a') goto yy444; + if (yych == 'd') goto yy430; goto yy56; } } else { if (yych <= 'h') { - if (yych <= 'f') goto yy491; + if (yych <= 'f') goto yy431; if (yych <= 'g') goto yy56; goto yy65; } else { - if (yych == 'j') goto yy503; + if (yych == 'j') goto yy443; if (yych <= 'l') goto yy56; } } } else { if (yych <= 'u') { if (yych <= 'p') { - if (yych <= 'n') goto yy506; - if (yych <= 'o') goto yy505; - goto yy508; + if (yych <= 'n') goto yy446; + if (yych <= 'o') goto yy445; + goto yy448; } else { if (yych <= 'r') goto yy56; - if (yych <= 's') goto yy488; + if (yych <= 's') goto yy428; if (yych <= 't') goto yy70; goto yy63; } @@ -9309,11 +8405,11 @@ } } } -yy487: +yy427: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'I') { - if (yych == 'A') goto yy616; + if (yych == 'A') goto yy556; if (yych <= 'H') goto yy56; goto yy138; } else { @@ -9323,7 +8419,7 @@ } } else { if (yych <= 'i') { - if (yych == 'a') goto yy616; + if (yych == 'a') goto yy556; if (yych <= 'h') goto yy56; goto yy138; } else { @@ -9336,14 +8432,14 @@ } } } -yy488: +yy428: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { if (yych == 'A') goto yy119; goto yy56; } else { - if (yych <= 'E') goto yy1073; + if (yych <= 'E') goto yy1013; if (yych <= 'T') goto yy56; goto yy118; } @@ -9352,19 +8448,19 @@ if (yych == 'a') goto yy119; goto yy56; } else { - if (yych <= 'e') goto yy1073; + if (yych <= 'e') goto yy1013; if (yych == 'u') goto yy118; goto yy56; } } -yy489: +yy429: yych = *++YYCURSOR; if (yych <= '`') { if (yych <= 'D') { if (yych == 'A') goto yy119; goto yy56; } else { - if (yych <= 'E') goto yy1073; + if (yych <= 'E') goto yy1013; if (yych == 'U') goto yy118; goto yy56; } @@ -9372,34 +8468,34 @@ if (yych <= 'e') { if (yych <= 'a') goto yy119; if (yych <= 'd') goto yy56; - goto yy1073; + goto yy1013; } else { if (yych <= 's') goto yy56; - if (yych <= 't') goto yy753; + if (yych <= 't') goto yy693; if (yych <= 'u') goto yy118; goto yy56; } } -yy490: +yy430: yych = *++YYCURSOR; if (yych <= 'E') { if (yych == 'A') goto yy115; if (yych <= 'D') goto yy56; - goto yy603; + goto yy543; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; goto yy115; } else { - if (yych == 'e') goto yy603; + if (yych == 'e') goto yy543; goto yy56; } } -yy491: +yy431: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= 'N') { - if (yych == 'E') goto yy619; + if (yych == 'E') goto yy559; goto yy56; } else { if (yych <= 'O') goto yy100; @@ -9408,7 +8504,7 @@ } } else { if (yych <= 'n') { - if (yych == 'e') goto yy619; + if (yych == 'e') goto yy559; goto yy56; } else { if (yych <= 'o') goto yy100; @@ -9416,7 +8512,7 @@ goto yy56; } } -yy492: +yy432: yych = *++YYCURSOR; if (yych <= 'U') { if (yych == 'H') goto yy71; @@ -9425,68 +8521,68 @@ } else { if (yych <= 'h') { if (yych <= 'g') goto yy56; - goto yy1072; + goto yy1012; } else { if (yych == 'u') goto yy72; goto yy56; } } -yy493: +yy433: yych = *++YYCURSOR; - if (yych == '-') goto yy766; + if (yych == '-') goto yy706; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy765; + if (yych <= '9') goto yy705; goto yy60; -yy494: +yy434: yych = *++YYCURSOR; if (yych <= 'c') { - if (yych == 'O') goto yy554; + if (yych == 'O') goto yy494; goto yy56; } else { - if (yych <= 'd') goto yy753; - if (yych == 'o') goto yy554; + if (yych <= 'd') goto yy693; + if (yych == 'o') goto yy494; goto yy56; } -yy495: +yy435: yych = *++YYCURSOR; - if (yych == 'd') goto yy753; + if (yych == 'd') goto yy693; goto yy56; -yy496: +yy436: yych = *++YYCURSOR; switch (yych) { case '0': case '1': - case '2': goto yy690; - case '3': goto yy692; + case '2': goto yy630; + case '3': goto yy632; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy693; + case '9': goto yy633; case 'A': - case 'a': goto yy697; + case 'a': goto yy637; case 'D': - case 'd': goto yy701; + case 'd': goto yy641; case 'F': - case 'f': goto yy695; + case 'f': goto yy635; case 'J': - case 'j': goto yy694; + case 'j': goto yy634; case 'M': - case 'm': goto yy696; + case 'm': goto yy636; case 'N': - case 'n': goto yy700; + case 'n': goto yy640; case 'O': - case 'o': goto yy699; + case 'o': goto yy639; case 'S': - case 's': goto yy698; + case 's': goto yy638; default: goto yy56; } -yy497: +yy437: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy640; - case '1': goto yy641; + case '0': goto yy580; + case '1': goto yy581; case '2': case '3': case '4': @@ -9494,57 +8590,57 @@ case '6': case '7': case '8': - case '9': goto yy642; + case '9': goto yy582; case 'A': - case 'a': goto yy646; + case 'a': goto yy586; case 'D': - case 'd': goto yy650; + case 'd': goto yy590; case 'F': - case 'f': goto yy644; + case 'f': goto yy584; case 'J': - case 'j': goto yy643; + case 'j': goto yy583; case 'M': - case 'm': goto yy645; + case 'm': goto yy585; case 'N': - case 'n': goto yy649; + case 'n': goto yy589; case 'O': - case 'o': goto yy648; + case 'o': goto yy588; case 'S': - case 's': goto yy647; - default: goto yy602; + case 's': goto yy587; + default: goto yy542; } -yy498: +yy438: yych = *++YYCURSOR; if (yych <= '1') { - if (yych <= '/') goto yy602; - if (yych <= '0') goto yy592; - goto yy593; - } else { - if (yych <= '5') goto yy594; - if (yych <= '9') goto yy595; - goto yy602; + if (yych <= '/') goto yy542; + if (yych <= '0') goto yy532; + goto yy533; + } else { + if (yych <= '5') goto yy534; + if (yych <= '9') goto yy535; + goto yy542; } -yy499: - yyaccept = 10; +yy439: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; + if (yych == '\t') goto yy496; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '.') goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '.') goto yy496; } } else { if (yych <= 'U') { - if (yych <= '9') goto yy558; - if (yych == 'I') goto yy591; + if (yych <= '9') goto yy498; + if (yych == 'I') goto yy531; } else { - if (yych == 'W') goto yy500; - if (yych <= 'X') goto yy564; + if (yych == 'W') goto yy440; + if (yych <= 'X') goto yy504; } } -yy500: +yy440: { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@ -9555,132 +8651,132 @@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -yy501: - yyaccept = 10; +yy441: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych == 'I') goto yy589; - goto yy500; + if (yych == 'I') goto yy529; + goto yy440; } } -yy502: - yyaccept = 10; +yy442: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych == 'I') goto yy588; - goto yy500; + if (yych == 'I') goto yy528; + goto yy440; } } -yy503: +yy443: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy581; + if (yych == 'A') goto yy521; if (yych <= 'T') goto yy56; - goto yy580; + goto yy520; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy581; + goto yy521; } else { - if (yych == 'u') goto yy580; + if (yych == 'u') goto yy520; goto yy56; } } -yy504: +yy444: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'L') { - if (yych == '.') goto yy509; + if (yych == '.') goto yy449; goto yy56; } else { - if (yych <= 'M') goto yy510; - if (yych == 'P') goto yy574; + if (yych <= 'M') goto yy450; + if (yych == 'P') goto yy514; goto yy56; } } else { if (yych <= 'o') { - if (yych <= 'U') goto yy573; - if (yych == 'm') goto yy510; + if (yych <= 'U') goto yy513; + if (yych == 'm') goto yy450; goto yy56; } else { - if (yych <= 'p') goto yy574; - if (yych == 'u') goto yy573; + if (yych <= 'p') goto yy514; + if (yych == 'u') goto yy513; goto yy56; } } -yy505: +yy445: yych = *++YYCURSOR; - if (yych == 'C') goto yy568; - if (yych == 'c') goto yy568; + if (yych == 'C') goto yy508; + if (yych == 'c') goto yy508; goto yy56; -yy506: +yy446: yych = *++YYCURSOR; - if (yych == 'O') goto yy554; - if (yych == 'o') goto yy554; + if (yych == 'O') goto yy494; + if (yych == 'o') goto yy494; goto yy56; -yy507: +yy447: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy514; - if (yych <= '9') goto yy516; + if (yych <= '5') goto yy454; + if (yych <= '9') goto yy456; goto yy56; -yy508: +yy448: yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy510; - if (yych == 'm') goto yy510; + if (yych <= 'M') goto yy450; + if (yych == 'm') goto yy450; goto yy56; } -yy509: +yy449: yych = *++YYCURSOR; - if (yych == 'M') goto yy510; + if (yych == 'M') goto yy450; if (yych != 'm') goto yy56; -yy510: +yy450: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy512; - if (yych == '\t') goto yy512; + if (yych <= 0x00) goto yy452; + if (yych == '\t') goto yy452; goto yy56; } else { - if (yych <= ' ') goto yy512; + if (yych <= ' ') goto yy452; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy512; + if (yych <= 0x00) goto yy452; if (yych <= 0x08) goto yy56; } else { if (yych != ' ') goto yy56; } -yy512: +yy452: ++YYCURSOR; { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); @@ -9697,16 +8793,16 @@ TIMELIB_DEINIT; return TIMELIB_TIME12; } -yy514: - yyaccept = 11; +yy454: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy517; + if (yych == '.') goto yy457; } else { - if (yych <= '9') goto yy531; - if (yych <= ':') goto yy517; + if (yych <= '9') goto yy471; + if (yych <= ':') goto yy457; } -yy515: +yy455: { int tz_not_found; DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); @@ -9731,281 +8827,281 @@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -yy516: - yyaccept = 11; +yy456: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy517; - if (yych != ':') goto yy515; -yy517: + if (yych == '.') goto yy457; + if (yych != ':') goto yy455; +yy457: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy518; - if (yych <= '6') goto yy519; - if (yych <= '9') goto yy520; + if (yych <= '5') goto yy458; + if (yych <= '6') goto yy459; + if (yych <= '9') goto yy460; goto yy56; -yy518: - yyaccept = 11; +yy458: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy524; - goto yy515; -yy519: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy464; + goto yy455; +yy459: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych == '0') goto yy524; - goto yy515; -yy520: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych == '0') goto yy464; + goto yy455; +yy460: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '.') goto yy515; -yy521: + if (yych != '.') goto yy455; +yy461: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy522: +yy462: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy522; - goto yy515; -yy524: - yyaccept = 11; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy462; + goto yy455; +yy464: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych != '\t') goto yy515; + if (yych != '\t') goto yy455; } else { - if (yych <= ' ') goto yy525; - if (yych == '.') goto yy521; - goto yy515; + if (yych <= ' ') goto yy465; + if (yych == '.') goto yy461; + goto yy455; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy527; - if (yych == 'P') goto yy527; - goto yy515; - } else { - if (yych <= 'a') goto yy527; - if (yych == 'p') goto yy527; - goto yy515; + if (yych <= 'A') goto yy467; + if (yych == 'P') goto yy467; + goto yy455; + } else { + if (yych <= 'a') goto yy467; + if (yych == 'p') goto yy467; + goto yy455; } } -yy525: +yy465: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy525; + if (yych == '\t') goto yy465; goto yy56; } else { - if (yych <= ' ') goto yy525; + if (yych <= ' ') goto yy465; if (yych <= '@') goto yy56; } } else { if (yych <= '`') { if (yych != 'P') goto yy56; } else { - if (yych <= 'a') goto yy527; + if (yych <= 'a') goto yy467; if (yych != 'p') goto yy56; } } -yy527: +yy467: yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy529; - if (yych == 'm') goto yy529; + if (yych <= 'M') goto yy469; + if (yych == 'm') goto yy469; goto yy56; } yych = *++YYCURSOR; - if (yych == 'M') goto yy529; + if (yych == 'M') goto yy469; if (yych != 'm') goto yy56; -yy529: +yy469: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy512; - if (yych == '\t') goto yy512; + if (yych <= 0x00) goto yy452; + if (yych == '\t') goto yy452; goto yy56; } else { - if (yych <= ' ') goto yy512; + if (yych <= ' ') goto yy452; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy512; + if (yych <= 0x00) goto yy452; if (yych <= 0x08) goto yy56; - goto yy512; + goto yy452; } else { - if (yych == ' ') goto yy512; + if (yych == ' ') goto yy452; goto yy56; } -yy531: - yyaccept = 11; +yy471: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy532; - if (yych <= 0x1F) goto yy515; + if (yych == '\t') goto yy472; + if (yych <= 0x1F) goto yy455; } else { - if (yych == '.') goto yy517; - if (yych <= '9') goto yy515; - goto yy535; + if (yych == '.') goto yy457; + if (yych <= '9') goto yy455; + goto yy475; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy534; - if (yych <= 'O') goto yy515; - goto yy534; + if (yych == 'A') goto yy474; + if (yych <= 'O') goto yy455; + goto yy474; } else { if (yych <= 'a') { - if (yych <= '`') goto yy515; - goto yy534; + if (yych <= '`') goto yy455; + goto yy474; } else { - if (yych == 'p') goto yy534; - goto yy515; + if (yych == 'p') goto yy474; + goto yy455; } } } -yy532: +yy472: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy532; + if (yych == '\t') goto yy472; goto yy56; } else { - if (yych <= ' ') goto yy532; + if (yych <= ' ') goto yy472; if (yych <= '@') goto yy56; } } else { if (yych <= '`') { if (yych != 'P') goto yy56; } else { - if (yych <= 'a') goto yy534; + if (yych <= 'a') goto yy474; if (yych != 'p') goto yy56; } } -yy534: +yy474: yych = *++YYCURSOR; if (yych <= 'L') { - if (yych == '.') goto yy551; + if (yych == '.') goto yy491; goto yy56; } else { - if (yych <= 'M') goto yy552; - if (yych == 'm') goto yy552; + if (yych <= 'M') goto yy492; + if (yych == 'm') goto yy492; goto yy56; } -yy535: +yy475: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy536; - if (yych <= '6') goto yy537; - if (yych <= '9') goto yy520; + if (yych <= '5') goto yy476; + if (yych <= '6') goto yy477; + if (yych <= '9') goto yy460; goto yy56; -yy536: - yyaccept = 11; +yy476: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy538; - goto yy515; -yy537: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy478; + goto yy455; +yy477: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych != '0') goto yy515; -yy538: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych != '0') goto yy455; +yy478: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy525; - if (yych <= 0x1F) goto yy515; - goto yy525; - } else { - if (yych == '.') goto yy539; - if (yych <= '9') goto yy515; - goto yy540; + if (yych == '\t') goto yy465; + if (yych <= 0x1F) goto yy455; + goto yy465; + } else { + if (yych == '.') goto yy479; + if (yych <= '9') goto yy455; + goto yy480; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy527; - if (yych <= 'O') goto yy515; - goto yy527; + if (yych == 'A') goto yy467; + if (yych <= 'O') goto yy455; + goto yy467; } else { if (yych <= 'a') { - if (yych <= '`') goto yy515; - goto yy527; + if (yych <= '`') goto yy455; + goto yy467; } else { - if (yych == 'p') goto yy527; - goto yy515; + if (yych == 'p') goto yy467; + goto yy455; } } } -yy539: +yy479: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy549; + if (yych <= '9') goto yy489; goto yy56; -yy540: +yy480: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy541: +yy481: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; if (yych <= 'O') { if (yych <= '9') { if (yych <= '/') goto yy56; - goto yy541; + goto yy481; } else { if (yych != 'A') goto yy56; } } else { if (yych <= 'a') { - if (yych <= 'P') goto yy543; + if (yych <= 'P') goto yy483; if (yych <= '`') goto yy56; } else { if (yych != 'p') goto yy56; } } -yy543: +yy483: yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy545; - if (yych == 'm') goto yy545; + if (yych <= 'M') goto yy485; + if (yych == 'm') goto yy485; goto yy56; } yych = *++YYCURSOR; - if (yych == 'M') goto yy545; + if (yych == 'M') goto yy485; if (yych != 'm') goto yy56; -yy545: +yy485: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy547; - if (yych == '\t') goto yy547; + if (yych <= 0x00) goto yy487; + if (yych == '\t') goto yy487; goto yy56; } else { - if (yych <= ' ') goto yy547; + if (yych <= ' ') goto yy487; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy547; + if (yych <= 0x00) goto yy487; if (yych <= 0x08) goto yy56; } else { if (yych != ' ') goto yy56; } -yy547: +yy487: ++YYCURSOR; { DEBUG_OUTPUT("mssqltime"); @@ -10025,100 +9121,100 @@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -yy549: - yyaccept = 11; +yy489: + yyaccept = 10; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; if (yych <= 'O') { if (yych <= '9') { - if (yych <= '/') goto yy515; - goto yy549; + if (yych <= '/') goto yy455; + goto yy489; } else { - if (yych == 'A') goto yy543; - goto yy515; + if (yych == 'A') goto yy483; + goto yy455; } } else { if (yych <= 'a') { - if (yych <= 'P') goto yy543; - if (yych <= '`') goto yy515; - goto yy543; + if (yych <= 'P') goto yy483; + if (yych <= '`') goto yy455; + goto yy483; } else { - if (yych == 'p') goto yy543; - goto yy515; + if (yych == 'p') goto yy483; + goto yy455; } } -yy551: +yy491: yych = *++YYCURSOR; - if (yych == 'M') goto yy552; + if (yych == 'M') goto yy492; if (yych != 'm') goto yy56; -yy552: +yy492: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy512; - if (yych == '\t') goto yy512; + if (yych <= 0x00) goto yy452; + if (yych == '\t') goto yy452; goto yy56; } else { - if (yych <= ' ') goto yy512; + if (yych <= ' ') goto yy452; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy512; + if (yych <= 0x00) goto yy452; if (yych <= 0x08) goto yy56; - goto yy512; + goto yy452; } else { - if (yych == ' ') goto yy512; + if (yych == ' ') goto yy452; goto yy56; } -yy554: +yy494: yych = *++YYCURSOR; - if (yych == 'V') goto yy555; + if (yych == 'V') goto yy495; if (yych != 'v') goto yy56; -yy555: - yyaccept = 10; +yy495: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych != '\t') goto yy500; + if (yych != '\t') goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy560; - if (yych == 'e') goto yy560; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy500; + if (yych == 'e') goto yy500; + goto yy440; } } -yy556: +yy496: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; -yy557: +yy497: if (yych <= ' ') { - if (yych == '\t') goto yy556; + if (yych == '\t') goto yy496; if (yych <= 0x1F) goto yy56; - goto yy556; + goto yy496; } else { if (yych <= '.') { if (yych <= ',') goto yy56; - goto yy556; + goto yy496; } else { if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; } } -yy558: +yy498: ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy559; - if (yych <= '9') goto yy565; -yy559: + if ((yych = *YYCURSOR) <= '/') goto yy499; + if (yych <= '9') goto yy505; +yy499: { int length = 0; DEBUG_OUTPUT("datefull"); @@ -10132,665 +9228,665 @@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } -yy560: +yy500: yych = *++YYCURSOR; - if (yych == 'M') goto yy561; + if (yych == 'M') goto yy501; if (yych != 'm') goto yy56; -yy561: +yy501: yych = *++YYCURSOR; - if (yych == 'B') goto yy562; + if (yych == 'B') goto yy502; if (yych != 'b') goto yy56; -yy562: +yy502: yych = *++YYCURSOR; - if (yych == 'E') goto yy563; + if (yych == 'E') goto yy503; if (yych != 'e') goto yy56; -yy563: +yy503: yych = *++YYCURSOR; - if (yych == 'R') goto yy564; + if (yych == 'R') goto yy504; if (yych != 'r') goto yy56; -yy564: - yyaccept = 10; +yy504: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy556; - if (yych <= 0x1F) goto yy500; - goto yy556; + if (yych == '\t') goto yy496; + if (yych <= 0x1F) goto yy440; + goto yy496; } else { if (yych <= '.') { - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ',') goto yy440; + goto yy496; } else { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } } -yy565: +yy505: yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych >= ':') goto yy559; -yy566: + if (yych <= '/') goto yy499; + if (yych >= ':') goto yy499; +yy506: yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych >= ':') goto yy559; + if (yych <= '/') goto yy499; + if (yych >= ':') goto yy499; yych = *++YYCURSOR; - goto yy559; -yy568: + goto yy499; +yy508: yych = *++YYCURSOR; - if (yych == 'T') goto yy569; + if (yych == 'T') goto yy509; if (yych != 't') goto yy56; -yy569: - yyaccept = 10; +yy509: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'N') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'O') goto yy570; - if (yych != 'o') goto yy500; + if (yych <= 'O') goto yy510; + if (yych != 'o') goto yy440; } } -yy570: +yy510: yych = *++YYCURSOR; - if (yych == 'B') goto yy571; + if (yych == 'B') goto yy511; if (yych != 'b') goto yy56; -yy571: +yy511: yych = *++YYCURSOR; - if (yych == 'E') goto yy572; + if (yych == 'E') goto yy512; if (yych != 'e') goto yy56; -yy572: +yy512: yych = *++YYCURSOR; - if (yych == 'R') goto yy564; - if (yych == 'r') goto yy564; + if (yych == 'R') goto yy504; + if (yych == 'r') goto yy504; goto yy56; -yy573: +yy513: yych = *++YYCURSOR; - if (yych == 'G') goto yy577; - if (yych == 'g') goto yy577; + if (yych == 'G') goto yy517; + if (yych == 'g') goto yy517; goto yy56; -yy574: +yy514: yych = *++YYCURSOR; - if (yych == 'R') goto yy575; + if (yych == 'R') goto yy515; if (yych != 'r') goto yy56; -yy575: - yyaccept = 10; +yy515: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'H') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'I') goto yy576; - if (yych != 'i') goto yy500; + if (yych <= 'I') goto yy516; + if (yych != 'i') goto yy440; } } -yy576: +yy516: yych = *++YYCURSOR; - if (yych == 'L') goto yy564; - if (yych == 'l') goto yy564; + if (yych == 'L') goto yy504; + if (yych == 'l') goto yy504; goto yy56; -yy577: - yyaccept = 10; +yy517: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'U') goto yy578; - if (yych != 'u') goto yy500; + if (yych <= 'U') goto yy518; + if (yych != 'u') goto yy440; } } -yy578: +yy518: yych = *++YYCURSOR; - if (yych == 'S') goto yy579; + if (yych == 'S') goto yy519; if (yych != 's') goto yy56; -yy579: +yy519: yych = *++YYCURSOR; - if (yych == 'T') goto yy564; - if (yych == 't') goto yy564; + if (yych == 'T') goto yy504; + if (yych == 't') goto yy504; goto yy56; -yy580: +yy520: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy587; + if (yych == 'L') goto yy527; if (yych <= 'M') goto yy56; - goto yy586; + goto yy526; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy587; + goto yy527; } else { - if (yych == 'n') goto yy586; + if (yych == 'n') goto yy526; goto yy56; } } -yy581: +yy521: yych = *++YYCURSOR; - if (yych == 'N') goto yy582; + if (yych == 'N') goto yy522; if (yych != 'n') goto yy56; -yy582: - yyaccept = 10; +yy522: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'U') goto yy583; - if (yych != 'u') goto yy500; + if (yych <= 'U') goto yy523; + if (yych != 'u') goto yy440; } } -yy583: +yy523: yych = *++YYCURSOR; - if (yych == 'A') goto yy584; + if (yych == 'A') goto yy524; if (yych != 'a') goto yy56; -yy584: +yy524: yych = *++YYCURSOR; - if (yych == 'R') goto yy585; + if (yych == 'R') goto yy525; if (yych != 'r') goto yy56; -yy585: +yy525: yych = *++YYCURSOR; - if (yych == 'Y') goto yy564; - if (yych == 'y') goto yy564; + if (yych == 'Y') goto yy504; + if (yych == 'y') goto yy504; goto yy56; -yy586: - yyaccept = 10; +yy526: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy564; - if (yych == 'e') goto yy564; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy504; + if (yych == 'e') goto yy504; + goto yy440; } } -yy587: - yyaccept = 10; +yy527: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'X') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'Y') goto yy564; - if (yych == 'y') goto yy564; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'Y') goto yy504; + if (yych == 'y') goto yy504; + goto yy440; } } -yy588: - yyaccept = 10; +yy528: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych == 'I') goto yy564; - goto yy500; + if (yych == 'I') goto yy504; + goto yy440; } } -yy589: - yyaccept = 10; +yy529: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych != 'I') goto yy500; + if (yych != 'I') goto yy440; } } - yyaccept = 10; + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych == 'I') goto yy564; - goto yy500; + if (yych == 'I') goto yy504; + goto yy440; } } -yy591: - yyaccept = 10; +yy531: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '9') { - if (yych <= '.') goto yy556; - if (yych <= '/') goto yy500; - goto yy558; + if (yych <= '.') goto yy496; + if (yych <= '/') goto yy440; + goto yy498; } else { - if (yych == 'I') goto yy564; - goto yy500; + if (yych == 'I') goto yy504; + goto yy440; } } -yy592: - yyaccept = 11; +yy532: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - goto yy625; - } else { - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy639; - if (yych <= ':') goto yy517; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + goto yy565; + } else { + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy579; + if (yych <= ':') goto yy457; + goto yy455; } -yy593: - yyaccept = 11; +yy533: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - if (yych <= '.') goto yy625; - goto yy515; - } else { - if (yych <= '2') goto yy639; - if (yych <= '9') goto yy638; - if (yych <= ':') goto yy517; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + if (yych <= '.') goto yy565; + goto yy455; + } else { + if (yych <= '2') goto yy579; + if (yych <= '9') goto yy578; + if (yych <= ':') goto yy457; + goto yy455; } -yy594: - yyaccept = 11; +yy534: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - goto yy625; - } else { - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy638; - if (yych <= ':') goto yy517; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + goto yy565; + } else { + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy578; + if (yych <= ':') goto yy457; + goto yy455; } -yy595: - yyaccept = 11; +yy535: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - goto yy625; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + goto yy565; } else { - if (yych == ':') goto yy517; - goto yy515; + if (yych == ':') goto yy457; + goto yy455; } -yy596: +yy536: yych = *++YYCURSOR; - if (yych == 'E') goto yy619; - if (yych == 'e') goto yy619; + if (yych == 'E') goto yy559; + if (yych == 'e') goto yy559; goto yy56; -yy597: +yy537: yych = *++YYCURSOR; - if (yych == 'A') goto yy616; - if (yych == 'a') goto yy616; + if (yych == 'A') goto yy556; + if (yych == 'a') goto yy556; goto yy56; -yy598: +yy538: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy574; + if (yych == 'P') goto yy514; if (yych <= 'T') goto yy56; - goto yy573; + goto yy513; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy574; + goto yy514; } else { - if (yych == 'u') goto yy573; + if (yych == 'u') goto yy513; goto yy56; } } -yy599: +yy539: yych = *++YYCURSOR; - if (yych == 'E') goto yy609; - if (yych == 'e') goto yy609; + if (yych == 'E') goto yy549; + if (yych == 'e') goto yy549; goto yy56; -yy600: +yy540: yych = *++YYCURSOR; - if (yych == 'E') goto yy603; - if (yych == 'e') goto yy603; + if (yych == 'E') goto yy543; + if (yych == 'e') goto yy543; goto yy56; -yy601: +yy541: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy602: +yy542: switch (yych) { case '\t': case ' ': case '-': - case '.': goto yy601; + case '.': goto yy541; case 'A': - case 'a': goto yy598; + case 'a': goto yy538; case 'D': - case 'd': goto yy600; + case 'd': goto yy540; case 'F': - case 'f': goto yy596; - case 'I': goto yy499; + case 'f': goto yy536; + case 'I': goto yy439; case 'J': - case 'j': goto yy503; + case 'j': goto yy443; case 'M': - case 'm': goto yy597; + case 'm': goto yy537; case 'N': - case 'n': goto yy506; + case 'n': goto yy446; case 'O': - case 'o': goto yy505; + case 'o': goto yy445; case 'S': - case 's': goto yy599; - case 'V': goto yy501; - case 'X': goto yy502; + case 's': goto yy539; + case 'V': goto yy441; + case 'X': goto yy442; default: goto yy56; } -yy603: +yy543: yych = *++YYCURSOR; - if (yych == 'C') goto yy604; + if (yych == 'C') goto yy544; if (yych != 'c') goto yy56; -yy604: - yyaccept = 10; +yy544: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'E') goto yy605; - if (yych != 'e') goto yy500; + if (yych <= 'E') goto yy545; + if (yych != 'e') goto yy440; } } -yy605: +yy545: yych = *++YYCURSOR; - if (yych == 'M') goto yy606; + if (yych == 'M') goto yy546; if (yych != 'm') goto yy56; -yy606: +yy546: yych = *++YYCURSOR; - if (yych == 'B') goto yy607; + if (yych == 'B') goto yy547; if (yych != 'b') goto yy56; -yy607: +yy547: yych = *++YYCURSOR; - if (yych == 'E') goto yy608; + if (yych == 'E') goto yy548; if (yych != 'e') goto yy56; -yy608: +yy548: yych = *++YYCURSOR; - if (yych == 'R') goto yy564; - if (yych == 'r') goto yy564; + if (yych == 'R') goto yy504; + if (yych == 'r') goto yy504; goto yy56; -yy609: +yy549: yych = *++YYCURSOR; - if (yych == 'P') goto yy610; + if (yych == 'P') goto yy550; if (yych != 'p') goto yy56; -yy610: - yyaccept = 10; +yy550: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'S') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'T') goto yy611; - if (yych != 't') goto yy500; + if (yych <= 'T') goto yy551; + if (yych != 't') goto yy440; } } -yy611: - yyaccept = 10; +yy551: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'E') goto yy612; - if (yych != 'e') goto yy500; + if (yych <= 'E') goto yy552; + if (yych != 'e') goto yy440; } } -yy612: +yy552: yych = *++YYCURSOR; - if (yych == 'M') goto yy613; + if (yych == 'M') goto yy553; if (yych != 'm') goto yy56; -yy613: +yy553: yych = *++YYCURSOR; - if (yych == 'B') goto yy614; + if (yych == 'B') goto yy554; if (yych != 'b') goto yy56; -yy614: +yy554: yych = *++YYCURSOR; - if (yych == 'E') goto yy615; + if (yych == 'E') goto yy555; if (yych != 'e') goto yy56; -yy615: +yy555: yych = *++YYCURSOR; - if (yych == 'R') goto yy564; - if (yych == 'r') goto yy564; + if (yych == 'R') goto yy504; + if (yych == 'r') goto yy504; goto yy56; -yy616: +yy556: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy617; + if (yych == 'R') goto yy557; if (yych <= 'X') goto yy56; - goto yy564; + goto yy504; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; } else { - if (yych == 'y') goto yy564; + if (yych == 'y') goto yy504; goto yy56; } } -yy617: - yyaccept = 10; +yy557: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'B') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'C') goto yy618; - if (yych != 'c') goto yy500; + if (yych <= 'C') goto yy558; + if (yych != 'c') goto yy440; } } -yy618: +yy558: yych = *++YYCURSOR; - if (yych == 'H') goto yy564; - if (yych == 'h') goto yy564; + if (yych == 'H') goto yy504; + if (yych == 'h') goto yy504; goto yy56; -yy619: +yy559: yych = *++YYCURSOR; - if (yych == 'B') goto yy620; + if (yych == 'B') goto yy560; if (yych != 'b') goto yy56; -yy620: - yyaccept = 10; +yy560: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + goto yy496; } } else { if (yych <= 'Q') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'R') goto yy621; - if (yych != 'r') goto yy500; + if (yych <= 'R') goto yy561; + if (yych != 'r') goto yy440; } } -yy621: +yy561: yych = *++YYCURSOR; - if (yych == 'U') goto yy622; + if (yych == 'U') goto yy562; if (yych != 'u') goto yy56; -yy622: +yy562: yych = *++YYCURSOR; - if (yych == 'A') goto yy623; + if (yych == 'A') goto yy563; if (yych != 'a') goto yy56; -yy623: +yy563: yych = *++YYCURSOR; - if (yych == 'R') goto yy624; + if (yych == 'R') goto yy564; if (yych != 'r') goto yy56; -yy624: +yy564: yych = *++YYCURSOR; - if (yych == 'Y') goto yy564; - if (yych == 'y') goto yy564; + if (yych == 'Y') goto yy504; + if (yych == 'y') goto yy504; goto yy56; -yy625: +yy565: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy632; - if (yych <= '6') goto yy633; - if (yych <= '9') goto yy634; + if (yych <= '5') goto yy572; + if (yych <= '6') goto yy573; + if (yych <= '9') goto yy574; goto yy56; -yy626: +yy566: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy628: +yy568: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy629: +yy569: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; @@ -10805,36 +9901,36 @@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -yy632: - yyaccept = 11; +yy572: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy637; - goto yy515; -yy633: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy577; + goto yy455; +yy573: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy521; - goto yy515; + if (yych == '.') goto yy461; + goto yy455; } else { - if (yych <= '0') goto yy637; - if (yych <= '9') goto yy635; - goto yy515; + if (yych <= '0') goto yy577; + if (yych <= '9') goto yy575; + goto yy455; } -yy634: - yyaccept = 11; +yy574: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych >= ':') goto yy515; -yy635: - yyaccept = 12; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych >= ':') goto yy455; +yy575: + yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy636; - if (yych <= '9') goto yy629; -yy636: + if (yych <= '/') goto yy576; + if (yych <= '9') goto yy569; +yy576: { int length = 0; DEBUG_OUTPUT("pointed date YY"); @@ -10847,601 +9943,601 @@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -yy637: - yyaccept = 11; +yy577: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= ' ') { - if (yych == '\t') goto yy525; - if (yych <= 0x1F) goto yy515; - goto yy525; - } else { - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - goto yy629; + if (yych == '\t') goto yy465; + if (yych <= 0x1F) goto yy455; + goto yy465; + } else { + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + goto yy569; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy527; - if (yych <= 'O') goto yy515; - goto yy527; + if (yych == 'A') goto yy467; + if (yych <= 'O') goto yy455; + goto yy467; } else { if (yych <= 'a') { - if (yych <= '`') goto yy515; - goto yy527; + if (yych <= '`') goto yy455; + goto yy467; } else { - if (yych == 'p') goto yy527; - goto yy515; + if (yych == 'p') goto yy467; + goto yy455; } } } -yy638: - yyaccept = 11; +yy578: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy532; - if (yych <= 0x1F) goto yy515; - goto yy532; - } else { - if (yych == '.') goto yy517; - if (yych <= '9') goto yy515; - goto yy517; + if (yych == '\t') goto yy472; + if (yych <= 0x1F) goto yy455; + goto yy472; + } else { + if (yych == '.') goto yy457; + if (yych <= '9') goto yy455; + goto yy457; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy534; - if (yych <= 'O') goto yy515; - goto yy534; + if (yych == 'A') goto yy474; + if (yych <= 'O') goto yy455; + goto yy474; } else { if (yych <= 'a') { - if (yych <= '`') goto yy515; - goto yy534; + if (yych <= '`') goto yy455; + goto yy474; } else { - if (yych == 'p') goto yy534; - goto yy515; + if (yych == 'p') goto yy474; + goto yy455; } } } -yy639: - yyaccept = 11; +yy579: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy532; - if (yych <= 0x1F) goto yy515; - goto yy532; + if (yych == '\t') goto yy472; + if (yych <= 0x1F) goto yy455; + goto yy472; } else { if (yych <= '-') { - if (yych <= ',') goto yy515; - goto yy626; + if (yych <= ',') goto yy455; + goto yy566; } else { - if (yych <= '.') goto yy625; - if (yych <= '9') goto yy515; - goto yy517; + if (yych <= '.') goto yy565; + if (yych <= '9') goto yy455; + goto yy457; } } } else { if (yych <= 'P') { - if (yych == 'A') goto yy534; - if (yych <= 'O') goto yy515; - goto yy534; + if (yych == 'A') goto yy474; + if (yych <= 'O') goto yy455; + goto yy474; } else { if (yych <= 'a') { - if (yych <= '`') goto yy515; - goto yy534; + if (yych <= '`') goto yy455; + goto yy474; } else { - if (yych == 'p') goto yy534; - goto yy515; + if (yych == 'p') goto yy474; + goto yy455; } } } -yy640: +yy580: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy679; - goto yy626; + if (yych <= '-') goto yy619; + goto yy566; } else { if (yych <= '/') goto yy56; - if (yych <= '9') goto yy642; + if (yych <= '9') goto yy582; goto yy56; } -yy641: +yy581: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy679; - goto yy626; + if (yych <= '-') goto yy619; + goto yy566; } else { if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; } -yy642: +yy582: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '-') goto yy679; - if (yych <= '.') goto yy626; + if (yych <= '-') goto yy619; + if (yych <= '.') goto yy566; goto yy56; -yy643: +yy583: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy675; + if (yych == 'A') goto yy615; if (yych <= 'T') goto yy56; - goto yy674; + goto yy614; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy675; + goto yy615; } else { - if (yych == 'u') goto yy674; + if (yych == 'u') goto yy614; goto yy56; } } -yy644: +yy584: yych = *++YYCURSOR; - if (yych == 'E') goto yy672; - if (yych == 'e') goto yy672; + if (yych == 'E') goto yy612; + if (yych == 'e') goto yy612; goto yy56; -yy645: +yy585: yych = *++YYCURSOR; - if (yych == 'A') goto yy669; - if (yych == 'a') goto yy669; + if (yych == 'A') goto yy609; + if (yych == 'a') goto yy609; goto yy56; -yy646: +yy586: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy666; + if (yych == 'P') goto yy606; if (yych <= 'T') goto yy56; - goto yy665; + goto yy605; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy666; + goto yy606; } else { - if (yych == 'u') goto yy665; + if (yych == 'u') goto yy605; goto yy56; } } -yy647: +yy587: yych = *++YYCURSOR; - if (yych == 'E') goto yy662; - if (yych == 'e') goto yy662; + if (yych == 'E') goto yy602; + if (yych == 'e') goto yy602; goto yy56; -yy648: +yy588: yych = *++YYCURSOR; - if (yych == 'C') goto yy660; - if (yych == 'c') goto yy660; + if (yych == 'C') goto yy600; + if (yych == 'c') goto yy600; goto yy56; -yy649: +yy589: yych = *++YYCURSOR; - if (yych == 'O') goto yy658; - if (yych == 'o') goto yy658; + if (yych == 'O') goto yy598; + if (yych == 'o') goto yy598; goto yy56; -yy650: +yy590: yych = *++YYCURSOR; - if (yych == 'E') goto yy651; + if (yych == 'E') goto yy591; if (yych != 'e') goto yy56; -yy651: +yy591: yych = *++YYCURSOR; - if (yych == 'C') goto yy652; + if (yych == 'C') goto yy592; if (yych != 'c') goto yy56; -yy652: - yyaccept = 10; +yy592: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych >= '.') goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych >= '.') goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy605; - if (yych == 'e') goto yy605; - goto yy500; - } - } -yy653: - yych = *++YYCURSOR; - if (yych <= '/') goto yy557; - if (yych <= '0') goto yy654; - if (yych <= '2') goto yy655; - if (yych <= '3') goto yy656; - goto yy557; -yy654: - yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych <= '9') goto yy657; - goto yy559; -yy655: - yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych <= '9') goto yy657; - goto yy559; -yy656: - yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych <= '1') goto yy657; - if (yych <= '9') goto yy565; - goto yy559; -yy657: + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy545; + if (yych == 'e') goto yy545; + goto yy440; + } + } +yy593: yych = *++YYCURSOR; - if (yych <= '/') goto yy559; - if (yych <= '9') goto yy566; - goto yy559; -yy658: + if (yych <= '/') goto yy497; + if (yych <= '0') goto yy594; + if (yych <= '2') goto yy595; + if (yych <= '3') goto yy596; + goto yy497; +yy594: + yych = *++YYCURSOR; + if (yych <= '/') goto yy499; + if (yych <= '9') goto yy597; + goto yy499; +yy595: + yych = *++YYCURSOR; + if (yych <= '/') goto yy499; + if (yych <= '9') goto yy597; + goto yy499; +yy596: + yych = *++YYCURSOR; + if (yych <= '/') goto yy499; + if (yych <= '1') goto yy597; + if (yych <= '9') goto yy505; + goto yy499; +yy597: + yych = *++YYCURSOR; + if (yych <= '/') goto yy499; + if (yych <= '9') goto yy506; + goto yy499; +yy598: yych = *++YYCURSOR; - if (yych == 'V') goto yy659; + if (yych == 'V') goto yy599; if (yych != 'v') goto yy56; -yy659: - yyaccept = 10; +yy599: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy560; - if (yych == 'e') goto yy560; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy500; + if (yych == 'e') goto yy500; + goto yy440; } } -yy660: +yy600: yych = *++YYCURSOR; - if (yych == 'T') goto yy661; + if (yych == 'T') goto yy601; if (yych != 't') goto yy56; -yy661: - yyaccept = 10; +yy601: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'N') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'O') goto yy570; - if (yych == 'o') goto yy570; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'O') goto yy510; + if (yych == 'o') goto yy510; + goto yy440; } } -yy662: +yy602: yych = *++YYCURSOR; - if (yych == 'P') goto yy663; + if (yych == 'P') goto yy603; if (yych != 'p') goto yy56; -yy663: - yyaccept = 10; +yy603: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'S') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } else { - if (yych <= 'T') goto yy664; - if (yych != 't') goto yy500; + if (yych <= 'T') goto yy604; + if (yych != 't') goto yy440; } } -yy664: - yyaccept = 10; +yy604: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy612; - if (yych == 'e') goto yy612; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy552; + if (yych == 'e') goto yy552; + goto yy440; } } -yy665: +yy605: yych = *++YYCURSOR; - if (yych == 'G') goto yy668; - if (yych == 'g') goto yy668; + if (yych == 'G') goto yy608; + if (yych == 'g') goto yy608; goto yy56; -yy666: +yy606: yych = *++YYCURSOR; - if (yych == 'R') goto yy667; + if (yych == 'R') goto yy607; if (yych != 'r') goto yy56; -yy667: - yyaccept = 10; +yy607: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'H') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'I') goto yy576; - if (yych == 'i') goto yy576; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'I') goto yy516; + if (yych == 'i') goto yy516; + goto yy440; } } -yy668: - yyaccept = 10; +yy608: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'U') goto yy578; - if (yych == 'u') goto yy578; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'U') goto yy518; + if (yych == 'u') goto yy518; + goto yy440; } } -yy669: +yy609: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy670; + if (yych == 'R') goto yy610; if (yych <= 'X') goto yy56; - goto yy671; + goto yy611; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; } else { - if (yych == 'y') goto yy671; + if (yych == 'y') goto yy611; goto yy56; } } -yy670: - yyaccept = 10; +yy610: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'B') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'C') goto yy618; - if (yych == 'c') goto yy618; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'C') goto yy558; + if (yych == 'c') goto yy558; + goto yy440; } } -yy671: - yyaccept = 10; +yy611: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy500; - goto yy556; + if (yych <= 0x08) goto yy440; + goto yy496; } else { - if (yych == ' ') goto yy556; - goto yy500; + if (yych == ' ') goto yy496; + goto yy440; } } else { if (yych <= '.') { - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= '-') goto yy593; + goto yy496; } else { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; } } -yy672: +yy612: yych = *++YYCURSOR; - if (yych == 'B') goto yy673; + if (yych == 'B') goto yy613; if (yych != 'b') goto yy56; -yy673: - yyaccept = 10; +yy613: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'Q') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'R') goto yy621; - if (yych == 'r') goto yy621; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'R') goto yy561; + if (yych == 'r') goto yy561; + goto yy440; } } -yy674: +yy614: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy678; + if (yych == 'L') goto yy618; if (yych <= 'M') goto yy56; - goto yy677; + goto yy617; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy678; + goto yy618; } else { - if (yych == 'n') goto yy677; + if (yych == 'n') goto yy617; goto yy56; } } -yy675: +yy615: yych = *++YYCURSOR; - if (yych == 'N') goto yy676; + if (yych == 'N') goto yy616; if (yych != 'n') goto yy56; -yy676: - yyaccept = 10; +yy616: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'U') goto yy583; - if (yych == 'u') goto yy583; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'U') goto yy523; + if (yych == 'u') goto yy523; + goto yy440; } - } -yy677: - yyaccept = 10; + } +yy617: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'E') goto yy564; - if (yych == 'e') goto yy564; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'E') goto yy504; + if (yych == 'e') goto yy504; + goto yy440; } } -yy678: - yyaccept = 10; +yy618: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy556; - goto yy500; + if (yych == '\t') goto yy496; + goto yy440; } else { - if (yych <= ' ') goto yy556; - if (yych <= ',') goto yy500; - if (yych <= '-') goto yy653; - goto yy556; + if (yych <= ' ') goto yy496; + if (yych <= ',') goto yy440; + if (yych <= '-') goto yy593; + goto yy496; } } else { if (yych <= 'X') { - if (yych <= '/') goto yy500; - if (yych <= '9') goto yy558; - goto yy500; - } else { - if (yych <= 'Y') goto yy564; - if (yych == 'y') goto yy564; - goto yy500; + if (yych <= '/') goto yy440; + if (yych <= '9') goto yy498; + goto yy440; + } else { + if (yych <= 'Y') goto yy504; + if (yych == 'y') goto yy504; + goto yy440; } } -yy679: +yy619: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy680; - if (yych <= '3') goto yy682; - if (yych <= '9') goto yy683; + if (yych <= '2') goto yy620; + if (yych <= '3') goto yy622; + if (yych <= '9') goto yy623; goto yy56; -yy680: - yyaccept = 13; +yy620: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy689; - if (yych >= 'n') goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy629; + if (yych >= 'n') goto yy625; } else { if (yych <= 'r') { - if (yych >= 'r') goto yy686; + if (yych >= 'r') goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; } } -yy681: +yy621: { int length = 0; DEBUG_OUTPUT("gnudateshort"); @@ -11454,101 +10550,101 @@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -yy682: - yyaccept = 13; +yy622: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '1') { - if (yych <= '/') goto yy681; - goto yy689; + if (yych <= '/') goto yy621; + goto yy629; } else { - if (yych <= '9') goto yy628; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '9') goto yy568; + if (yych <= 'm') goto yy621; + goto yy625; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy683: - yyaccept = 13; +yy623: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy628; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy568; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy684: +yy624: yych = *++YYCURSOR; - if (yych == 't') goto yy688; + if (yych == 't') goto yy628; goto yy56; -yy685: +yy625: yych = *++YYCURSOR; - if (yych == 'd') goto yy688; + if (yych == 'd') goto yy628; goto yy56; -yy686: +yy626: yych = *++YYCURSOR; - if (yych == 'd') goto yy688; + if (yych == 'd') goto yy628; goto yy56; -yy687: +yy627: yych = *++YYCURSOR; if (yych != 'h') goto yy56; -yy688: +yy628: yych = *++YYCURSOR; - goto yy681; -yy689: - yyaccept = 13; + goto yy621; +yy629: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy629; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy569; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy690: - yyaccept = 14; +yy630: + yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '/') { - if (yych >= '/') goto yy747; + if (yych >= '/') goto yy687; } else { - if (yych <= '9') goto yy693; - if (yych >= 'n') goto yy744; + if (yych <= '9') goto yy633; + if (yych >= 'n') goto yy684; } } else { if (yych <= 'r') { - if (yych >= 'r') goto yy745; + if (yych >= 'r') goto yy685; } else { - if (yych <= 's') goto yy743; - if (yych <= 't') goto yy746; + if (yych <= 's') goto yy683; + if (yych <= 't') goto yy686; } } -yy691: +yy631: { int length = 0; DEBUG_OUTPUT("americanshort | american"); @@ -11563,112 +10659,112 @@ TIMELIB_DEINIT; return TIMELIB_AMERICAN; } -yy692: - yyaccept = 14; +yy632: + yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '/') { - if (yych <= '.') goto yy691; - goto yy747; + if (yych <= '.') goto yy631; + goto yy687; } else { - if (yych <= '1') goto yy693; - if (yych <= 'm') goto yy691; - goto yy744; + if (yych <= '1') goto yy633; + if (yych <= 'm') goto yy631; + goto yy684; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy691; - goto yy745; + if (yych <= 'q') goto yy631; + goto yy685; } else { - if (yych <= 's') goto yy743; - if (yych <= 't') goto yy746; - goto yy691; + if (yych <= 's') goto yy683; + if (yych <= 't') goto yy686; + goto yy631; } } -yy693: - yyaccept = 14; +yy633: + yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == '/') goto yy747; - if (yych <= 'm') goto yy691; - goto yy744; + if (yych == '/') goto yy687; + if (yych <= 'm') goto yy631; + goto yy684; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy691; - goto yy745; + if (yych <= 'q') goto yy631; + goto yy685; } else { - if (yych <= 's') goto yy743; - if (yych <= 't') goto yy746; - goto yy691; + if (yych <= 's') goto yy683; + if (yych <= 't') goto yy686; + goto yy631; } } -yy694: +yy634: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy742; + if (yych == 'A') goto yy682; if (yych <= 'T') goto yy56; - goto yy741; + goto yy681; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy742; + goto yy682; } else { - if (yych == 'u') goto yy741; + if (yych == 'u') goto yy681; goto yy56; } } -yy695: +yy635: yych = *++YYCURSOR; - if (yych == 'E') goto yy740; - if (yych == 'e') goto yy740; + if (yych == 'E') goto yy680; + if (yych == 'e') goto yy680; goto yy56; -yy696: +yy636: yych = *++YYCURSOR; - if (yych == 'A') goto yy739; - if (yych == 'a') goto yy739; + if (yych == 'A') goto yy679; + if (yych == 'a') goto yy679; goto yy56; -yy697: +yy637: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy738; + if (yych == 'P') goto yy678; if (yych <= 'T') goto yy56; - goto yy737; + goto yy677; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy738; + goto yy678; } else { - if (yych == 'u') goto yy737; + if (yych == 'u') goto yy677; goto yy56; } } -yy698: +yy638: yych = *++YYCURSOR; - if (yych == 'E') goto yy735; - if (yych == 'e') goto yy735; + if (yych == 'E') goto yy675; + if (yych == 'e') goto yy675; goto yy56; -yy699: +yy639: yych = *++YYCURSOR; - if (yych == 'C') goto yy734; - if (yych == 'c') goto yy734; + if (yych == 'C') goto yy674; + if (yych == 'c') goto yy674; goto yy56; -yy700: +yy640: yych = *++YYCURSOR; - if (yych == 'O') goto yy733; - if (yych == 'o') goto yy733; + if (yych == 'O') goto yy673; + if (yych == 'o') goto yy673; goto yy56; -yy701: +yy641: yych = *++YYCURSOR; - if (yych == 'E') goto yy702; + if (yych == 'E') goto yy642; if (yych != 'e') goto yy56; -yy702: +yy642: yych = *++YYCURSOR; - if (yych == 'C') goto yy703; + if (yych == 'C') goto yy643; if (yych != 'c') goto yy56; -yy703: +yy643: yych = *++YYCURSOR; if (yych != '/') goto yy56; -yy704: +yy644: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; @@ -11685,19 +10781,19 @@ if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy710; - if (yych <= '2') goto yy711; + if (yych <= '1') goto yy650; + if (yych <= '2') goto yy651; goto yy56; -yy710: +yy650: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy712; + if (yych <= '9') goto yy652; goto yy56; -yy711: +yy651: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '5') goto yy56; -yy712: +yy652: yych = *++YYCURSOR; if (yych != ':') goto yy56; yych = *++YYCURSOR; @@ -11710,57 +10806,57 @@ if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy717; - if (yych <= '6') goto yy718; + if (yych <= '5') goto yy657; + if (yych <= '6') goto yy658; goto yy56; -yy717: +yy657: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy719; + if (yych <= '9') goto yy659; goto yy56; -yy718: +yy658: yych = *++YYCURSOR; if (yych != '0') goto yy56; -yy719: +yy659: yych = *++YYCURSOR; - if (yych == '\t') goto yy720; + if (yych == '\t') goto yy660; if (yych != ' ') goto yy56; -yy720: +yy660: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; if (yych <= '*') { if (yych <= '\t') { if (yych <= 0x08) goto yy56; - goto yy720; + goto yy660; } else { - if (yych == ' ') goto yy720; + if (yych == ' ') goto yy660; goto yy56; } } else { if (yych <= '-') { if (yych == ',') goto yy56; - goto yy723; + goto yy663; } else { if (yych != 'G') goto yy56; } } yych = *++YYCURSOR; - if (yych == 'M') goto yy731; + if (yych == 'M') goto yy671; goto yy56; -yy723: +yy663: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy724; - if (yych <= '2') goto yy726; - if (yych <= '9') goto yy727; + if (yych <= '1') goto yy664; + if (yych <= '2') goto yy666; + if (yych <= '9') goto yy667; goto yy56; -yy724: +yy664: ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy725; - if (yych <= '9') goto yy727; - if (yych <= ':') goto yy728; -yy725: + if ((yych = *YYCURSOR) <= '/') goto yy665; + if (yych <= '9') goto yy667; + if (yych <= ':') goto yy668; +yy665: { int tz_not_found; DEBUG_OUTPUT("clf"); @@ -11780,260 +10876,260 @@ TIMELIB_DEINIT; return TIMELIB_CLF; } -yy726: +yy666: yych = *++YYCURSOR; if (yych <= '5') { - if (yych <= '/') goto yy725; - if (yych >= '5') goto yy729; + if (yych <= '/') goto yy665; + if (yych >= '5') goto yy669; } else { - if (yych <= '9') goto yy730; - if (yych <= ':') goto yy728; - goto yy725; + if (yych <= '9') goto yy670; + if (yych <= ':') goto yy668; + goto yy665; } -yy727: +yy667: yych = *++YYCURSOR; - if (yych <= '/') goto yy725; - if (yych <= '5') goto yy729; - if (yych <= '9') goto yy730; - if (yych >= ';') goto yy725; -yy728: + if (yych <= '/') goto yy665; + if (yych <= '5') goto yy669; + if (yych <= '9') goto yy670; + if (yych >= ';') goto yy665; +yy668: yych = *++YYCURSOR; - if (yych <= '/') goto yy725; - if (yych <= '5') goto yy729; - if (yych <= '9') goto yy730; - goto yy725; -yy729: + if (yych <= '/') goto yy665; + if (yych <= '5') goto yy669; + if (yych <= '9') goto yy670; + goto yy665; +yy669: yych = *++YYCURSOR; - if (yych <= '/') goto yy725; - if (yych >= ':') goto yy725; -yy730: + if (yych <= '/') goto yy665; + if (yych >= ':') goto yy665; +yy670: yych = *++YYCURSOR; - goto yy725; -yy731: + goto yy665; +yy671: yych = *++YYCURSOR; if (yych != 'T') goto yy56; yych = *++YYCURSOR; - if (yych == '+') goto yy723; - if (yych == '-') goto yy723; + if (yych == '+') goto yy663; + if (yych == '-') goto yy663; goto yy56; -yy733: +yy673: yych = *++YYCURSOR; - if (yych == 'V') goto yy703; - if (yych == 'v') goto yy703; + if (yych == 'V') goto yy643; + if (yych == 'v') goto yy643; goto yy56; -yy734: +yy674: yych = *++YYCURSOR; - if (yych == 'T') goto yy703; - if (yych == 't') goto yy703; + if (yych == 'T') goto yy643; + if (yych == 't') goto yy643; goto yy56; -yy735: +yy675: yych = *++YYCURSOR; - if (yych == 'P') goto yy736; + if (yych == 'P') goto yy676; if (yych != 'p') goto yy56; -yy736: +yy676: yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == '/') goto yy704; + if (yych == '/') goto yy644; goto yy56; } else { - if (yych <= 'T') goto yy703; - if (yych == 't') goto yy703; + if (yych <= 'T') goto yy643; + if (yych == 't') goto yy643; goto yy56; } -yy737: +yy677: yych = *++YYCURSOR; - if (yych == 'G') goto yy703; - if (yych == 'g') goto yy703; + if (yych == 'G') goto yy643; + if (yych == 'g') goto yy643; goto yy56; -yy738: +yy678: yych = *++YYCURSOR; - if (yych == 'R') goto yy703; - if (yych == 'r') goto yy703; + if (yych == 'R') goto yy643; + if (yych == 'r') goto yy643; goto yy56; -yy739: +yy679: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy703; + if (yych == 'R') goto yy643; if (yych <= 'X') goto yy56; - goto yy703; + goto yy643; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; - goto yy703; + goto yy643; } else { - if (yych == 'y') goto yy703; + if (yych == 'y') goto yy643; goto yy56; } } -yy740: +yy680: yych = *++YYCURSOR; - if (yych == 'B') goto yy703; - if (yych == 'b') goto yy703; + if (yych == 'B') goto yy643; + if (yych == 'b') goto yy643; goto yy56; -yy741: +yy681: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy703; + if (yych == 'L') goto yy643; if (yych <= 'M') goto yy56; - goto yy703; + goto yy643; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy703; + goto yy643; } else { - if (yych == 'n') goto yy703; + if (yych == 'n') goto yy643; goto yy56; } } -yy742: +yy682: yych = *++YYCURSOR; - if (yych == 'N') goto yy703; - if (yych == 'n') goto yy703; + if (yych == 'N') goto yy643; + if (yych == 'n') goto yy643; goto yy56; -yy743: +yy683: yych = *++YYCURSOR; - if (yych == 't') goto yy752; + if (yych == 't') goto yy692; goto yy56; -yy744: +yy684: yych = *++YYCURSOR; - if (yych == 'd') goto yy752; + if (yych == 'd') goto yy692; goto yy56; -yy745: +yy685: yych = *++YYCURSOR; - if (yych == 'd') goto yy752; + if (yych == 'd') goto yy692; goto yy56; -yy746: +yy686: yych = *++YYCURSOR; - if (yych == 'h') goto yy752; + if (yych == 'h') goto yy692; goto yy56; -yy747: +yy687: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; yych = *++YYCURSOR; - if (yych <= '/') goto yy691; - if (yych >= ':') goto yy691; + if (yych <= '/') goto yy631; + if (yych >= ':') goto yy631; yych = *++YYCURSOR; - if (yych <= '/') goto yy691; - if (yych >= ':') goto yy691; + if (yych <= '/') goto yy631; + if (yych >= ':') goto yy631; yych = *++YYCURSOR; - if (yych <= '/') goto yy691; - if (yych >= ':') goto yy691; + if (yych <= '/') goto yy631; + if (yych >= ':') goto yy631; yych = *++YYCURSOR; - goto yy691; -yy752: - yyaccept = 14; + goto yy631; +yy692: + yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '/') goto yy747; - goto yy691; -yy753: + if (yych == '/') goto yy687; + goto yy631; +yy693: yych = *++YYCURSOR; if (yych <= ',') { - if (yych == '\t') goto yy755; - goto yy602; + if (yych == '\t') goto yy695; + goto yy542; } else { - if (yych <= '-') goto yy756; - if (yych <= '.') goto yy755; - if (yych >= '0') goto yy602; + if (yych <= '-') goto yy696; + if (yych <= '.') goto yy695; + if (yych >= '0') goto yy542; } -yy754: +yy694: yych = *++YYCURSOR; switch (yych) { case 'A': - case 'a': goto yy697; + case 'a': goto yy637; case 'D': - case 'd': goto yy701; + case 'd': goto yy641; case 'F': - case 'f': goto yy695; + case 'f': goto yy635; case 'J': - case 'j': goto yy694; + case 'j': goto yy634; case 'M': - case 'm': goto yy696; + case 'm': goto yy636; case 'N': - case 'n': goto yy700; + case 'n': goto yy640; case 'O': - case 'o': goto yy699; + case 'o': goto yy639; case 'S': - case 's': goto yy698; + case 's': goto yy638; default: goto yy56; } -yy755: +yy695: yych = *++YYCURSOR; - if (yych <= '/') goto yy602; - if (yych <= '0') goto yy760; - if (yych <= '1') goto yy761; - if (yych <= '9') goto yy762; - goto yy602; -yy756: + if (yych <= '/') goto yy542; + if (yych <= '0') goto yy700; + if (yych <= '1') goto yy701; + if (yych <= '9') goto yy702; + goto yy542; +yy696: yych = *++YYCURSOR; - if (yych <= '/') goto yy602; - if (yych <= '0') goto yy757; - if (yych <= '1') goto yy758; - if (yych <= '9') goto yy759; - goto yy602; -yy757: + if (yych <= '/') goto yy542; + if (yych <= '0') goto yy697; + if (yych <= '1') goto yy698; + if (yych <= '9') goto yy699; + goto yy542; +yy697: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '.') goto yy626; + if (yych <= '.') goto yy566; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy759; + if (yych <= '9') goto yy699; goto yy56; -yy758: +yy698: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '.') goto yy626; + if (yych <= '.') goto yy566; if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; -yy759: +yy699: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '.') goto yy626; + if (yych <= '.') goto yy566; goto yy56; -yy760: +yy700: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy626; - goto yy763; + if (yych <= '-') goto yy566; + goto yy703; } else { if (yych <= '/') goto yy56; - if (yych <= '9') goto yy762; + if (yych <= '9') goto yy702; goto yy56; } -yy761: +yy701: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy626; - goto yy763; + if (yych <= '-') goto yy566; + goto yy703; } else { if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; } -yy762: +yy702: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '-') goto yy626; + if (yych <= '-') goto yy566; if (yych >= '/') goto yy56; -yy763: +yy703: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy635; + if (yych <= '9') goto yy575; goto yy56; -yy765: +yy705: yych = *++YYCURSOR; - if (yych == '-') goto yy809; + if (yych == '-') goto yy749; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy807; + if (yych <= '9') goto yy747; goto yy60; -yy766: +yy706: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy775; - case '1': goto yy776; + case '0': goto yy715; + case '1': goto yy716; case '2': case '3': case '4': @@ -12041,231 +11137,231 @@ case '6': case '7': case '8': - case '9': goto yy777; + case '9': goto yy717; case 'A': - case 'a': goto yy770; + case 'a': goto yy710; case 'D': - case 'd': goto yy774; + case 'd': goto yy714; case 'F': - case 'f': goto yy768; + case 'f': goto yy708; case 'J': - case 'j': goto yy767; + case 'j': goto yy707; case 'M': - case 'm': goto yy769; + case 'm': goto yy709; case 'N': - case 'n': goto yy773; + case 'n': goto yy713; case 'O': - case 'o': goto yy772; + case 'o': goto yy712; case 'S': - case 's': goto yy771; + case 's': goto yy711; default: goto yy56; } -yy767: +yy707: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy806; + if (yych == 'A') goto yy746; if (yych <= 'T') goto yy56; - goto yy805; + goto yy745; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy806; + goto yy746; } else { - if (yych == 'u') goto yy805; + if (yych == 'u') goto yy745; goto yy56; } } -yy768: +yy708: yych = *++YYCURSOR; - if (yych == 'E') goto yy804; - if (yych == 'e') goto yy804; + if (yych == 'E') goto yy744; + if (yych == 'e') goto yy744; goto yy56; -yy769: +yy709: yych = *++YYCURSOR; - if (yych == 'A') goto yy803; - if (yych == 'a') goto yy803; + if (yych == 'A') goto yy743; + if (yych == 'a') goto yy743; goto yy56; -yy770: +yy710: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy802; + if (yych == 'P') goto yy742; if (yych <= 'T') goto yy56; - goto yy801; + goto yy741; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy802; + goto yy742; } else { - if (yych == 'u') goto yy801; + if (yych == 'u') goto yy741; goto yy56; } } -yy771: +yy711: yych = *++YYCURSOR; - if (yych == 'E') goto yy799; - if (yych == 'e') goto yy799; + if (yych == 'E') goto yy739; + if (yych == 'e') goto yy739; goto yy56; -yy772: +yy712: yych = *++YYCURSOR; - if (yych == 'C') goto yy798; - if (yych == 'c') goto yy798; + if (yych == 'C') goto yy738; + if (yych == 'c') goto yy738; goto yy56; -yy773: +yy713: yych = *++YYCURSOR; - if (yych == 'O') goto yy797; - if (yych == 'o') goto yy797; + if (yych == 'O') goto yy737; + if (yych == 'o') goto yy737; goto yy56; -yy774: +yy714: yych = *++YYCURSOR; - if (yych == 'E') goto yy789; - if (yych == 'e') goto yy789; + if (yych == 'E') goto yy729; + if (yych == 'e') goto yy729; goto yy56; -yy775: +yy715: yych = *++YYCURSOR; - if (yych == '-') goto yy778; + if (yych == '-') goto yy718; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy782; + if (yych <= '9') goto yy722; goto yy56; -yy776: +yy716: yych = *++YYCURSOR; - if (yych == '-') goto yy778; + if (yych == '-') goto yy718; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy782; + if (yych <= '2') goto yy722; goto yy56; -yy777: +yy717: yych = *++YYCURSOR; if (yych != '-') goto yy56; -yy778: +yy718: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy779; - if (yych <= '3') goto yy780; - if (yych <= '9') goto yy781; + if (yych <= '2') goto yy719; + if (yych <= '3') goto yy720; + if (yych <= '9') goto yy721; goto yy56; -yy779: - yyaccept = 13; +yy719: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy781; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy721; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy780: - yyaccept = 13; +yy720: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '1') goto yy781; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '1') goto yy721; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy781: - yyaccept = 13; +yy721: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy685; - goto yy681; + if (yych == 'n') goto yy625; + goto yy621; } else { - if (yych <= 'r') goto yy686; - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 'r') goto yy626; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } -yy782: +yy722: yych = *++YYCURSOR; if (yych != '-') goto yy56; yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych >= '1') goto yy785; + if (yych >= '1') goto yy725; } else { - if (yych <= '3') goto yy786; - if (yych <= '9') goto yy781; + if (yych <= '3') goto yy726; + if (yych <= '9') goto yy721; goto yy56; } - yyaccept = 13; + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy787; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy727; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy785: - yyaccept = 13; +yy725: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy787; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy727; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy786: - yyaccept = 13; +yy726: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '1') goto yy787; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '1') goto yy727; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy787: - yyaccept = 15; +yy727: + yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy685; + if (yych == 'n') goto yy625; } else { - if (yych <= 'r') goto yy686; - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; + if (yych <= 'r') goto yy626; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; } -yy788: +yy728: { int length = 0; DEBUG_OUTPUT("iso8601date2"); @@ -12278,35 +11374,35 @@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -yy789: +yy729: yych = *++YYCURSOR; - if (yych == 'C') goto yy790; + if (yych == 'C') goto yy730; if (yych != 'c') goto yy56; -yy790: +yy730: yych = *++YYCURSOR; if (yych != '-') goto yy56; -yy791: +yy731: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy792; - if (yych <= '2') goto yy793; - if (yych <= '3') goto yy794; + if (yych <= '0') goto yy732; + if (yych <= '2') goto yy733; + if (yych <= '3') goto yy734; goto yy56; -yy792: +yy732: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy795; + if (yych <= '9') goto yy735; goto yy56; -yy793: +yy733: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy795; + if (yych <= '9') goto yy735; goto yy56; -yy794: +yy734: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '2') goto yy56; -yy795: +yy735: ++YYCURSOR; { int length = 0; @@ -12320,118 +11416,118 @@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -yy797: +yy737: yych = *++YYCURSOR; - if (yych == 'V') goto yy790; - if (yych == 'v') goto yy790; + if (yych == 'V') goto yy730; + if (yych == 'v') goto yy730; goto yy56; -yy798: +yy738: yych = *++YYCURSOR; - if (yych == 'T') goto yy790; - if (yych == 't') goto yy790; + if (yych == 'T') goto yy730; + if (yych == 't') goto yy730; goto yy56; -yy799: +yy739: yych = *++YYCURSOR; - if (yych == 'P') goto yy800; + if (yych == 'P') goto yy740; if (yych != 'p') goto yy56; -yy800: +yy740: yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == '-') goto yy791; + if (yych == '-') goto yy731; goto yy56; } else { - if (yych <= 'T') goto yy790; - if (yych == 't') goto yy790; + if (yych <= 'T') goto yy730; + if (yych == 't') goto yy730; goto yy56; } -yy801: +yy741: yych = *++YYCURSOR; - if (yych == 'G') goto yy790; - if (yych == 'g') goto yy790; + if (yych == 'G') goto yy730; + if (yych == 'g') goto yy730; goto yy56; -yy802: +yy742: yych = *++YYCURSOR; - if (yych == 'R') goto yy790; - if (yych == 'r') goto yy790; + if (yych == 'R') goto yy730; + if (yych == 'r') goto yy730; goto yy56; -yy803: +yy743: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy790; + if (yych == 'R') goto yy730; if (yych <= 'X') goto yy56; - goto yy790; + goto yy730; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; - goto yy790; + goto yy730; } else { - if (yych == 'y') goto yy790; + if (yych == 'y') goto yy730; goto yy56; } } -yy804: +yy744: yych = *++YYCURSOR; - if (yych == 'B') goto yy790; - if (yych == 'b') goto yy790; + if (yych == 'B') goto yy730; + if (yych == 'b') goto yy730; goto yy56; -yy805: +yy745: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy790; + if (yych == 'L') goto yy730; if (yych <= 'M') goto yy56; - goto yy790; + goto yy730; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy790; + goto yy730; } else { - if (yych == 'n') goto yy790; + if (yych == 'n') goto yy730; goto yy56; } } -yy806: +yy746: yych = *++YYCURSOR; - if (yych == 'N') goto yy790; - if (yych == 'n') goto yy790; + if (yych == 'N') goto yy730; + if (yych == 'n') goto yy730; goto yy56; -yy807: - yyaccept = 16; +yy747: + yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'O') { if (yych <= '3') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy815; + if (yych == '\t') goto yy755; } else { - if (yych <= ' ') goto yy815; - if (yych >= '-') goto yy812; + if (yych <= ' ') goto yy755; + if (yych >= '-') goto yy752; } } else { if (yych <= '0') { - if (yych <= '.') goto yy816; - if (yych <= '/') goto yy813; - goto yy829; - } else { - if (yych <= '1') goto yy830; - if (yych <= '2') goto yy832; - goto yy833; + if (yych <= '.') goto yy756; + if (yych <= '/') goto yy753; + goto yy769; + } else { + if (yych <= '1') goto yy770; + if (yych <= '2') goto yy772; + goto yy773; } } } else { if (yych <= 'D') { if (yych <= '@') { if (yych <= '9') goto yy54; - if (yych <= ':') goto yy831; + if (yych <= ':') goto yy771; } else { - if (yych <= 'A') goto yy815; - if (yych >= 'D') goto yy815; + if (yych <= 'A') goto yy755; + if (yych >= 'D') goto yy755; } } else { if (yych <= 'G') { - if (yych == 'F') goto yy815; + if (yych == 'F') goto yy755; } else { - if (yych <= 'J') goto yy815; - if (yych >= 'M') goto yy815; + if (yych <= 'J') goto yy755; + if (yych >= 'M') goto yy755; } } } @@ -12439,39 +11535,39 @@ if (yych <= 'h') { if (yych <= 'a') { if (yych <= 'W') { - if (yych <= 'R') goto yy808; - if (yych <= 'V') goto yy815; - goto yy834; + if (yych <= 'R') goto yy748; + if (yych <= 'V') goto yy755; + goto yy774; } else { - if (yych <= 'Y') goto yy815; - if (yych >= 'a') goto yy815; + if (yych <= 'Y') goto yy755; + if (yych >= 'a') goto yy755; } } else { if (yych <= 'e') { - if (yych == 'd') goto yy815; + if (yych == 'd') goto yy755; } else { - if (yych != 'g') goto yy815; + if (yych != 'g') goto yy755; } } } else { if (yych <= 'u') { if (yych <= 'l') { - if (yych == 'j') goto yy815; + if (yych == 'j') goto yy755; } else { - if (yych <= 'o') goto yy815; - if (yych >= 's') goto yy815; + if (yych <= 'o') goto yy755; + if (yych >= 's') goto yy755; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy815; + if (yych == 'w') goto yy755; } else { - if (yych <= 'y') goto yy815; - if (yych == 0xC2) goto yy815; + if (yych <= 'y') goto yy755; + if (yych == 0xC2) goto yy755; } } } } -yy808: +yy748: { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@ -12479,11 +11575,11 @@ TIMELIB_DEINIT; return TIMELIB_CLF; } -yy809: +yy749: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy810; - case '1': goto yy811; + case '0': goto yy750; + case '1': goto yy751; case '2': case '3': case '4': @@ -12491,42 +11587,42 @@ case '6': case '7': case '8': - case '9': goto yy777; + case '9': goto yy717; case 'A': - case 'a': goto yy770; + case 'a': goto yy710; case 'D': - case 'd': goto yy774; + case 'd': goto yy714; case 'F': - case 'f': goto yy768; + case 'f': goto yy708; case 'J': - case 'j': goto yy767; + case 'j': goto yy707; case 'M': - case 'm': goto yy769; + case 'm': goto yy709; case 'N': - case 'n': goto yy773; + case 'n': goto yy713; case 'O': - case 'o': goto yy772; + case 'o': goto yy712; case 'S': - case 's': goto yy771; + case 's': goto yy711; default: goto yy56; } -yy810: +yy750: yych = *++YYCURSOR; - if (yych == '-') goto yy778; + if (yych == '-') goto yy718; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy777; + if (yych <= '9') goto yy717; goto yy56; -yy811: +yy751: yych = *++YYCURSOR; - if (yych == '-') goto yy778; + if (yych == '-') goto yy718; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy777; + if (yych <= '2') goto yy717; goto yy56; -yy812: +yy752: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy997; - case '1': goto yy999; + case '0': goto yy937; + case '1': goto yy939; case '2': case '3': case '4': @@ -12534,56 +11630,56 @@ case '6': case '7': case '8': - case '9': goto yy1000; + case '9': goto yy940; case 'A': - case 'a': goto yy991; + case 'a': goto yy931; case 'D': - case 'd': goto yy995; + case 'd': goto yy935; case 'F': - case 'f': goto yy989; + case 'f': goto yy929; case 'J': - case 'j': goto yy988; + case 'j': goto yy928; case 'M': - case 'm': goto yy990; + case 'm': goto yy930; case 'N': - case 'n': goto yy994; + case 'n': goto yy934; case 'O': - case 'o': goto yy993; + case 'o': goto yy933; case 'S': - case 's': goto yy992; - case 'W': goto yy996; - default: goto yy963; + case 's': goto yy932; + case 'W': goto yy936; + default: goto yy903; } -yy813: +yy753: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy971; - if (yych <= '1') goto yy972; - if (yych <= '9') goto yy973; + if (yych <= '0') goto yy911; + if (yych <= '1') goto yy912; + if (yych <= '9') goto yy913; goto yy56; -yy814: +yy754: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy815: +yy755: if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy814; + if (yych == '\t') goto yy754; goto yy56; } else { - if (yych <= ' ') goto yy814; + if (yych <= ' ') goto yy754; if (yych <= ',') goto yy56; - goto yy962; + goto yy902; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy824; + if (yych == 'A') goto yy764; goto yy56; } else { - if (yych <= 'D') goto yy828; - if (yych == 'F') goto yy822; + if (yych <= 'D') goto yy768; + if (yych == 'F') goto yy762; goto yy56; } } @@ -12591,22 +11687,22 @@ if (yych <= 'N') { if (yych <= 'J') { if (yych <= 'H') goto yy65; - if (yych <= 'I') goto yy817; - goto yy821; + if (yych <= 'I') goto yy757; + goto yy761; } else { if (yych <= 'L') goto yy56; - if (yych <= 'M') goto yy823; - goto yy827; + if (yych <= 'M') goto yy763; + goto yy767; } } else { if (yych <= 'S') { - if (yych <= 'O') goto yy826; + if (yych <= 'O') goto yy766; if (yych <= 'R') goto yy56; - goto yy825; + goto yy765; } else { if (yych <= 'T') goto yy70; if (yych <= 'U') goto yy63; - if (yych <= 'V') goto yy819; + if (yych <= 'V') goto yy759; goto yy69; } } @@ -12615,33 +11711,33 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych <= '`') { - if (yych <= 'X') goto yy820; + if (yych <= 'X') goto yy760; if (yych <= 'Y') goto yy68; goto yy56; } else { - if (yych <= 'a') goto yy824; + if (yych <= 'a') goto yy764; if (yych <= 'c') goto yy56; - goto yy828; + goto yy768; } } else { if (yych <= 'g') { - if (yych == 'f') goto yy822; + if (yych == 'f') goto yy762; goto yy56; } else { if (yych <= 'h') goto yy65; - if (yych == 'j') goto yy821; + if (yych == 'j') goto yy761; goto yy56; } } } else { if (yych <= 'u') { if (yych <= 'o') { - if (yych <= 'm') goto yy823; - if (yych <= 'n') goto yy827; - goto yy826; + if (yych <= 'm') goto yy763; + if (yych <= 'n') goto yy767; + goto yy766; } else { if (yych <= 'r') goto yy56; - if (yych <= 's') goto yy825; + if (yych <= 's') goto yy765; if (yych <= 't') goto yy70; goto yy63; } @@ -12657,22 +11753,22 @@ } } } -yy816: +yy756: yych = *++YYCURSOR; - if (yych <= '/') goto yy963; - if (yych <= '0') goto yy955; - if (yych <= '2') goto yy956; - if (yych <= '3') goto yy957; - goto yy963; -yy817: + if (yych <= '/') goto yy903; + if (yych <= '0') goto yy895; + if (yych <= '2') goto yy896; + if (yych <= '3') goto yy897; + goto yy903; +yy757: ++YYCURSOR; if ((yych = *YYCURSOR) <= 'U') { - if (yych == 'I') goto yy954; + if (yych == 'I') goto yy894; } else { - if (yych == 'W') goto yy818; - if (yych <= 'X') goto yy908; + if (yych == 'W') goto yy758; + if (yych <= 'X') goto yy848; } -yy818: +yy758: { int length = 0; DEBUG_OUTPUT("datenodayrev"); @@ -12685,34 +11781,34 @@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -yy819: +yy759: yych = *++YYCURSOR; - if (yych == 'I') goto yy952; - goto yy818; -yy820: + if (yych == 'I') goto yy892; + goto yy758; +yy760: yych = *++YYCURSOR; - if (yych == 'I') goto yy951; - goto yy818; -yy821: + if (yych == 'I') goto yy891; + goto yy758; +yy761: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy944; + if (yych == 'A') goto yy884; if (yych <= 'T') goto yy56; - goto yy943; + goto yy883; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy944; + goto yy884; } else { - if (yych == 'u') goto yy943; + if (yych == 'u') goto yy883; goto yy56; } } -yy822: +yy762: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= 'N') { - if (yych == 'E') goto yy937; + if (yych == 'E') goto yy877; goto yy56; } else { if (yych <= 'O') goto yy100; @@ -12721,7 +11817,7 @@ } } else { if (yych <= 'n') { - if (yych == 'e') goto yy937; + if (yych == 'e') goto yy877; goto yy56; } else { if (yych <= 'o') goto yy100; @@ -12729,11 +11825,11 @@ goto yy56; } } -yy823: +yy763: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'I') { - if (yych == 'A') goto yy934; + if (yych == 'A') goto yy874; if (yych <= 'H') goto yy56; goto yy138; } else { @@ -12743,7 +11839,7 @@ } } else { if (yych <= 'i') { - if (yych == 'a') goto yy934; + if (yych == 'a') goto yy874; if (yych <= 'h') goto yy56; goto yy138; } else { @@ -12756,29 +11852,29 @@ } } } -yy824: +yy764: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy928; + if (yych == 'P') goto yy868; if (yych <= 'T') goto yy56; - goto yy927; + goto yy867; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy928; + goto yy868; } else { - if (yych == 'u') goto yy927; + if (yych == 'u') goto yy867; goto yy56; } } -yy825: +yy765: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { if (yych == 'A') goto yy119; goto yy56; } else { - if (yych <= 'E') goto yy920; + if (yych <= 'E') goto yy860; if (yych <= 'T') goto yy56; goto yy118; } @@ -12787,73 +11883,73 @@ if (yych == 'a') goto yy119; goto yy56; } else { - if (yych <= 'e') goto yy920; + if (yych <= 'e') goto yy860; if (yych == 'u') goto yy118; goto yy56; } } -yy826: +yy766: yych = *++YYCURSOR; - if (yych == 'C') goto yy915; - if (yych == 'c') goto yy915; + if (yych == 'C') goto yy855; + if (yych == 'c') goto yy855; goto yy56; -yy827: +yy767: yych = *++YYCURSOR; - if (yych == 'O') goto yy909; - if (yych == 'o') goto yy909; + if (yych == 'O') goto yy849; + if (yych == 'o') goto yy849; goto yy56; -yy828: +yy768: yych = *++YYCURSOR; if (yych <= 'E') { if (yych == 'A') goto yy115; if (yych <= 'D') goto yy56; - goto yy902; + goto yy842; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; goto yy115; } else { - if (yych == 'e') goto yy902; + if (yych == 'e') goto yy842; goto yy56; } } -yy829: +yy769: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '0') goto yy899; - if (yych <= '9') goto yy900; + if (yych <= '0') goto yy839; + if (yych <= '9') goto yy840; goto yy60; -yy830: +yy770: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '2') goto yy868; - if (yych <= '9') goto yy847; + if (yych <= '2') goto yy808; + if (yych <= '9') goto yy787; goto yy60; -yy831: +yy771: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy848; - if (yych <= '1') goto yy849; + if (yych <= '0') goto yy788; + if (yych <= '1') goto yy789; goto yy56; -yy832: +yy772: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy847; + if (yych <= '9') goto yy787; goto yy60; -yy833: +yy773: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '5') goto yy843; - if (yych <= '6') goto yy844; + if (yych <= '5') goto yy783; + if (yych <= '6') goto yy784; if (yych <= '9') goto yy54; goto yy60; -yy834: +yy774: yych = *++YYCURSOR; if (yych <= '5') { if (yych <= '/') goto yy56; - if (yych <= '0') goto yy835; - if (yych <= '4') goto yy836; - goto yy837; + if (yych <= '0') goto yy775; + if (yych <= '4') goto yy776; + goto yy777; } else { if (yych <= 'E') { if (yych <= 'D') goto yy56; @@ -12863,27 +11959,27 @@ goto yy56; } } -yy835: +yy775: yych = *++YYCURSOR; if (yych <= '0') goto yy56; - if (yych <= '9') goto yy838; + if (yych <= '9') goto yy778; goto yy56; -yy836: +yy776: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy838; + if (yych <= '9') goto yy778; goto yy56; -yy837: +yy777: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '4') goto yy56; -yy838: - yyaccept = 17; +yy778: + yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy840; - if (yych <= '/') goto yy839; - if (yych <= '7') goto yy841; -yy839: + if (yych == '-') goto yy780; + if (yych <= '/') goto yy779; + if (yych <= '7') goto yy781; +yy779: { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@ -12901,11 +11997,11 @@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -yy840: +yy780: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '8') goto yy56; -yy841: +yy781: ++YYCURSOR; { timelib_sll w, d; @@ -12924,19 +12020,19 @@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -yy843: +yy783: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy845; + if (yych <= '9') goto yy785; goto yy60; -yy844: +yy784: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '6') goto yy845; + if (yych <= '6') goto yy785; if (yych <= '9') goto yy54; goto yy60; -yy845: - yyaccept = 18; +yy785: + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy54; @@ -12977,7 +12073,7 @@ } } else { if (yych <= 'w') { - if (yych <= 'r') goto yy846; + if (yych <= 'r') goto yy786; if (yych != 'v') goto yy60; } else { if (yych <= 'y') { @@ -12988,7 +12084,7 @@ } } } -yy846: +yy786: { int length = 0; DEBUG_OUTPUT("pgydotd"); @@ -13001,61 +12097,61 @@ TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -yy847: +yy787: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy845; + if (yych <= '9') goto yy785; goto yy60; -yy848: +yy788: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy850; + if (yych <= '9') goto yy790; goto yy56; -yy849: +yy789: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; -yy850: +yy790: yych = *++YYCURSOR; if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy852; - if (yych <= '2') goto yy853; - if (yych <= '3') goto yy854; + if (yych <= '0') goto yy792; + if (yych <= '2') goto yy793; + if (yych <= '3') goto yy794; goto yy56; -yy852: +yy792: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy855; + if (yych <= '9') goto yy795; goto yy56; -yy853: +yy793: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy855; + if (yych <= '9') goto yy795; goto yy56; -yy854: +yy794: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '2') goto yy56; -yy855: +yy795: yych = *++YYCURSOR; if (yych != ' ') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy857; - if (yych <= '2') goto yy858; + if (yych <= '1') goto yy797; + if (yych <= '2') goto yy798; goto yy56; -yy857: +yy797: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy859; + if (yych <= '9') goto yy799; goto yy56; -yy858: +yy798: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '5') goto yy56; -yy859: +yy799: yych = *++YYCURSOR; if (yych != ':') goto yy56; yych = *++YYCURSOR; @@ -13068,20 +12164,20 @@ if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy864; - if (yych <= '6') goto yy865; + if (yych <= '5') goto yy804; + if (yych <= '6') goto yy805; goto yy56; -yy864: +yy804: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy866; + if (yych <= '9') goto yy806; goto yy56; -yy865: +yy805: yych = *++YYCURSOR; if (yych != '0') goto yy56; -yy866: +yy806: ++YYCURSOR; -yy867: +yy807: { int tz_not_found; DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif"); @@ -13106,45 +12202,45 @@ TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -yy868: +yy808: yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy60; - if (yych >= '1') goto yy870; + if (yych >= '1') goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; goto yy60; } -yy869: - yyaccept = 18; +yy809: + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy846; + if (yych <= 0x1F) goto yy786; goto yy60; } else { if (yych <= '9') { - if (yych <= '/') goto yy846; - goto yy872; + if (yych <= '/') goto yy786; + goto yy812; } else { if (yych == 'D') goto yy60; - goto yy846; + goto yy786; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy846; + if (yych == 'G') goto yy786; if (yych <= 'H') goto yy60; - goto yy846; + goto yy786; } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'V') goto yy846; + if (yych == 'V') goto yy786; goto yy60; } } @@ -13153,66 +12249,66 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy846; + if (yych <= 'c') goto yy786; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy846; + if (yych <= 'e') goto yy786; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy846; + goto yy786; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'v') goto yy846; + if (yych == 'v') goto yy786; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy846; + if (yych <= 'x') goto yy786; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy846; + goto yy786; } } } } -yy870: - yyaccept = 18; +yy810: + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy846; + if (yych <= 0x1F) goto yy786; goto yy60; } else { if (yych <= '9') { - if (yych <= '/') goto yy846; - goto yy872; + if (yych <= '/') goto yy786; + goto yy812; } else { if (yych == 'D') goto yy60; - goto yy846; + goto yy786; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy846; + if (yych == 'G') goto yy786; if (yych <= 'H') goto yy60; - goto yy846; + goto yy786; } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'V') goto yy846; + if (yych == 'V') goto yy786; goto yy60; } } @@ -13221,70 +12317,70 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy846; + if (yych <= 'c') goto yy786; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy846; + if (yych <= 'e') goto yy786; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy846; + goto yy786; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'v') goto yy846; + if (yych == 'v') goto yy786; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy846; + if (yych <= 'x') goto yy786; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy846; + goto yy786; } } } } -yy871: - yyaccept = 18; +yy811: + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'D') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy846; + if (yych <= 0x1F) goto yy786; goto yy60; } else { if (yych <= '1') { - if (yych <= '/') goto yy846; + if (yych <= '/') goto yy786; } else { if (yych <= '9') goto yy54; - if (yych <= 'C') goto yy846; + if (yych <= 'C') goto yy786; goto yy60; } } } else { if (yych <= 'L') { if (yych <= 'F') { - if (yych <= 'E') goto yy846; + if (yych <= 'E') goto yy786; goto yy60; } else { if (yych == 'H') goto yy60; - goto yy846; + goto yy786; } } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'V') goto yy846; + if (yych == 'V') goto yy786; goto yy60; } } @@ -13293,39 +12389,39 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy846; + if (yych <= 'c') goto yy786; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy846; + if (yych <= 'e') goto yy786; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy846; + goto yy786; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy846; + goto yy786; } else { - if (yych == 'v') goto yy846; + if (yych == 'v') goto yy786; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy846; + if (yych <= 'x') goto yy786; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy846; + goto yy786; } } } } -yy872: - yyaccept = 19; +yy812: + yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy54; @@ -13352,7 +12448,7 @@ } } else { if (yych <= 'U') { - if (yych <= 'T') goto yy874; + if (yych <= 'T') goto yy814; goto yy63; } else { if (yych == 'W') goto yy69; @@ -13379,7 +12475,7 @@ if (yych <= 'w') { if (yych <= 't') { if (yych <= 's') goto yy64; - goto yy875; + goto yy815; } else { if (yych <= 'u') goto yy63; if (yych >= 'w') goto yy69; @@ -13393,7 +12489,7 @@ } } } -yy873: +yy813: { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@ -13404,15 +12500,15 @@ TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -yy874: +yy814: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych <= '1') goto yy889; - goto yy890; + if (yych <= '1') goto yy829; + goto yy830; } else { - if (yych <= '9') goto yy891; + if (yych <= '9') goto yy831; if (yych <= 'G') goto yy56; goto yy71; } @@ -13426,14 +12522,14 @@ goto yy56; } } -yy875: +yy815: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych >= '2') goto yy877; + if (yych >= '2') goto yy817; } else { - if (yych <= '9') goto yy878; + if (yych <= '9') goto yy818; if (yych <= 'G') goto yy56; goto yy71; } @@ -13449,97 +12545,97 @@ } yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy883; - if (yych <= '9') goto yy878; + if (yych <= '5') goto yy823; + if (yych <= '9') goto yy818; goto yy56; -yy877: +yy817: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '4') goto yy883; - if (yych <= '5') goto yy879; + if (yych <= '4') goto yy823; + if (yych <= '5') goto yy819; goto yy56; -yy878: +yy818: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '6') goto yy56; -yy879: +yy819: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy880: +yy820: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy881; - if (yych <= '6') goto yy882; + if (yych <= '5') goto yy821; + if (yych <= '6') goto yy822; goto yy56; -yy881: +yy821: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy866; + if (yych <= '9') goto yy806; goto yy56; -yy882: +yy822: yych = *++YYCURSOR; - if (yych == '0') goto yy866; + if (yych == '0') goto yy806; goto yy56; -yy883: +yy823: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy884; - if (yych <= '9') goto yy880; + if (yych <= '5') goto yy824; + if (yych <= '9') goto yy820; goto yy56; -yy884: +yy824: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy885; - if (yych <= '6') goto yy886; - if (yych <= '9') goto yy880; + if (yych <= '5') goto yy825; + if (yych <= '6') goto yy826; + if (yych <= '9') goto yy820; goto yy56; -yy885: +yy825: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy887; - if (yych <= '6') goto yy888; - if (yych <= '9') goto yy866; + if (yych <= '5') goto yy827; + if (yych <= '6') goto yy828; + if (yych <= '9') goto yy806; goto yy56; -yy886: +yy826: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy887; - if (yych <= '5') goto yy881; - if (yych <= '6') goto yy882; + if (yych <= '0') goto yy827; + if (yych <= '5') goto yy821; + if (yych <= '6') goto yy822; goto yy56; -yy887: +yy827: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '9') goto yy866; - goto yy867; -yy888: + if (yych <= '/') goto yy807; + if (yych <= '9') goto yy806; + goto yy807; +yy828: yych = *++YYCURSOR; - if (yych == '0') goto yy866; - goto yy867; -yy889: + if (yych == '0') goto yy806; + goto yy807; +yy829: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy898; - if (yych <= '9') goto yy891; - if (yych <= ':') goto yy892; + if (yych <= '5') goto yy838; + if (yych <= '9') goto yy831; + if (yych <= ':') goto yy832; goto yy56; -yy890: +yy830: yych = *++YYCURSOR; if (yych <= '5') { if (yych <= '/') goto yy56; - if (yych <= '4') goto yy898; - goto yy879; + if (yych <= '4') goto yy838; + goto yy819; } else { - if (yych == ':') goto yy892; + if (yych == ':') goto yy832; goto yy56; } -yy891: +yy831: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy879; + if (yych <= '5') goto yy819; if (yych != ':') goto yy56; -yy892: +yy832: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '6') goto yy56; @@ -13550,129 +12646,129 @@ if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy896; - if (yych <= '6') goto yy897; + if (yych <= '5') goto yy836; + if (yych <= '6') goto yy837; goto yy56; -yy896: +yy836: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy866; + if (yych <= '9') goto yy806; goto yy56; -yy897: +yy837: yych = *++YYCURSOR; - if (yych == '0') goto yy866; + if (yych == '0') goto yy806; goto yy56; -yy898: +yy838: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy884; - if (yych <= '9') goto yy880; - if (yych <= ':') goto yy892; + if (yych <= '5') goto yy824; + if (yych <= '9') goto yy820; + if (yych <= ':') goto yy832; goto yy56; -yy899: +yy839: yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy60; - if (yych <= '0') goto yy901; - goto yy870; + if (yych <= '0') goto yy841; + goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; goto yy60; } -yy900: +yy840: yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy60; - if (yych <= '0') goto yy869; - goto yy870; + if (yych <= '0') goto yy809; + goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; goto yy60; } -yy901: +yy841: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy872; + if (yych <= '9') goto yy812; goto yy60; -yy902: +yy842: yych = *++YYCURSOR; - if (yych == 'C') goto yy903; + if (yych == 'C') goto yy843; if (yych != 'c') goto yy56; -yy903: - yyaccept = 20; +yy843: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy904; - if (yych != 'e') goto yy818; -yy904: + if (yych == 'E') goto yy844; + if (yych != 'e') goto yy758; +yy844: yych = *++YYCURSOR; - if (yych == 'M') goto yy905; + if (yych == 'M') goto yy845; if (yych != 'm') goto yy56; -yy905: +yy845: yych = *++YYCURSOR; - if (yych == 'B') goto yy906; + if (yych == 'B') goto yy846; if (yych != 'b') goto yy56; -yy906: +yy846: yych = *++YYCURSOR; - if (yych == 'E') goto yy907; + if (yych == 'E') goto yy847; if (yych != 'e') goto yy56; -yy907: +yy847: yych = *++YYCURSOR; - if (yych == 'R') goto yy908; + if (yych == 'R') goto yy848; if (yych != 'r') goto yy56; -yy908: +yy848: yych = *++YYCURSOR; - goto yy818; -yy909: + goto yy758; +yy849: yych = *++YYCURSOR; - if (yych == 'V') goto yy910; + if (yych == 'V') goto yy850; if (yych != 'v') goto yy56; -yy910: - yyaccept = 20; +yy850: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy911; - if (yych != 'e') goto yy818; -yy911: + if (yych == 'E') goto yy851; + if (yych != 'e') goto yy758; +yy851: yych = *++YYCURSOR; - if (yych == 'M') goto yy912; + if (yych == 'M') goto yy852; if (yych != 'm') goto yy56; -yy912: +yy852: yych = *++YYCURSOR; - if (yych == 'B') goto yy913; + if (yych == 'B') goto yy853; if (yych != 'b') goto yy56; -yy913: +yy853: yych = *++YYCURSOR; - if (yych == 'E') goto yy914; + if (yych == 'E') goto yy854; if (yych != 'e') goto yy56; -yy914: +yy854: yych = *++YYCURSOR; - if (yych == 'R') goto yy908; - if (yych == 'r') goto yy908; + if (yych == 'R') goto yy848; + if (yych == 'r') goto yy848; goto yy56; -yy915: +yy855: yych = *++YYCURSOR; - if (yych == 'T') goto yy916; + if (yych == 'T') goto yy856; if (yych != 't') goto yy56; -yy916: - yyaccept = 20; +yy856: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'O') goto yy917; - if (yych != 'o') goto yy818; -yy917: + if (yych == 'O') goto yy857; + if (yych != 'o') goto yy758; +yy857: yych = *++YYCURSOR; - if (yych == 'B') goto yy918; + if (yych == 'B') goto yy858; if (yych != 'b') goto yy56; -yy918: +yy858: yych = *++YYCURSOR; - if (yych == 'E') goto yy919; + if (yych == 'E') goto yy859; if (yych != 'e') goto yy56; -yy919: +yy859: yych = *++YYCURSOR; - if (yych == 'R') goto yy908; - if (yych == 'r') goto yy908; + if (yych == 'R') goto yy848; + if (yych == 'r') goto yy848; goto yy56; -yy920: +yy860: yych = *++YYCURSOR; if (yych <= 'P') { if (yych == 'C') goto yy121; @@ -13685,518 +12781,518 @@ if (yych != 'p') goto yy56; } } -yy921: +yy861: yych = *++YYCURSOR; - if (yych == 'T') goto yy922; - if (yych != 't') goto yy818; -yy922: - yyaccept = 20; + if (yych == 'T') goto yy862; + if (yych != 't') goto yy758; +yy862: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy923; - if (yych != 'e') goto yy818; -yy923: + if (yych == 'E') goto yy863; + if (yych != 'e') goto yy758; +yy863: yych = *++YYCURSOR; - if (yych == 'M') goto yy924; + if (yych == 'M') goto yy864; if (yych != 'm') goto yy56; -yy924: +yy864: yych = *++YYCURSOR; - if (yych == 'B') goto yy925; + if (yych == 'B') goto yy865; if (yych != 'b') goto yy56; -yy925: +yy865: yych = *++YYCURSOR; - if (yych == 'E') goto yy926; + if (yych == 'E') goto yy866; if (yych != 'e') goto yy56; -yy926: +yy866: yych = *++YYCURSOR; - if (yych == 'R') goto yy908; - if (yych == 'r') goto yy908; + if (yych == 'R') goto yy848; + if (yych == 'r') goto yy848; goto yy56; -yy927: +yy867: yych = *++YYCURSOR; - if (yych == 'G') goto yy931; - if (yych == 'g') goto yy931; + if (yych == 'G') goto yy871; + if (yych == 'g') goto yy871; goto yy56; -yy928: +yy868: yych = *++YYCURSOR; - if (yych == 'R') goto yy929; + if (yych == 'R') goto yy869; if (yych != 'r') goto yy56; -yy929: - yyaccept = 20; +yy869: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'I') goto yy930; - if (yych != 'i') goto yy818; -yy930: + if (yych == 'I') goto yy870; + if (yych != 'i') goto yy758; +yy870: yych = *++YYCURSOR; - if (yych == 'L') goto yy908; - if (yych == 'l') goto yy908; + if (yych == 'L') goto yy848; + if (yych == 'l') goto yy848; goto yy56; -yy931: - yyaccept = 20; +yy871: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'U') goto yy932; - if (yych != 'u') goto yy818; -yy932: + if (yych == 'U') goto yy872; + if (yych != 'u') goto yy758; +yy872: yych = *++YYCURSOR; - if (yych == 'S') goto yy933; + if (yych == 'S') goto yy873; if (yych != 's') goto yy56; -yy933: +yy873: yych = *++YYCURSOR; - if (yych == 'T') goto yy908; - if (yych == 't') goto yy908; + if (yych == 'T') goto yy848; + if (yych == 't') goto yy848; goto yy56; -yy934: +yy874: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy935; + if (yych == 'R') goto yy875; if (yych <= 'X') goto yy56; - goto yy908; + goto yy848; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; } else { - if (yych == 'y') goto yy908; + if (yych == 'y') goto yy848; goto yy56; } } -yy935: - yyaccept = 20; +yy875: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'C') goto yy936; - if (yych != 'c') goto yy818; -yy936: + if (yych == 'C') goto yy876; + if (yych != 'c') goto yy758; +yy876: yych = *++YYCURSOR; - if (yych == 'H') goto yy908; - if (yych == 'h') goto yy908; + if (yych == 'H') goto yy848; + if (yych == 'h') goto yy848; goto yy56; -yy937: +yy877: yych = *++YYCURSOR; - if (yych == 'B') goto yy938; + if (yych == 'B') goto yy878; if (yych != 'b') goto yy56; -yy938: - yyaccept = 20; +yy878: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'R') goto yy939; - if (yych != 'r') goto yy818; -yy939: + if (yych == 'R') goto yy879; + if (yych != 'r') goto yy758; +yy879: yych = *++YYCURSOR; - if (yych == 'U') goto yy940; + if (yych == 'U') goto yy880; if (yych != 'u') goto yy56; -yy940: +yy880: yych = *++YYCURSOR; - if (yych == 'A') goto yy941; + if (yych == 'A') goto yy881; if (yych != 'a') goto yy56; -yy941: +yy881: yych = *++YYCURSOR; - if (yych == 'R') goto yy942; + if (yych == 'R') goto yy882; if (yych != 'r') goto yy56; -yy942: +yy882: yych = *++YYCURSOR; - if (yych == 'Y') goto yy908; - if (yych == 'y') goto yy908; + if (yych == 'Y') goto yy848; + if (yych == 'y') goto yy848; goto yy56; -yy943: +yy883: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy950; + if (yych == 'L') goto yy890; if (yych <= 'M') goto yy56; - goto yy949; + goto yy889; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy950; + goto yy890; } else { - if (yych == 'n') goto yy949; + if (yych == 'n') goto yy889; goto yy56; } } -yy944: +yy884: yych = *++YYCURSOR; - if (yych == 'N') goto yy945; + if (yych == 'N') goto yy885; if (yych != 'n') goto yy56; -yy945: - yyaccept = 20; +yy885: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'U') goto yy946; - if (yych != 'u') goto yy818; -yy946: + if (yych == 'U') goto yy886; + if (yych != 'u') goto yy758; +yy886: yych = *++YYCURSOR; - if (yych == 'A') goto yy947; + if (yych == 'A') goto yy887; if (yych != 'a') goto yy56; -yy947: +yy887: yych = *++YYCURSOR; - if (yych == 'R') goto yy948; + if (yych == 'R') goto yy888; if (yych != 'r') goto yy56; -yy948: +yy888: yych = *++YYCURSOR; - if (yych == 'Y') goto yy908; - if (yych == 'y') goto yy908; + if (yych == 'Y') goto yy848; + if (yych == 'y') goto yy848; goto yy56; -yy949: +yy889: yych = *++YYCURSOR; - if (yych == 'E') goto yy908; - if (yych == 'e') goto yy908; - goto yy818; -yy950: + if (yych == 'E') goto yy848; + if (yych == 'e') goto yy848; + goto yy758; +yy890: yych = *++YYCURSOR; - if (yych == 'Y') goto yy908; - if (yych == 'y') goto yy908; - goto yy818; -yy951: + if (yych == 'Y') goto yy848; + if (yych == 'y') goto yy848; + goto yy758; +yy891: yych = *++YYCURSOR; - if (yych == 'I') goto yy908; - goto yy818; -yy952: + if (yych == 'I') goto yy848; + goto yy758; +yy892: yych = *++YYCURSOR; - if (yych != 'I') goto yy818; + if (yych != 'I') goto yy758; yych = *++YYCURSOR; - if (yych == 'I') goto yy908; - goto yy818; -yy954: + if (yych == 'I') goto yy848; + goto yy758; +yy894: yych = *++YYCURSOR; - if (yych == 'I') goto yy908; - goto yy818; -yy955: + if (yych == 'I') goto yy848; + goto yy758; +yy895: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy970; - if (yych <= '9') goto yy969; + if (yych <= '0') goto yy910; + if (yych <= '9') goto yy909; goto yy56; -yy956: +yy896: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy968; + if (yych <= '9') goto yy908; goto yy56; -yy957: +yy897: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy966; - if (yych <= '6') goto yy965; + if (yych <= '5') goto yy906; + if (yych <= '6') goto yy905; goto yy56; -yy958: +yy898: yych = *++YYCURSOR; - if (yych == 'E') goto yy937; - if (yych == 'e') goto yy937; + if (yych == 'E') goto yy877; + if (yych == 'e') goto yy877; goto yy56; -yy959: +yy899: yych = *++YYCURSOR; - if (yych == 'A') goto yy934; - if (yych == 'a') goto yy934; + if (yych == 'A') goto yy874; + if (yych == 'a') goto yy874; goto yy56; -yy960: +yy900: yych = *++YYCURSOR; - if (yych == 'E') goto yy964; - if (yych == 'e') goto yy964; + if (yych == 'E') goto yy904; + if (yych == 'e') goto yy904; goto yy56; -yy961: +yy901: yych = *++YYCURSOR; - if (yych == 'E') goto yy902; - if (yych == 'e') goto yy902; + if (yych == 'E') goto yy842; + if (yych == 'e') goto yy842; goto yy56; -yy962: +yy902: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; -yy963: +yy903: switch (yych) { case '\t': case ' ': case '-': - case '.': goto yy962; + case '.': goto yy902; case 'A': - case 'a': goto yy824; + case 'a': goto yy764; case 'D': - case 'd': goto yy961; + case 'd': goto yy901; case 'F': - case 'f': goto yy958; - case 'I': goto yy817; + case 'f': goto yy898; + case 'I': goto yy757; case 'J': - case 'j': goto yy821; + case 'j': goto yy761; case 'M': - case 'm': goto yy959; + case 'm': goto yy899; case 'N': - case 'n': goto yy827; + case 'n': goto yy767; case 'O': - case 'o': goto yy826; + case 'o': goto yy766; case 'S': - case 's': goto yy960; - case 'V': goto yy819; - case 'X': goto yy820; + case 's': goto yy900; + case 'V': goto yy759; + case 'X': goto yy760; default: goto yy56; } -yy964: +yy904: yych = *++YYCURSOR; - if (yych == 'P') goto yy921; - if (yych == 'p') goto yy921; + if (yych == 'P') goto yy861; + if (yych == 'p') goto yy861; goto yy56; -yy965: +yy905: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '6') goto yy967; + if (yych <= '6') goto yy907; goto yy56; -yy966: +yy906: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy967: +yy907: yych = *++YYCURSOR; - goto yy846; -yy968: + goto yy786; +yy908: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy967; + if (yych <= '9') goto yy907; goto yy56; -yy969: +yy909: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy967; + if (yych <= '9') goto yy907; goto yy56; -yy970: +yy910: yych = *++YYCURSOR; if (yych <= '0') goto yy56; - if (yych <= '9') goto yy967; + if (yych <= '9') goto yy907; goto yy56; -yy971: +yy911: yych = *++YYCURSOR; if (yych <= '.') goto yy56; - if (yych <= '/') goto yy974; - if (yych <= '9') goto yy982; + if (yych <= '/') goto yy914; + if (yych <= '9') goto yy922; goto yy56; -yy972: +yy912: yych = *++YYCURSOR; if (yych <= '.') goto yy56; - if (yych <= '/') goto yy974; - if (yych <= '2') goto yy982; + if (yych <= '/') goto yy914; + if (yych <= '2') goto yy922; goto yy56; -yy973: +yy913: yych = *++YYCURSOR; if (yych != '/') goto yy56; -yy974: +yy914: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy975; - if (yych <= '3') goto yy976; - if (yych <= '9') goto yy977; + if (yych <= '2') goto yy915; + if (yych <= '3') goto yy916; + if (yych <= '9') goto yy917; goto yy56; -yy975: - yyaccept = 21; +yy915: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy479; - if (yych <= '9') goto yy977; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych <= '/') goto yy419; + if (yych <= '9') goto yy917; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy976: - yyaccept = 21; +yy916: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy479; - if (yych <= '1') goto yy977; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych <= '/') goto yy419; + if (yych <= '1') goto yy917; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy977: - yyaccept = 21; +yy917: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy979; - goto yy479; + if (yych == 'n') goto yy919; + goto yy419; } else { - if (yych <= 'r') goto yy980; - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 'r') goto yy920; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } -yy978: +yy918: yych = *++YYCURSOR; - if (yych == 't') goto yy478; + if (yych == 't') goto yy418; goto yy56; -yy979: +yy919: yych = *++YYCURSOR; - if (yych == 'd') goto yy478; + if (yych == 'd') goto yy418; goto yy56; -yy980: +yy920: yych = *++YYCURSOR; - if (yych == 'd') goto yy478; + if (yych == 'd') goto yy418; goto yy56; -yy981: +yy921: yych = *++YYCURSOR; - if (yych == 'h') goto yy478; + if (yych == 'h') goto yy418; goto yy56; -yy982: +yy922: yych = *++YYCURSOR; if (yych != '/') goto yy56; yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych >= '1') goto yy985; + if (yych >= '1') goto yy925; } else { - if (yych <= '3') goto yy986; - if (yych <= '9') goto yy977; + if (yych <= '3') goto yy926; + if (yych <= '9') goto yy917; goto yy56; } - yyaccept = 21; + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy479; - if (yych <= '9') goto yy987; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych <= '/') goto yy419; + if (yych <= '9') goto yy927; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy985: - yyaccept = 21; +yy925: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy479; - if (yych <= '9') goto yy987; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych <= '/') goto yy419; + if (yych <= '9') goto yy927; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy986: - yyaccept = 21; +yy926: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy479; - if (yych <= '1') goto yy987; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych <= '/') goto yy419; + if (yych <= '1') goto yy927; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy987: - yyaccept = 21; +yy927: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == '/') goto yy478; - if (yych <= 'm') goto yy479; - goto yy979; + if (yych == '/') goto yy418; + if (yych <= 'm') goto yy419; + goto yy919; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy980; + if (yych <= 'q') goto yy419; + goto yy920; } else { - if (yych <= 's') goto yy978; - if (yych <= 't') goto yy981; - goto yy479; + if (yych <= 's') goto yy918; + if (yych <= 't') goto yy921; + goto yy419; } } -yy988: +yy928: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy1068; + if (yych == 'A') goto yy1008; if (yych <= 'T') goto yy56; - goto yy1067; + goto yy1007; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; - goto yy1068; + goto yy1008; } else { - if (yych == 'u') goto yy1067; + if (yych == 'u') goto yy1007; goto yy56; } } -yy989: +yy929: yych = *++YYCURSOR; - if (yych == 'E') goto yy1065; - if (yych == 'e') goto yy1065; + if (yych == 'E') goto yy1005; + if (yych == 'e') goto yy1005; goto yy56; -yy990: +yy930: yych = *++YYCURSOR; - if (yych == 'A') goto yy1062; - if (yych == 'a') goto yy1062; + if (yych == 'A') goto yy1002; + if (yych == 'a') goto yy1002; goto yy56; -yy991: +yy931: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy1059; + if (yych == 'P') goto yy999; if (yych <= 'T') goto yy56; - goto yy1058; + goto yy998; } else { if (yych <= 'p') { if (yych <= 'o') goto yy56; - goto yy1059; + goto yy999; } else { - if (yych == 'u') goto yy1058; + if (yych == 'u') goto yy998; goto yy56; } } -yy992: +yy932: yych = *++YYCURSOR; - if (yych == 'E') goto yy1055; - if (yych == 'e') goto yy1055; + if (yych == 'E') goto yy995; + if (yych == 'e') goto yy995; goto yy56; -yy993: +yy933: yych = *++YYCURSOR; - if (yych == 'C') goto yy1053; - if (yych == 'c') goto yy1053; + if (yych == 'C') goto yy993; + if (yych == 'c') goto yy993; goto yy56; -yy994: +yy934: yych = *++YYCURSOR; - if (yych == 'O') goto yy1051; - if (yych == 'o') goto yy1051; + if (yych == 'O') goto yy991; + if (yych == 'o') goto yy991; goto yy56; -yy995: +yy935: yych = *++YYCURSOR; - if (yych == 'E') goto yy1049; - if (yych == 'e') goto yy1049; + if (yych == 'E') goto yy989; + if (yych == 'e') goto yy989; goto yy56; -yy996: +yy936: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy835; - if (yych <= '4') goto yy836; - if (yych <= '5') goto yy837; + if (yych <= '0') goto yy775; + if (yych <= '4') goto yy776; + if (yych <= '5') goto yy777; goto yy56; -yy997: - yyaccept = 22; +yy937: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy1001; - if (yych <= '/') goto yy998; - if (yych <= '9') goto yy1020; -yy998: + if (yych == '-') goto yy941; + if (yych <= '/') goto yy938; + if (yych <= '9') goto yy960; +yy938: { int length = 0; DEBUG_OUTPUT("gnudateshorter"); @@ -14209,638 +13305,638 @@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -yy999: - yyaccept = 22; +yy939: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy1001; - if (yych <= '/') goto yy998; - if (yych <= '2') goto yy1020; - goto yy998; -yy1000: - yyaccept = 22; + if (yych == '-') goto yy941; + if (yych <= '/') goto yy938; + if (yych <= '2') goto yy960; + goto yy938; +yy940: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '-') goto yy998; -yy1001: + if (yych != '-') goto yy938; +yy941: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy1002; - if (yych <= '3') goto yy1003; - if (yych <= '9') goto yy1004; + if (yych <= '2') goto yy942; + if (yych <= '3') goto yy943; + if (yych <= '9') goto yy944; goto yy56; -yy1002: - yyaccept = 13; +yy942: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy681; - goto yy1004; + if (yych <= '/') goto yy621; + goto yy944; } else { - if (yych == 'T') goto yy1009; - goto yy681; + if (yych == 'T') goto yy949; + goto yy621; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy1006; - if (yych <= 'q') goto yy681; - goto yy1007; - } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 'n') goto yy946; + if (yych <= 'q') goto yy621; + goto yy947; + } else { + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1003: - yyaccept = 13; +yy943: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '1') { - if (yych <= '/') goto yy681; + if (yych <= '/') goto yy621; } else { - if (yych == 'T') goto yy1009; - goto yy681; + if (yych == 'T') goto yy949; + goto yy621; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy1006; - if (yych <= 'q') goto yy681; - goto yy1007; - } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 'n') goto yy946; + if (yych <= 'q') goto yy621; + goto yy947; + } else { + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1004: - yyaccept = 13; +yy944: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == 'T') goto yy1009; - if (yych <= 'm') goto yy681; - goto yy1006; + if (yych == 'T') goto yy949; + if (yych <= 'm') goto yy621; + goto yy946; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy1007; + if (yych <= 'q') goto yy621; + goto yy947; } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1005: +yy945: yych = *++YYCURSOR; - if (yych == 't') goto yy1019; + if (yych == 't') goto yy959; goto yy56; -yy1006: +yy946: yych = *++YYCURSOR; - if (yych == 'd') goto yy1019; + if (yych == 'd') goto yy959; goto yy56; -yy1007: +yy947: yych = *++YYCURSOR; - if (yych == 'd') goto yy1019; + if (yych == 'd') goto yy959; goto yy56; -yy1008: +yy948: yych = *++YYCURSOR; - if (yych == 'h') goto yy1019; + if (yych == 'h') goto yy959; goto yy56; -yy1009: +yy949: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy1010; - if (yych <= '2') goto yy1011; - if (yych <= '9') goto yy1012; + if (yych <= '1') goto yy950; + if (yych <= '2') goto yy951; + if (yych <= '9') goto yy952; goto yy56; -yy1010: +yy950: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1012; - if (yych <= ':') goto yy1013; + if (yych <= '9') goto yy952; + if (yych <= ':') goto yy953; goto yy56; -yy1011: +yy951: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '4') goto yy1012; - if (yych == ':') goto yy1013; + if (yych <= '4') goto yy952; + if (yych == ':') goto yy953; goto yy56; -yy1012: +yy952: yych = *++YYCURSOR; if (yych != ':') goto yy56; -yy1013: +yy953: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1014; - if (yych <= '9') goto yy1015; + if (yych <= '5') goto yy954; + if (yych <= '9') goto yy955; goto yy56; -yy1014: +yy954: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1015; - if (yych <= ':') goto yy1016; + if (yych <= '9') goto yy955; + if (yych <= ':') goto yy956; goto yy56; -yy1015: +yy955: yych = *++YYCURSOR; if (yych != ':') goto yy56; -yy1016: +yy956: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1017; - if (yych <= '6') goto yy1018; - if (yych <= '9') goto yy866; + if (yych <= '5') goto yy957; + if (yych <= '6') goto yy958; + if (yych <= '9') goto yy806; goto yy56; -yy1017: +yy957: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '9') goto yy866; - goto yy867; -yy1018: + if (yych <= '/') goto yy807; + if (yych <= '9') goto yy806; + goto yy807; +yy958: yych = *++YYCURSOR; - if (yych == '0') goto yy866; - goto yy867; -yy1019: - yyaccept = 13; + if (yych == '0') goto yy806; + goto yy807; +yy959: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'T') goto yy1009; - goto yy681; -yy1020: - yyaccept = 22; + if (yych == 'T') goto yy949; + goto yy621; +yy960: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '-') goto yy998; + if (yych != '-') goto yy938; yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych >= '1') goto yy1023; + if (yych >= '1') goto yy963; } else { - if (yych <= '3') goto yy1024; - if (yych <= '9') goto yy1004; + if (yych <= '3') goto yy964; + if (yych <= '9') goto yy944; goto yy56; } - yyaccept = 13; + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy681; - goto yy1025; + if (yych <= '/') goto yy621; + goto yy965; } else { - if (yych == 'T') goto yy1009; - goto yy681; + if (yych == 'T') goto yy949; + goto yy621; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy1006; - if (yych <= 'q') goto yy681; - goto yy1007; - } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 'n') goto yy946; + if (yych <= 'q') goto yy621; + goto yy947; + } else { + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1023: - yyaccept = 13; +yy963: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy681; - goto yy1025; + if (yych <= '/') goto yy621; + goto yy965; } else { - if (yych == 'T') goto yy1009; - goto yy681; + if (yych == 'T') goto yy949; + goto yy621; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy1006; - if (yych <= 'q') goto yy681; - goto yy1007; - } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 'n') goto yy946; + if (yych <= 'q') goto yy621; + goto yy947; + } else { + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1024: - yyaccept = 13; +yy964: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '1') { - if (yych <= '/') goto yy681; + if (yych <= '/') goto yy621; } else { - if (yych == 'T') goto yy1009; - goto yy681; + if (yych == 'T') goto yy949; + goto yy621; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy1006; - if (yych <= 'q') goto yy681; - goto yy1007; - } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy681; + if (yych <= 'n') goto yy946; + if (yych <= 'q') goto yy621; + goto yy947; + } else { + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy621; } } -yy1025: - yyaccept = 21; +yy965: + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == 'T') goto yy1026; - if (yych <= 'm') goto yy479; - goto yy1006; + if (yych == 'T') goto yy966; + if (yych <= 'm') goto yy419; + goto yy946; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy479; - goto yy1007; + if (yych <= 'q') goto yy419; + goto yy947; } else { - if (yych <= 's') goto yy1005; - if (yych <= 't') goto yy1008; - goto yy479; + if (yych <= 's') goto yy945; + if (yych <= 't') goto yy948; + goto yy419; } } -yy1026: +yy966: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy1027; - if (yych <= '2') goto yy1028; - if (yych <= '9') goto yy1012; + if (yych <= '1') goto yy967; + if (yych <= '2') goto yy968; + if (yych <= '9') goto yy952; goto yy56; -yy1027: +yy967: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1029; - if (yych <= ':') goto yy1013; + if (yych <= '9') goto yy969; + if (yych <= ':') goto yy953; goto yy56; -yy1028: +yy968: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '4') goto yy1029; - if (yych == ':') goto yy1013; + if (yych <= '4') goto yy969; + if (yych == ':') goto yy953; goto yy56; -yy1029: +yy969: yych = *++YYCURSOR; if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1031; - if (yych <= '9') goto yy1015; + if (yych <= '5') goto yy971; + if (yych <= '9') goto yy955; goto yy56; -yy1031: +yy971: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1032; - if (yych <= ':') goto yy1016; + if (yych <= '9') goto yy972; + if (yych <= ':') goto yy956; goto yy56; -yy1032: +yy972: yych = *++YYCURSOR; if (yych != ':') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1034; - if (yych <= '6') goto yy1035; - if (yych <= '9') goto yy866; + if (yych <= '5') goto yy974; + if (yych <= '6') goto yy975; + if (yych <= '9') goto yy806; goto yy56; -yy1034: +yy974: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '9') goto yy1036; - goto yy867; -yy1035: + if (yych <= '/') goto yy807; + if (yych <= '9') goto yy976; + goto yy807; +yy975: yych = *++YYCURSOR; - if (yych != '0') goto yy867; -yy1036: - yyaccept = 23; + if (yych != '0') goto yy807; +yy976: + yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '.') goto yy867; + if (yych != '.') goto yy807; yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy1038: - yyaccept = 23; +yy978: + yyaccept = 22; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; if (yych <= '-') { - if (yych == '+') goto yy1041; - if (yych <= ',') goto yy867; - goto yy1041; + if (yych == '+') goto yy981; + if (yych <= ',') goto yy807; + goto yy981; } else { if (yych <= '9') { - if (yych <= '/') goto yy867; - goto yy1038; + if (yych <= '/') goto yy807; + goto yy978; } else { - if (yych != 'G') goto yy867; + if (yych != 'G') goto yy807; } } yych = *++YYCURSOR; - if (yych == 'M') goto yy1047; + if (yych == 'M') goto yy987; goto yy56; -yy1041: +yy981: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy1042; - if (yych <= '2') goto yy1043; - if (yych <= '9') goto yy1044; + if (yych <= '1') goto yy982; + if (yych <= '2') goto yy983; + if (yych <= '9') goto yy984; goto yy56; -yy1042: +yy982: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '9') goto yy1044; - if (yych <= ':') goto yy1045; - goto yy867; -yy1043: + if (yych <= '/') goto yy807; + if (yych <= '9') goto yy984; + if (yych <= ':') goto yy985; + goto yy807; +yy983: yych = *++YYCURSOR; if (yych <= '5') { - if (yych <= '/') goto yy867; - if (yych >= '5') goto yy1046; + if (yych <= '/') goto yy807; + if (yych >= '5') goto yy986; } else { - if (yych <= '9') goto yy866; - if (yych <= ':') goto yy1045; - goto yy867; - } -yy1044: - yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '5') goto yy1046; - if (yych <= '9') goto yy866; - if (yych >= ';') goto yy867; -yy1045: + if (yych <= '9') goto yy806; + if (yych <= ':') goto yy985; + goto yy807; + } +yy984: + yych = *++YYCURSOR; + if (yych <= '/') goto yy807; + if (yych <= '5') goto yy986; + if (yych <= '9') goto yy806; + if (yych >= ';') goto yy807; +yy985: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '5') goto yy1046; - if (yych <= '9') goto yy866; - goto yy867; -yy1046: + if (yych <= '/') goto yy807; + if (yych <= '5') goto yy986; + if (yych <= '9') goto yy806; + goto yy807; +yy986: yych = *++YYCURSOR; - if (yych <= '/') goto yy867; - if (yych <= '9') goto yy866; - goto yy867; -yy1047: + if (yych <= '/') goto yy807; + if (yych <= '9') goto yy806; + goto yy807; +yy987: yych = *++YYCURSOR; if (yych != 'T') goto yy56; yych = *++YYCURSOR; - if (yych == '+') goto yy1041; - if (yych == '-') goto yy1041; + if (yych == '+') goto yy981; + if (yych == '-') goto yy981; goto yy56; -yy1049: +yy989: yych = *++YYCURSOR; - if (yych == 'C') goto yy1050; + if (yych == 'C') goto yy990; if (yych != 'c') goto yy56; -yy1050: - yyaccept = 20; +yy990: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'E') goto yy904; - if (yych == 'e') goto yy904; - goto yy818; + if (yych <= 'E') goto yy844; + if (yych == 'e') goto yy844; + goto yy758; } -yy1051: +yy991: yych = *++YYCURSOR; - if (yych == 'V') goto yy1052; + if (yych == 'V') goto yy992; if (yych != 'v') goto yy56; -yy1052: - yyaccept = 20; +yy992: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'E') goto yy911; - if (yych == 'e') goto yy911; - goto yy818; + if (yych <= 'E') goto yy851; + if (yych == 'e') goto yy851; + goto yy758; } -yy1053: +yy993: yych = *++YYCURSOR; - if (yych == 'T') goto yy1054; + if (yych == 'T') goto yy994; if (yych != 't') goto yy56; -yy1054: - yyaccept = 20; +yy994: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'O') goto yy917; - if (yych == 'o') goto yy917; - goto yy818; + if (yych <= 'O') goto yy857; + if (yych == 'o') goto yy857; + goto yy758; } -yy1055: +yy995: yych = *++YYCURSOR; - if (yych == 'P') goto yy1056; + if (yych == 'P') goto yy996; if (yych != 'p') goto yy56; -yy1056: - yyaccept = 20; +yy996: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'T') goto yy1057; - if (yych != 't') goto yy818; + if (yych <= 'T') goto yy997; + if (yych != 't') goto yy758; } -yy1057: - yyaccept = 20; +yy997: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'E') goto yy923; - if (yych == 'e') goto yy923; - goto yy818; + if (yych <= 'E') goto yy863; + if (yych == 'e') goto yy863; + goto yy758; } -yy1058: +yy998: yych = *++YYCURSOR; - if (yych == 'G') goto yy1061; - if (yych == 'g') goto yy1061; + if (yych == 'G') goto yy1001; + if (yych == 'g') goto yy1001; goto yy56; -yy1059: +yy999: yych = *++YYCURSOR; - if (yych == 'R') goto yy1060; + if (yych == 'R') goto yy1000; if (yych != 'r') goto yy56; -yy1060: - yyaccept = 20; +yy1000: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'I') goto yy930; - if (yych == 'i') goto yy930; - goto yy818; + if (yych <= 'I') goto yy870; + if (yych == 'i') goto yy870; + goto yy758; } -yy1061: - yyaccept = 20; +yy1001: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'U') goto yy932; - if (yych == 'u') goto yy932; - goto yy818; + if (yych <= 'U') goto yy872; + if (yych == 'u') goto yy872; + goto yy758; } -yy1062: +yy1002: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy1063; + if (yych == 'R') goto yy1003; if (yych <= 'X') goto yy56; - goto yy1064; + goto yy1004; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; } else { - if (yych == 'y') goto yy1064; + if (yych == 'y') goto yy1004; goto yy56; } } -yy1063: - yyaccept = 20; +yy1003: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'C') goto yy936; - if (yych == 'c') goto yy936; - goto yy818; + if (yych <= 'C') goto yy876; + if (yych == 'c') goto yy876; + goto yy758; } -yy1064: - yyaccept = 20; +yy1004: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy791; - goto yy818; -yy1065: + if (yych == '-') goto yy731; + goto yy758; +yy1005: yych = *++YYCURSOR; - if (yych == 'B') goto yy1066; + if (yych == 'B') goto yy1006; if (yych != 'b') goto yy56; -yy1066: - yyaccept = 20; +yy1006: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'R') goto yy939; - if (yych == 'r') goto yy939; - goto yy818; + if (yych <= 'R') goto yy879; + if (yych == 'r') goto yy879; + goto yy758; } -yy1067: +yy1007: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy1071; + if (yych == 'L') goto yy1011; if (yych <= 'M') goto yy56; - goto yy1070; + goto yy1010; } else { if (yych <= 'l') { if (yych <= 'k') goto yy56; - goto yy1071; + goto yy1011; } else { - if (yych == 'n') goto yy1070; + if (yych == 'n') goto yy1010; goto yy56; } } -yy1068: +yy1008: yych = *++YYCURSOR; - if (yych == 'N') goto yy1069; + if (yych == 'N') goto yy1009; if (yych != 'n') goto yy56; -yy1069: - yyaccept = 20; +yy1009: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'U') goto yy946; - if (yych == 'u') goto yy946; - goto yy818; + if (yych <= 'U') goto yy886; + if (yych == 'u') goto yy886; + goto yy758; } -yy1070: - yyaccept = 20; +yy1010: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'E') goto yy908; - if (yych == 'e') goto yy908; - goto yy818; + if (yych <= 'E') goto yy848; + if (yych == 'e') goto yy848; + goto yy758; } -yy1071: - yyaccept = 20; +yy1011: + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { - if (yych == '-') goto yy791; - goto yy818; + if (yych == '-') goto yy731; + goto yy758; } else { - if (yych <= 'Y') goto yy908; - if (yych == 'y') goto yy908; - goto yy818; + if (yych <= 'Y') goto yy848; + if (yych == 'y') goto yy848; + goto yy758; } -yy1072: +yy1012: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= '\t') { - if (yych <= 0x08) goto yy602; - goto yy755; + if (yych <= 0x08) goto yy542; + goto yy695; } else { - if (yych <= ',') goto yy602; - if (yych <= '-') goto yy756; - goto yy755; + if (yych <= ',') goto yy542; + if (yych <= '-') goto yy696; + goto yy695; } } else { if (yych <= 'U') { - if (yych <= '/') goto yy754; - if (yych <= 'T') goto yy602; + if (yych <= '/') goto yy694; + if (yych <= 'T') goto yy542; goto yy79; } else { if (yych == 'u') goto yy79; - goto yy602; + goto yy542; } } -yy1073: +yy1013: yych = *++YYCURSOR; if (yych <= 'P') { if (yych == 'C') goto yy121; if (yych <= 'O') goto yy56; - goto yy610; + goto yy550; } else { if (yych <= 'c') { if (yych <= 'b') goto yy56; goto yy121; } else { - if (yych == 'p') goto yy610; + if (yych == 'p') goto yy550; goto yy56; } } -yy1074: +yy1014: yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ',') { - if (yych == '\t') goto yy1076; - goto yy1078; + if (yych == '\t') goto yy1016; + goto yy1018; } else { - if (yych <= '-') goto yy1075; - if (yych <= '.') goto yy755; - if (yych <= '/') goto yy754; - goto yy765; + if (yych <= '-') goto yy1015; + if (yych <= '.') goto yy695; + if (yych <= '/') goto yy694; + goto yy705; } } else { if (yych <= 'q') { - if (yych == 'n') goto yy494; - goto yy1078; + if (yych == 'n') goto yy434; + goto yy1018; } else { - if (yych <= 'r') goto yy495; - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy1078; + if (yych <= 'r') goto yy435; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy1018; } } -yy1075: +yy1015: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy1079; - case '1': goto yy1080; + case '0': goto yy1019; + case '1': goto yy1020; case '2': case '3': case '4': @@ -14848,55 +13944,55 @@ case '6': case '7': case '8': - case '9': goto yy642; + case '9': goto yy582; case 'A': - case 'a': goto yy646; + case 'a': goto yy586; case 'D': - case 'd': goto yy650; + case 'd': goto yy590; case 'F': - case 'f': goto yy644; + case 'f': goto yy584; case 'J': - case 'j': goto yy643; + case 'j': goto yy583; case 'M': - case 'm': goto yy645; + case 'm': goto yy585; case 'N': - case 'n': goto yy649; + case 'n': goto yy589; case 'O': - case 'o': goto yy648; + case 'o': goto yy588; case 'S': - case 's': goto yy647; - default: goto yy602; + case 's': goto yy587; + default: goto yy542; } -yy1076: +yy1016: yych = *++YYCURSOR; - if (yych <= '/') goto yy1078; - if (yych <= '0') goto yy760; - if (yych <= '1') goto yy761; - if (yych <= '9') goto yy762; - goto yy1078; -yy1077: + if (yych <= '/') goto yy1018; + if (yych <= '0') goto yy700; + if (yych <= '1') goto yy701; + if (yych <= '9') goto yy702; + goto yy1018; +yy1017: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy1078: +yy1018: if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1077; + if (yych == '\t') goto yy1017; goto yy56; } else { - if (yych <= ' ') goto yy1077; + if (yych <= ' ') goto yy1017; if (yych <= ',') goto yy56; - goto yy601; + goto yy541; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy598; + if (yych == 'A') goto yy538; goto yy56; } else { - if (yych <= 'D') goto yy490; - if (yych == 'F') goto yy491; + if (yych <= 'D') goto yy430; + if (yych == 'F') goto yy431; goto yy56; } } @@ -14904,22 +14000,22 @@ if (yych <= 'N') { if (yych <= 'J') { if (yych <= 'H') goto yy65; - if (yych <= 'I') goto yy499; - goto yy503; + if (yych <= 'I') goto yy439; + goto yy443; } else { if (yych <= 'L') goto yy56; - if (yych <= 'M') goto yy487; - goto yy506; + if (yych <= 'M') goto yy427; + goto yy446; } } else { if (yych <= 'S') { - if (yych <= 'O') goto yy505; + if (yych <= 'O') goto yy445; if (yych <= 'R') goto yy56; - goto yy488; + goto yy428; } else { if (yych <= 'T') goto yy70; if (yych <= 'U') goto yy63; - if (yych <= 'V') goto yy501; + if (yych <= 'V') goto yy441; goto yy69; } } @@ -14928,33 +14024,33 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych <= '`') { - if (yych <= 'X') goto yy502; + if (yych <= 'X') goto yy442; if (yych <= 'Y') goto yy68; goto yy56; } else { - if (yych <= 'a') goto yy598; + if (yych <= 'a') goto yy538; if (yych <= 'c') goto yy56; - goto yy490; + goto yy430; } } else { if (yych <= 'g') { - if (yych == 'f') goto yy491; + if (yych == 'f') goto yy431; goto yy56; } else { if (yych <= 'h') goto yy65; - if (yych == 'j') goto yy503; + if (yych == 'j') goto yy443; goto yy56; } } } else { if (yych <= 'u') { if (yych <= 'o') { - if (yych <= 'm') goto yy487; - if (yych <= 'n') goto yy506; - goto yy505; + if (yych <= 'm') goto yy427; + if (yych <= 'n') goto yy446; + goto yy445; } else { if (yych <= 'r') goto yy56; - if (yych <= 's') goto yy488; + if (yych <= 's') goto yy428; if (yych <= 't') goto yy70; goto yy63; } @@ -14970,202 +14066,202 @@ } } } -yy1079: +yy1019: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy679; - goto yy626; + if (yych <= '-') goto yy619; + goto yy566; } else { if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1081; + if (yych <= '9') goto yy1021; goto yy56; } -yy1080: +yy1020: yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy56; - if (yych <= '-') goto yy679; - goto yy626; + if (yych <= '-') goto yy619; + goto yy566; } else { if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; } -yy1081: +yy1021: yych = *++YYCURSOR; if (yych <= ',') goto yy56; - if (yych <= '-') goto yy1082; - if (yych <= '.') goto yy626; + if (yych <= '-') goto yy1022; + if (yych <= '.') goto yy566; goto yy56; -yy1082: +yy1022: yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy56; - if (yych >= '1') goto yy1084; + if (yych >= '1') goto yy1024; } else { - if (yych <= '3') goto yy1085; - if (yych <= '9') goto yy683; + if (yych <= '3') goto yy1025; + if (yych <= '9') goto yy623; goto yy56; } - yyaccept = 13; + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy1086; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy1026; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy1084: - yyaccept = 13; +yy1024: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy681; - if (yych <= '9') goto yy1086; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '/') goto yy621; + if (yych <= '9') goto yy1026; + if (yych <= 'm') goto yy621; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy1085: - yyaccept = 13; +yy1025: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '1') { - if (yych <= '/') goto yy681; + if (yych <= '/') goto yy621; } else { - if (yych <= '9') goto yy628; - if (yych <= 'm') goto yy681; - goto yy685; + if (yych <= '9') goto yy568; + if (yych <= 'm') goto yy621; + goto yy625; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy681; - goto yy686; + if (yych <= 'q') goto yy621; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy681; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy621; } } -yy1086: - yyaccept = 15; +yy1026: + yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy788; - if (yych <= '9') goto yy629; - if (yych <= 'm') goto yy788; - goto yy685; + if (yych <= '/') goto yy728; + if (yych <= '9') goto yy569; + if (yych <= 'm') goto yy728; + goto yy625; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy788; - goto yy686; + if (yych <= 'q') goto yy728; + goto yy626; } else { - if (yych <= 's') goto yy684; - if (yych <= 't') goto yy687; - goto yy788; + if (yych <= 's') goto yy624; + if (yych <= 't') goto yy627; + goto yy728; } } -yy1087: +yy1027: yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy1076; - if (yych <= ',') goto yy1078; - goto yy1075; - } else { - if (yych <= '.') goto yy1088; - if (yych <= '/') goto yy754; - if (yych <= '5') goto yy1090; - goto yy765; + if (yych == '\t') goto yy1016; + if (yych <= ',') goto yy1018; + goto yy1015; + } else { + if (yych <= '.') goto yy1028; + if (yych <= '/') goto yy694; + if (yych <= '5') goto yy1030; + goto yy705; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy1089; - if (yych == 'n') goto yy494; - goto yy1078; - } else { - if (yych <= 'r') goto yy495; - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy1078; + if (yych <= ':') goto yy1029; + if (yych == 'n') goto yy434; + goto yy1018; + } else { + if (yych <= 'r') goto yy435; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy1018; } } -yy1088: +yy1028: yych = *++YYCURSOR; if (yych <= '1') { - if (yych <= '/') goto yy602; - if (yych <= '0') goto yy1112; - goto yy1113; - } else { - if (yych <= '5') goto yy1114; - if (yych <= '9') goto yy1115; - goto yy602; + if (yych <= '/') goto yy542; + if (yych <= '0') goto yy1052; + goto yy1053; + } else { + if (yych <= '5') goto yy1054; + if (yych <= '9') goto yy1055; + goto yy542; } -yy1089: +yy1029: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1107; - if (yych <= '9') goto yy1108; + if (yych <= '5') goto yy1047; + if (yych <= '9') goto yy1048; goto yy56; -yy1090: +yy1030: yych = *++YYCURSOR; - if (yych == '-') goto yy809; + if (yych == '-') goto yy749; if (yych <= '/') goto yy60; if (yych >= ':') goto yy60; - yyaccept = 24; + yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '3') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy815; + if (yych == '\t') goto yy755; } else { - if (yych <= ' ') goto yy815; - if (yych >= '-') goto yy812; + if (yych <= ' ') goto yy755; + if (yych >= '-') goto yy752; } } else { if (yych <= '0') { - if (yych <= '.') goto yy816; - if (yych <= '/') goto yy813; - goto yy1093; - } else { - if (yych <= '1') goto yy1094; - if (yych <= '2') goto yy1095; - goto yy1096; + if (yych <= '.') goto yy756; + if (yych <= '/') goto yy753; + goto yy1033; + } else { + if (yych <= '1') goto yy1034; + if (yych <= '2') goto yy1035; + goto yy1036; } } } else { if (yych <= 'A') { if (yych <= '9') { - if (yych <= '5') goto yy1097; - if (yych <= '6') goto yy1098; + if (yych <= '5') goto yy1037; + if (yych <= '6') goto yy1038; goto yy54; } else { - if (yych <= ':') goto yy831; - if (yych >= 'A') goto yy815; + if (yych <= ':') goto yy771; + if (yych >= 'A') goto yy755; } } else { if (yych <= 'E') { - if (yych == 'D') goto yy815; + if (yych == 'D') goto yy755; } else { - if (yych == 'G') goto yy1092; - if (yych <= 'J') goto yy815; + if (yych == 'G') goto yy1032; + if (yych <= 'J') goto yy755; } } } @@ -15173,40 +14269,40 @@ if (yych <= 'h') { if (yych <= '`') { if (yych <= 'V') { - if (yych <= 'O') goto yy815; - if (yych >= 'S') goto yy815; + if (yych <= 'O') goto yy755; + if (yych >= 'S') goto yy755; } else { - if (yych <= 'W') goto yy834; - if (yych <= 'Y') goto yy815; + if (yych <= 'W') goto yy774; + if (yych <= 'Y') goto yy755; } } else { if (yych <= 'd') { - if (yych <= 'a') goto yy815; - if (yych >= 'd') goto yy815; + if (yych <= 'a') goto yy755; + if (yych >= 'd') goto yy755; } else { - if (yych == 'f') goto yy815; - if (yych >= 'h') goto yy815; + if (yych == 'f') goto yy755; + if (yych >= 'h') goto yy755; } } } else { if (yych <= 'u') { if (yych <= 'l') { - if (yych == 'j') goto yy815; + if (yych == 'j') goto yy755; } else { - if (yych <= 'o') goto yy815; - if (yych >= 's') goto yy815; + if (yych <= 'o') goto yy755; + if (yych >= 's') goto yy755; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy815; + if (yych == 'w') goto yy755; } else { - if (yych <= 'y') goto yy815; - if (yych == 0xC2) goto yy815; + if (yych <= 'y') goto yy755; + if (yych == 0xC2) goto yy755; } } } } -yy1092: +yy1032: { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@ -15228,43 +14324,43 @@ TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } -yy1093: +yy1033: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '0') goto yy1105; - if (yych <= '9') goto yy1106; + if (yych <= '0') goto yy1045; + if (yych <= '9') goto yy1046; goto yy60; -yy1094: +yy1034: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '2') goto yy1104; - if (yych <= '9') goto yy1103; + if (yych <= '2') goto yy1044; + if (yych <= '9') goto yy1043; goto yy60; -yy1095: +yy1035: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy1103; + if (yych <= '9') goto yy1043; goto yy60; -yy1096: +yy1036: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '5') goto yy1101; - if (yych <= '6') goto yy1102; - if (yych <= '9') goto yy1099; + if (yych <= '5') goto yy1041; + if (yych <= '6') goto yy1042; + if (yych <= '9') goto yy1039; goto yy60; -yy1097: +yy1037: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy1099; + if (yych <= '9') goto yy1039; goto yy60; -yy1098: +yy1038: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '0') goto yy1099; + if (yych <= '0') goto yy1039; if (yych <= '9') goto yy54; goto yy60; -yy1099: - yyaccept = 25; +yy1039: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy54; @@ -15305,7 +14401,7 @@ } } else { if (yych <= 'w') { - if (yych <= 'r') goto yy1100; + if (yych <= 'r') goto yy1040; if (yych != 'v') goto yy60; } else { if (yych <= 'y') { @@ -15316,7 +14412,7 @@ } } } -yy1100: +yy1040: { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@ -15335,35 +14431,35 @@ TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -yy1101: - yyaccept = 25; +yy1041: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy1100; + if (yych <= 0x1F) goto yy1040; goto yy60; } else { if (yych <= '9') { - if (yych <= '/') goto yy1100; - goto yy845; + if (yych <= '/') goto yy1040; + goto yy785; } else { if (yych == 'D') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy1100; + if (yych == 'G') goto yy1040; if (yych <= 'H') goto yy60; - goto yy1100; + goto yy1040; } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'V') goto yy1100; + if (yych == 'V') goto yy1040; goto yy60; } } @@ -15372,71 +14468,71 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1102: - yyaccept = 25; +yy1042: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'D') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy1100; + if (yych <= 0x1F) goto yy1040; goto yy60; } else { if (yych <= '6') { - if (yych <= '/') goto yy1100; - goto yy845; + if (yych <= '/') goto yy1040; + goto yy785; } else { if (yych <= '9') goto yy54; - if (yych <= 'C') goto yy1100; + if (yych <= 'C') goto yy1040; goto yy60; } } } else { if (yych <= 'L') { if (yych <= 'F') { - if (yych <= 'E') goto yy1100; + if (yych <= 'E') goto yy1040; goto yy60; } else { if (yych == 'H') goto yy60; - goto yy1100; + goto yy1040; } } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'V') goto yy1100; + if (yych == 'V') goto yy1040; goto yy60; } } @@ -15445,66 +14541,66 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1103: - yyaccept = 25; +yy1043: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy60; - if (yych <= 0x1F) goto yy1100; + if (yych <= 0x1F) goto yy1040; goto yy60; } else { if (yych <= '9') { - if (yych <= '/') goto yy1100; - goto yy845; + if (yych <= '/') goto yy1040; + goto yy785; } else { if (yych == 'D') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy1100; + if (yych == 'G') goto yy1040; if (yych <= 'H') goto yy60; - goto yy1100; + goto yy1040; } else { if (yych <= 'R') { if (yych <= 'M') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'V') goto yy1100; + if (yych == 'V') goto yy1040; goto yy60; } } @@ -15513,77 +14609,77 @@ if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1104: - yyaccept = 25; +yy1044: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1100; + if (yych <= 0x08) goto yy1040; goto yy60; } else { if (yych == ' ') goto yy60; - goto yy1100; + goto yy1040; } } else { if (yych <= '2') { - if (yych <= '0') goto yy869; - goto yy870; + if (yych <= '0') goto yy809; + goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; - goto yy1100; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; + goto yy1040; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'G') goto yy1100; + if (yych == 'G') goto yy1040; goto yy60; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1100; + if (yych <= 'L') goto yy1040; goto yy60; } else { - if (yych <= 'R') goto yy1100; + if (yych <= 'R') goto yy1040; if (yych <= 'U') goto yy60; - goto yy1100; + goto yy1040; } } } @@ -15592,81 +14688,81 @@ if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy60; - goto yy1100; + goto yy1040; } else { if (yych <= 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1105: - yyaccept = 25; +yy1045: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1100; + if (yych <= 0x08) goto yy1040; goto yy60; } else { if (yych == ' ') goto yy60; - goto yy1100; + goto yy1040; } } else { if (yych <= '2') { - if (yych <= '0') goto yy901; - goto yy870; + if (yych <= '0') goto yy841; + goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; - goto yy1100; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; + goto yy1040; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'G') goto yy1100; + if (yych == 'G') goto yy1040; goto yy60; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1100; + if (yych <= 'L') goto yy1040; goto yy60; } else { - if (yych <= 'R') goto yy1100; + if (yych <= 'R') goto yy1040; if (yych <= 'U') goto yy60; - goto yy1100; + goto yy1040; } } } @@ -15675,81 +14771,81 @@ if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy60; - goto yy1100; + goto yy1040; } else { if (yych <= 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1106: - yyaccept = 25; +yy1046: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1100; + if (yych <= 0x08) goto yy1040; goto yy60; } else { if (yych == ' ') goto yy60; - goto yy1100; + goto yy1040; } } else { if (yych <= '2') { - if (yych <= '0') goto yy869; - goto yy870; + if (yych <= '0') goto yy809; + goto yy810; } else { - if (yych <= '3') goto yy871; - if (yych <= '9') goto yy845; - goto yy1100; + if (yych <= '3') goto yy811; + if (yych <= '9') goto yy785; + goto yy1040; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'G') goto yy1100; + if (yych == 'G') goto yy1040; goto yy60; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1100; + if (yych <= 'L') goto yy1040; goto yy60; } else { - if (yych <= 'R') goto yy1100; + if (yych <= 'R') goto yy1040; if (yych <= 'U') goto yy60; - goto yy1100; + goto yy1040; } } } @@ -15758,210 +14854,210 @@ if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy60; - goto yy1100; + goto yy1040; } else { if (yych <= 'Y') goto yy60; - if (yych <= 'c') goto yy1100; + if (yych <= 'c') goto yy1040; goto yy60; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1100; + if (yych <= 'e') goto yy1040; goto yy60; } else { if (yych == 'h') goto yy60; - goto yy1100; + goto yy1040; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy60; - goto yy1100; + goto yy1040; } else { - if (yych == 'v') goto yy1100; + if (yych == 'v') goto yy1040; goto yy60; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1100; + if (yych <= 'x') goto yy1040; goto yy60; } else { if (yych == 0xC2) goto yy60; - goto yy1100; + goto yy1040; } } } } -yy1107: - yyaccept = 11; +yy1047: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy1109; - goto yy515; + if (yych == '.') goto yy1049; + goto yy455; } else { - if (yych <= '9') goto yy1108; - if (yych <= ':') goto yy1109; - goto yy515; + if (yych <= '9') goto yy1048; + if (yych <= ':') goto yy1049; + goto yy455; } -yy1108: - yyaccept = 11; +yy1048: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy1109; - if (yych != ':') goto yy515; -yy1109: + if (yych == '.') goto yy1049; + if (yych != ':') goto yy455; +yy1049: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1110; - if (yych <= '6') goto yy1111; - if (yych <= '9') goto yy520; + if (yych <= '5') goto yy1050; + if (yych <= '6') goto yy1051; + if (yych <= '9') goto yy460; goto yy56; -yy1110: - yyaccept = 11; +yy1050: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy520; - goto yy515; -yy1111: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy460; + goto yy455; +yy1051: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych == '0') goto yy520; - goto yy515; -yy1112: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych == '0') goto yy460; + goto yy455; +yy1052: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - goto yy1116; - } else { - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy1115; - if (yych <= ':') goto yy1109; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + goto yy1056; + } else { + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy1055; + if (yych <= ':') goto yy1049; + goto yy455; } -yy1113: - yyaccept = 11; +yy1053: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - if (yych <= '.') goto yy1116; - goto yy515; - } else { - if (yych <= '2') goto yy1115; - if (yych <= '9') goto yy1108; - if (yych <= ':') goto yy1109; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + if (yych <= '.') goto yy1056; + goto yy455; + } else { + if (yych <= '2') goto yy1055; + if (yych <= '9') goto yy1048; + if (yych <= ':') goto yy1049; + goto yy455; } -yy1114: - yyaccept = 11; +yy1054: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; - goto yy1116; - } else { - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy1108; - if (yych <= ':') goto yy1109; - goto yy515; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; + goto yy1056; + } else { + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy1048; + if (yych <= ':') goto yy1049; + goto yy455; } -yy1115: - yyaccept = 11; +yy1055: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy515; - if (yych <= '-') goto yy626; + if (yych <= ',') goto yy455; + if (yych <= '-') goto yy566; } else { - if (yych == ':') goto yy1109; - goto yy515; + if (yych == ':') goto yy1049; + goto yy455; } -yy1116: +yy1056: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy1117; - if (yych <= '6') goto yy1118; - if (yych <= '9') goto yy634; + if (yych <= '5') goto yy1057; + if (yych <= '6') goto yy1058; + if (yych <= '9') goto yy574; goto yy56; -yy1117: - yyaccept = 11; +yy1057: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy1119; - goto yy515; -yy1118: - yyaccept = 11; + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy1059; + goto yy455; +yy1058: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy521; - goto yy515; + if (yych == '.') goto yy461; + goto yy455; } else { - if (yych <= '0') goto yy1119; - if (yych <= '9') goto yy635; - goto yy515; + if (yych <= '0') goto yy1059; + if (yych <= '9') goto yy575; + goto yy455; } -yy1119: - yyaccept = 11; +yy1059: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy521; - if (yych <= '/') goto yy515; - if (yych <= '9') goto yy629; - goto yy515; -yy1120: + if (yych == '.') goto yy461; + if (yych <= '/') goto yy455; + if (yych <= '9') goto yy569; + goto yy455; +yy1060: yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy484; - if (yych <= ',') goto yy486; - goto yy1075; - } else { - if (yych <= '.') goto yy498; - if (yych <= '/') goto yy496; - if (yych <= '5') goto yy1090; - goto yy765; + if (yych == '\t') goto yy424; + if (yych <= ',') goto yy426; + goto yy1015; + } else { + if (yych <= '.') goto yy438; + if (yych <= '/') goto yy436; + if (yych <= '5') goto yy1030; + goto yy705; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy507; - if (yych == 'n') goto yy494; - goto yy486; - } else { - if (yych <= 'r') goto yy495; - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy486; + if (yych <= ':') goto yy447; + if (yych == 'n') goto yy434; + goto yy426; + } else { + if (yych <= 'r') goto yy435; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy426; } } -yy1121: +yy1061: yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy1076; - if (yych <= ',') goto yy1078; - goto yy1075; - } else { - if (yych <= '.') goto yy1088; - if (yych <= '/') goto yy496; - if (yych <= '5') goto yy1090; - goto yy765; + if (yych == '\t') goto yy1016; + if (yych <= ',') goto yy1018; + goto yy1015; + } else { + if (yych <= '.') goto yy1028; + if (yych <= '/') goto yy436; + if (yych <= '5') goto yy1030; + goto yy705; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy1089; - if (yych == 'n') goto yy494; - goto yy1078; - } else { - if (yych <= 'r') goto yy495; - if (yych <= 's') goto yy489; - if (yych <= 't') goto yy492; - goto yy1078; + if (yych <= ':') goto yy1029; + if (yych == 'n') goto yy434; + goto yy1018; + } else { + if (yych <= 'r') goto yy435; + if (yych <= 's') goto yy429; + if (yych <= 't') goto yy432; + goto yy1018; } } -yy1122: +yy1062: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -15977,12 +15073,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'e') goto yy1123; + if (yych <= 'e') goto yy1063; if (yych <= 'z') goto yy166; goto yy3; } } -yy1123: +yy1063: yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= ')') { @@ -15998,12 +15094,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'v') goto yy1124; + if (yych <= 'v') goto yy1064; if (yych <= 'z') goto yy167; goto yy3; } } -yy1124: +yy1064: yych = *++YYCURSOR; if (yych <= 'I') { if (yych <= ')') { @@ -16019,12 +15115,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'i') goto yy1125; + if (yych <= 'i') goto yy1065; if (yych <= 'z') goto yy168; goto yy3; } } -yy1125: +yy1065: yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { @@ -16040,65 +15136,65 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'o') goto yy1126; + if (yych <= 'o') goto yy1066; if (yych <= 'z') goto yy169; goto yy3; } } -yy1126: +yy1066: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'U') goto yy1127; + if (yych <= 'U') goto yy1067; if (yych != 'u') goto yy3; } -yy1127: +yy1067: yych = *++YYCURSOR; - if (yych == 'S') goto yy1128; + if (yych == 'S') goto yy1068; if (yych != 's') goto yy56; -yy1128: +yy1068: yych = *++YYCURSOR; - if (yych == '\t') goto yy1129; + if (yych == '\t') goto yy1069; if (yych != ' ') goto yy56; -yy1129: +yy1069: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy1130: +yy1070: if (yych <= 'X') { if (yych <= 'G') { if (yych <= ' ') { - if (yych == '\t') goto yy1129; + if (yych == '\t') goto yy1069; if (yych <= 0x1F) goto yy56; - goto yy1129; + goto yy1069; } else { if (yych <= 'D') { if (yych <= 'C') goto yy56; - goto yy1136; + goto yy1076; } else { - if (yych == 'F') goto yy1137; + if (yych == 'F') goto yy1077; goto yy56; } } } else { if (yych <= 'S') { if (yych <= 'L') { - if (yych <= 'H') goto yy1135; + if (yych <= 'H') goto yy1075; goto yy56; } else { - if (yych <= 'M') goto yy1131; + if (yych <= 'M') goto yy1071; if (yych <= 'R') goto yy56; - goto yy1134; + goto yy1074; } } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1140; - goto yy1133; + if (yych <= 'T') goto yy1080; + goto yy1073; } else { - if (yych == 'W') goto yy1139; + if (yych == 'W') goto yy1079; goto yy56; } } @@ -16107,17 +15203,17 @@ if (yych <= 'r') { if (yych <= 'f') { if (yych <= 'c') { - if (yych <= 'Y') goto yy1138; + if (yych <= 'Y') goto yy1078; goto yy56; } else { - if (yych <= 'd') goto yy1136; + if (yych <= 'd') goto yy1076; if (yych <= 'e') goto yy56; - goto yy1137; + goto yy1077; } } else { if (yych <= 'h') { if (yych <= 'g') goto yy56; - goto yy1135; + goto yy1075; } else { if (yych != 'm') goto yy56; } @@ -16125,147 +15221,147 @@ } else { if (yych <= 'w') { if (yych <= 't') { - if (yych <= 's') goto yy1134; - goto yy1140; + if (yych <= 's') goto yy1074; + goto yy1080; } else { - if (yych <= 'u') goto yy1133; + if (yych <= 'u') goto yy1073; if (yych <= 'v') goto yy56; - goto yy1139; + goto yy1079; } } else { if (yych <= 'y') { if (yych <= 'x') goto yy56; - goto yy1138; + goto yy1078; } else { - if (yych == 0xC2) goto yy1132; + if (yych == 0xC2) goto yy1072; goto yy56; } } } } -yy1131: +yy1071: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'N') { - if (yych == 'I') goto yy1215; + if (yych == 'I') goto yy1155; goto yy56; } else { - if (yych <= 'O') goto yy1214; + if (yych <= 'O') goto yy1154; if (yych <= 'R') goto yy56; - goto yy1216; + goto yy1156; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy1215; + if (yych == 'i') goto yy1155; goto yy56; } else { - if (yych <= 'o') goto yy1214; - if (yych == 's') goto yy1216; + if (yych <= 'o') goto yy1154; + if (yych == 's') goto yy1156; goto yy56; } } -yy1132: +yy1072: yych = *++YYCURSOR; - if (yych == 0xB5) goto yy1211; + if (yych == 0xB5) goto yy1151; goto yy56; -yy1133: +yy1073: yych = *++YYCURSOR; - if (yych == 'S') goto yy1209; - if (yych == 's') goto yy1209; + if (yych == 'S') goto yy1149; + if (yych == 's') goto yy1149; goto yy56; -yy1134: +yy1074: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { - if (yych == 'A') goto yy1196; + if (yych == 'A') goto yy1136; goto yy56; } else { - if (yych <= 'E') goto yy1197; + if (yych <= 'E') goto yy1137; if (yych <= 'T') goto yy56; - goto yy1195; + goto yy1135; } } else { if (yych <= 'd') { - if (yych == 'a') goto yy1196; + if (yych == 'a') goto yy1136; goto yy56; } else { - if (yych <= 'e') goto yy1197; - if (yych == 'u') goto yy1195; + if (yych <= 'e') goto yy1137; + if (yych == 'u') goto yy1135; goto yy56; } } -yy1135: +yy1075: yych = *++YYCURSOR; - if (yych == 'O') goto yy1193; - if (yych == 'o') goto yy1193; + if (yych == 'O') goto yy1133; + if (yych == 'o') goto yy1133; goto yy56; -yy1136: +yy1076: yych = *++YYCURSOR; - if (yych == 'A') goto yy1192; - if (yych == 'a') goto yy1192; + if (yych == 'A') goto yy1132; + if (yych == 'a') goto yy1132; goto yy56; -yy1137: +yy1077: yych = *++YYCURSOR; if (yych <= 'R') { - if (yych == 'O') goto yy1177; + if (yych == 'O') goto yy1117; if (yych <= 'Q') goto yy56; - goto yy1176; + goto yy1116; } else { if (yych <= 'o') { if (yych <= 'n') goto yy56; - goto yy1177; + goto yy1117; } else { - if (yych == 'r') goto yy1176; + if (yych == 'r') goto yy1116; goto yy56; } } -yy1138: +yy1078: yych = *++YYCURSOR; - if (yych == 'E') goto yy1173; - if (yych == 'e') goto yy1173; + if (yych == 'E') goto yy1113; + if (yych == 'e') goto yy1113; goto yy56; -yy1139: +yy1079: yych = *++YYCURSOR; - if (yych == 'E') goto yy1159; - if (yych == 'e') goto yy1159; + if (yych == 'E') goto yy1099; + if (yych == 'e') goto yy1099; goto yy56; -yy1140: +yy1080: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'H') goto yy1141; + if (yych == 'H') goto yy1081; if (yych <= 'T') goto yy56; - goto yy1142; + goto yy1082; } else { if (yych <= 'h') { if (yych <= 'g') goto yy56; } else { - if (yych == 'u') goto yy1142; + if (yych == 'u') goto yy1082; goto yy56; } } -yy1141: +yy1081: yych = *++YYCURSOR; - if (yych == 'U') goto yy1154; - if (yych == 'u') goto yy1154; + if (yych == 'U') goto yy1094; + if (yych == 'u') goto yy1094; goto yy56; -yy1142: +yy1082: yych = *++YYCURSOR; - if (yych == 'E') goto yy1143; + if (yych == 'E') goto yy1083; if (yych != 'e') goto yy56; -yy1143: - yyaccept = 26; +yy1083: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych >= ' ') goto yy1145; + if (yych == '\t') goto yy1085; + if (yych >= ' ') goto yy1085; } else { if (yych <= 'S') { - if (yych >= 'S') goto yy1147; + if (yych >= 'S') goto yy1087; } else { - if (yych == 's') goto yy1147; + if (yych == 's') goto yy1087; } } -yy1144: +yy1084: { timelib_sll i; int behavior = 0; @@ -16281,46 +15377,46 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1145: +yy1085: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= ' ') { - if (yych == '\t') goto yy1145; + if (yych == '\t') goto yy1085; if (yych <= 0x1F) goto yy56; - goto yy1145; + goto yy1085; } else { if (yych <= 'O') { if (yych <= 'N') goto yy56; - goto yy1151; + goto yy1091; } else { - if (yych == 'o') goto yy1151; + if (yych == 'o') goto yy1091; goto yy56; } } -yy1147: +yy1087: yych = *++YYCURSOR; - if (yych == 'D') goto yy1148; + if (yych == 'D') goto yy1088; if (yych != 'd') goto yy56; -yy1148: +yy1088: yych = *++YYCURSOR; - if (yych == 'A') goto yy1149; + if (yych == 'A') goto yy1089; if (yych != 'a') goto yy56; -yy1149: +yy1089: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; + if (yych == 'Y') goto yy1090; if (yych != 'y') goto yy56; -yy1150: - yyaccept = 26; +yy1090: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '\t') goto yy1145; - if (yych == ' ') goto yy1145; - goto yy1144; -yy1151: + if (yych == '\t') goto yy1085; + if (yych == ' ') goto yy1085; + goto yy1084; +yy1091: yych = *++YYCURSOR; - if (yych == 'F') goto yy1152; + if (yych == 'F') goto yy1092; if (yych != 'f') goto yy56; -yy1152: +yy1092: ++YYCURSOR; { timelib_sll i; @@ -16342,98 +15438,98 @@ TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } -yy1154: - yyaccept = 26; +yy1094: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych <= 0x1F) goto yy1144; - goto yy1145; + if (yych == '\t') goto yy1085; + if (yych <= 0x1F) goto yy1084; + goto yy1085; } else { if (yych <= 'R') { - if (yych <= 'Q') goto yy1144; + if (yych <= 'Q') goto yy1084; } else { - if (yych != 'r') goto yy1144; + if (yych != 'r') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'S') goto yy1156; + if (yych == 'S') goto yy1096; if (yych != 's') goto yy56; -yy1156: +yy1096: yych = *++YYCURSOR; - if (yych == 'D') goto yy1157; + if (yych == 'D') goto yy1097; if (yych != 'd') goto yy56; -yy1157: +yy1097: yych = *++YYCURSOR; - if (yych == 'A') goto yy1158; + if (yych == 'A') goto yy1098; if (yych != 'a') goto yy56; -yy1158: +yy1098: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1159: +yy1099: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= 'C') goto yy56; - if (yych <= 'D') goto yy1161; + if (yych <= 'D') goto yy1101; } else { if (yych <= 'c') goto yy56; - if (yych <= 'd') goto yy1161; + if (yych <= 'd') goto yy1101; if (yych >= 'f') goto yy56; } yych = *++YYCURSOR; - if (yych == 'K') goto yy1167; - if (yych == 'k') goto yy1167; + if (yych == 'K') goto yy1107; + if (yych == 'k') goto yy1107; goto yy56; -yy1161: - yyaccept = 26; +yy1101: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych <= 0x1F) goto yy1144; - goto yy1145; + if (yych == '\t') goto yy1085; + if (yych <= 0x1F) goto yy1084; + goto yy1085; } else { if (yych <= 'N') { - if (yych <= 'M') goto yy1144; + if (yych <= 'M') goto yy1084; } else { - if (yych != 'n') goto yy1144; + if (yych != 'n') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'E') goto yy1163; + if (yych == 'E') goto yy1103; if (yych != 'e') goto yy56; -yy1163: +yy1103: yych = *++YYCURSOR; - if (yych == 'S') goto yy1164; + if (yych == 'S') goto yy1104; if (yych != 's') goto yy56; -yy1164: +yy1104: yych = *++YYCURSOR; - if (yych == 'D') goto yy1165; + if (yych == 'D') goto yy1105; if (yych != 'd') goto yy56; -yy1165: +yy1105: yych = *++YYCURSOR; - if (yych == 'A') goto yy1166; + if (yych == 'A') goto yy1106; if (yych != 'a') goto yy56; -yy1166: +yy1106: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1167: - yyaccept = 27; +yy1107: + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'D') goto yy1170; - if (yych >= 'S') goto yy1169; + if (yych == 'D') goto yy1110; + if (yych >= 'S') goto yy1109; } else { if (yych <= 'd') { - if (yych >= 'd') goto yy1170; + if (yych >= 'd') goto yy1110; } else { - if (yych == 's') goto yy1169; + if (yych == 's') goto yy1109; } } -yy1168: +yy1108: { timelib_sll i; int behavior = 0; @@ -16456,411 +15552,411 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1169: +yy1109: yych = *++YYCURSOR; - goto yy1144; -yy1170: + goto yy1084; +yy1110: yych = *++YYCURSOR; - if (yych == 'A') goto yy1171; + if (yych == 'A') goto yy1111; if (yych != 'a') goto yy56; -yy1171: +yy1111: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1172; + if (yych == 'Y') goto yy1112; if (yych != 'y') goto yy56; -yy1172: +yy1112: yych = *++YYCURSOR; - if (yych == 'S') goto yy1169; - if (yych == 's') goto yy1169; - goto yy1144; -yy1173: + if (yych == 'S') goto yy1109; + if (yych == 's') goto yy1109; + goto yy1084; +yy1113: yych = *++YYCURSOR; - if (yych == 'A') goto yy1174; + if (yych == 'A') goto yy1114; if (yych != 'a') goto yy56; -yy1174: +yy1114: yych = *++YYCURSOR; - if (yych == 'R') goto yy1175; + if (yych == 'R') goto yy1115; if (yych != 'r') goto yy56; -yy1175: +yy1115: yych = *++YYCURSOR; - if (yych == 'S') goto yy1169; - if (yych == 's') goto yy1169; - goto yy1144; -yy1176: + if (yych == 'S') goto yy1109; + if (yych == 's') goto yy1109; + goto yy1084; +yy1116: yych = *++YYCURSOR; - if (yych == 'I') goto yy1189; - if (yych == 'i') goto yy1189; + if (yych == 'I') goto yy1129; + if (yych == 'i') goto yy1129; goto yy56; -yy1177: +yy1117: yych = *++YYCURSOR; - if (yych == 'R') goto yy1178; + if (yych == 'R') goto yy1118; if (yych != 'r') goto yy56; -yy1178: +yy1118: yych = *++YYCURSOR; - if (yych == 'T') goto yy1179; + if (yych == 'T') goto yy1119; if (yych != 't') goto yy56; -yy1179: +yy1119: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'H') goto yy1181; + if (yych == 'H') goto yy1121; if (yych <= 'M') goto yy56; } else { if (yych <= 'h') { if (yych <= 'g') goto yy56; - goto yy1181; + goto yy1121; } else { if (yych != 'n') goto yy56; } } yych = *++YYCURSOR; - if (yych == 'I') goto yy1186; - if (yych == 'i') goto yy1186; + if (yych == 'I') goto yy1126; + if (yych == 'i') goto yy1126; goto yy56; -yy1181: +yy1121: yych = *++YYCURSOR; - if (yych == 'N') goto yy1182; + if (yych == 'N') goto yy1122; if (yych != 'n') goto yy56; -yy1182: +yy1122: yych = *++YYCURSOR; - if (yych == 'I') goto yy1183; + if (yych == 'I') goto yy1123; if (yych != 'i') goto yy56; -yy1183: +yy1123: yych = *++YYCURSOR; - if (yych == 'G') goto yy1184; + if (yych == 'G') goto yy1124; if (yych != 'g') goto yy56; -yy1184: +yy1124: yych = *++YYCURSOR; - if (yych == 'H') goto yy1185; + if (yych == 'H') goto yy1125; if (yych != 'h') goto yy56; -yy1185: +yy1125: yych = *++YYCURSOR; - if (yych == 'T') goto yy1175; - if (yych == 't') goto yy1175; + if (yych == 'T') goto yy1115; + if (yych == 't') goto yy1115; goto yy56; -yy1186: +yy1126: yych = *++YYCURSOR; - if (yych == 'G') goto yy1187; + if (yych == 'G') goto yy1127; if (yych != 'g') goto yy56; -yy1187: +yy1127: yych = *++YYCURSOR; - if (yych == 'H') goto yy1188; + if (yych == 'H') goto yy1128; if (yych != 'h') goto yy56; -yy1188: +yy1128: yych = *++YYCURSOR; - if (yych == 'T') goto yy1175; - if (yych == 't') goto yy1175; + if (yych == 'T') goto yy1115; + if (yych == 't') goto yy1115; goto yy56; -yy1189: - yyaccept = 26; +yy1129: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych <= 0x1F) goto yy1144; - goto yy1145; + if (yych == '\t') goto yy1085; + if (yych <= 0x1F) goto yy1084; + goto yy1085; } else { if (yych <= 'D') { - if (yych <= 'C') goto yy1144; + if (yych <= 'C') goto yy1084; } else { - if (yych != 'd') goto yy1144; + if (yych != 'd') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'A') goto yy1191; + if (yych == 'A') goto yy1131; if (yych != 'a') goto yy56; -yy1191: +yy1131: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1192: +yy1132: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1175; - if (yych == 'y') goto yy1175; + if (yych == 'Y') goto yy1115; + if (yych == 'y') goto yy1115; goto yy56; -yy1193: +yy1133: yych = *++YYCURSOR; - if (yych == 'U') goto yy1194; + if (yych == 'U') goto yy1134; if (yych != 'u') goto yy56; -yy1194: +yy1134: yych = *++YYCURSOR; - if (yych == 'R') goto yy1175; - if (yych == 'r') goto yy1175; + if (yych == 'R') goto yy1115; + if (yych == 'r') goto yy1115; goto yy56; -yy1195: +yy1135: yych = *++YYCURSOR; - if (yych == 'N') goto yy1206; - if (yych == 'n') goto yy1206; + if (yych == 'N') goto yy1146; + if (yych == 'n') goto yy1146; goto yy56; -yy1196: +yy1136: yych = *++YYCURSOR; - if (yych == 'T') goto yy1201; - if (yych == 't') goto yy1201; + if (yych == 'T') goto yy1141; + if (yych == 't') goto yy1141; goto yy56; -yy1197: +yy1137: yych = *++YYCURSOR; - if (yych == 'C') goto yy1198; + if (yych == 'C') goto yy1138; if (yych != 'c') goto yy56; -yy1198: - yyaccept = 26; +yy1138: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'O') goto yy1199; - if (yych <= 'R') goto yy1144; - goto yy1169; + if (yych == 'O') goto yy1139; + if (yych <= 'R') goto yy1084; + goto yy1109; } else { if (yych <= 'o') { - if (yych <= 'n') goto yy1144; + if (yych <= 'n') goto yy1084; } else { - if (yych == 's') goto yy1169; - goto yy1144; + if (yych == 's') goto yy1109; + goto yy1084; } } -yy1199: +yy1139: yych = *++YYCURSOR; - if (yych == 'N') goto yy1200; + if (yych == 'N') goto yy1140; if (yych != 'n') goto yy56; -yy1200: +yy1140: yych = *++YYCURSOR; - if (yych == 'D') goto yy1175; - if (yych == 'd') goto yy1175; + if (yych == 'D') goto yy1115; + if (yych == 'd') goto yy1115; goto yy56; -yy1201: - yyaccept = 26; +yy1141: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych <= 0x1F) goto yy1144; - goto yy1145; + if (yych == '\t') goto yy1085; + if (yych <= 0x1F) goto yy1084; + goto yy1085; } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1144; + if (yych <= 'T') goto yy1084; } else { - if (yych != 'u') goto yy1144; + if (yych != 'u') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'R') goto yy1203; + if (yych == 'R') goto yy1143; if (yych != 'r') goto yy56; -yy1203: +yy1143: yych = *++YYCURSOR; - if (yych == 'D') goto yy1204; + if (yych == 'D') goto yy1144; if (yych != 'd') goto yy56; -yy1204: +yy1144: yych = *++YYCURSOR; - if (yych == 'A') goto yy1205; + if (yych == 'A') goto yy1145; if (yych != 'a') goto yy56; -yy1205: +yy1145: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1206: - yyaccept = 26; +yy1146: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1145; - if (yych <= 0x1F) goto yy1144; - goto yy1145; + if (yych == '\t') goto yy1085; + if (yych <= 0x1F) goto yy1084; + goto yy1085; } else { if (yych <= 'D') { - if (yych <= 'C') goto yy1144; + if (yych <= 'C') goto yy1084; } else { - if (yych != 'd') goto yy1144; + if (yych != 'd') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'A') goto yy1208; + if (yych == 'A') goto yy1148; if (yych != 'a') goto yy56; -yy1208: +yy1148: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1209: +yy1149: yych = *++YYCURSOR; - if (yych == 'E') goto yy1210; + if (yych == 'E') goto yy1150; if (yych != 'e') goto yy56; -yy1210: +yy1150: yych = *++YYCURSOR; - if (yych == 'C') goto yy1175; - if (yych == 'c') goto yy1175; + if (yych == 'C') goto yy1115; + if (yych == 'c') goto yy1115; goto yy56; -yy1211: +yy1151: yych = *++YYCURSOR; - if (yych == 'S') goto yy1212; + if (yych == 'S') goto yy1152; if (yych != 's') goto yy56; -yy1212: - yyaccept = 26; +yy1152: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy1213; - if (yych != 'e') goto yy1144; -yy1213: + if (yych == 'E') goto yy1153; + if (yych != 'e') goto yy1084; +yy1153: yych = *++YYCURSOR; - if (yych == 'C') goto yy1175; - if (yych == 'c') goto yy1175; + if (yych == 'C') goto yy1115; + if (yych == 'c') goto yy1115; goto yy56; -yy1214: +yy1154: yych = *++YYCURSOR; - if (yych == 'N') goto yy1237; - if (yych == 'n') goto yy1237; + if (yych == 'N') goto yy1177; + if (yych == 'n') goto yy1177; goto yy56; -yy1215: +yy1155: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= 'K') { - if (yych == 'C') goto yy1219; + if (yych == 'C') goto yy1159; goto yy56; } else { - if (yych <= 'L') goto yy1218; + if (yych <= 'L') goto yy1158; if (yych <= 'M') goto yy56; - goto yy1220; + goto yy1160; } } else { if (yych <= 'k') { - if (yych == 'c') goto yy1219; + if (yych == 'c') goto yy1159; goto yy56; } else { - if (yych <= 'l') goto yy1218; - if (yych == 'n') goto yy1220; + if (yych <= 'l') goto yy1158; + if (yych == 'n') goto yy1160; goto yy56; } } -yy1216: - yyaccept = 26; +yy1156: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy1217; - if (yych != 'e') goto yy1144; -yy1217: + if (yych == 'E') goto yy1157; + if (yych != 'e') goto yy1084; +yy1157: yych = *++YYCURSOR; - if (yych == 'C') goto yy1175; - if (yych == 'c') goto yy1175; + if (yych == 'C') goto yy1115; + if (yych == 'c') goto yy1115; goto yy56; -yy1218: +yy1158: yych = *++YYCURSOR; - if (yych == 'L') goto yy1230; - if (yych == 'l') goto yy1230; + if (yych == 'L') goto yy1170; + if (yych == 'l') goto yy1170; goto yy56; -yy1219: +yy1159: yych = *++YYCURSOR; - if (yych == 'R') goto yy1223; - if (yych == 'r') goto yy1223; + if (yych == 'R') goto yy1163; + if (yych == 'r') goto yy1163; goto yy56; -yy1220: - yyaccept = 26; +yy1160: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { - if (yych == 'S') goto yy1169; - if (yych <= 'T') goto yy1144; + if (yych == 'S') goto yy1109; + if (yych <= 'T') goto yy1084; } else { if (yych <= 's') { - if (yych <= 'r') goto yy1144; - goto yy1169; + if (yych <= 'r') goto yy1084; + goto yy1109; } else { - if (yych != 'u') goto yy1144; + if (yych != 'u') goto yy1084; } } yych = *++YYCURSOR; - if (yych == 'T') goto yy1222; + if (yych == 'T') goto yy1162; if (yych != 't') goto yy56; -yy1222: +yy1162: yych = *++YYCURSOR; - if (yych == 'E') goto yy1175; - if (yych == 'e') goto yy1175; + if (yych == 'E') goto yy1115; + if (yych == 'e') goto yy1115; goto yy56; -yy1223: +yy1163: yych = *++YYCURSOR; - if (yych == 'O') goto yy1224; + if (yych == 'O') goto yy1164; if (yych != 'o') goto yy56; -yy1224: +yy1164: yych = *++YYCURSOR; - if (yych == 'S') goto yy1225; + if (yych == 'S') goto yy1165; if (yych != 's') goto yy56; -yy1225: +yy1165: yych = *++YYCURSOR; - if (yych == 'E') goto yy1226; + if (yych == 'E') goto yy1166; if (yych != 'e') goto yy56; -yy1226: +yy1166: yych = *++YYCURSOR; - if (yych == 'C') goto yy1227; + if (yych == 'C') goto yy1167; if (yych != 'c') goto yy56; -yy1227: +yy1167: yych = *++YYCURSOR; - if (yych == 'O') goto yy1228; + if (yych == 'O') goto yy1168; if (yych != 'o') goto yy56; -yy1228: +yy1168: yych = *++YYCURSOR; - if (yych == 'N') goto yy1229; + if (yych == 'N') goto yy1169; if (yych != 'n') goto yy56; -yy1229: +yy1169: yych = *++YYCURSOR; - if (yych == 'D') goto yy1175; - if (yych == 'd') goto yy1175; + if (yych == 'D') goto yy1115; + if (yych == 'd') goto yy1115; goto yy56; -yy1230: +yy1170: yych = *++YYCURSOR; - if (yych == 'I') goto yy1231; + if (yych == 'I') goto yy1171; if (yych != 'i') goto yy56; -yy1231: +yy1171: yych = *++YYCURSOR; - if (yych == 'S') goto yy1232; + if (yych == 'S') goto yy1172; if (yych != 's') goto yy56; -yy1232: +yy1172: yych = *++YYCURSOR; - if (yych == 'E') goto yy1233; + if (yych == 'E') goto yy1173; if (yych != 'e') goto yy56; -yy1233: +yy1173: yych = *++YYCURSOR; - if (yych == 'C') goto yy1234; + if (yych == 'C') goto yy1174; if (yych != 'c') goto yy56; -yy1234: +yy1174: yych = *++YYCURSOR; - if (yych == 'O') goto yy1235; + if (yych == 'O') goto yy1175; if (yych != 'o') goto yy56; -yy1235: +yy1175: yych = *++YYCURSOR; - if (yych == 'N') goto yy1236; + if (yych == 'N') goto yy1176; if (yych != 'n') goto yy56; -yy1236: +yy1176: yych = *++YYCURSOR; - if (yych == 'D') goto yy1175; - if (yych == 'd') goto yy1175; + if (yych == 'D') goto yy1115; + if (yych == 'd') goto yy1115; goto yy56; -yy1237: - yyaccept = 26; +yy1177: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1145; - goto yy1144; + if (yych == '\t') goto yy1085; + goto yy1084; } else { - if (yych <= ' ') goto yy1145; - if (yych <= 'C') goto yy1144; + if (yych <= ' ') goto yy1085; + if (yych <= 'C') goto yy1084; } } else { if (yych <= 'c') { - if (yych == 'T') goto yy1239; - goto yy1144; + if (yych == 'T') goto yy1179; + goto yy1084; } else { - if (yych <= 'd') goto yy1238; - if (yych == 't') goto yy1239; - goto yy1144; + if (yych <= 'd') goto yy1178; + if (yych == 't') goto yy1179; + goto yy1084; } } -yy1238: +yy1178: yych = *++YYCURSOR; - if (yych == 'A') goto yy1240; - if (yych == 'a') goto yy1240; + if (yych == 'A') goto yy1180; + if (yych == 'a') goto yy1180; goto yy56; -yy1239: +yy1179: yych = *++YYCURSOR; - if (yych == 'H') goto yy1175; - if (yych == 'h') goto yy1175; + if (yych == 'H') goto yy1115; + if (yych == 'h') goto yy1115; goto yy56; -yy1240: +yy1180: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1090; + if (yych == 'y') goto yy1090; goto yy56; -yy1241: +yy1181: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -16875,7 +15971,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1123; + if (yych <= 'E') goto yy1063; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -16884,13 +15980,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'e') goto yy1242; + if (yych <= 'e') goto yy1182; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1242: +yy1182: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { @@ -16905,7 +16001,7 @@ } } else { if (yych <= '_') { - if (yych <= 'V') goto yy1124; + if (yych <= 'V') goto yy1064; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -16914,13 +16010,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'v') goto yy1243; + if (yych <= 'v') goto yy1183; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1243: +yy1183: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { @@ -16935,7 +16031,7 @@ } } else { if (yych <= '_') { - if (yych <= 'I') goto yy1125; + if (yych <= 'I') goto yy1065; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -16944,13 +16040,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'i') goto yy1244; + if (yych <= 'i') goto yy1184; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1244: +yy1184: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -16965,7 +16061,7 @@ } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1126; + if (yych <= 'O') goto yy1066; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -16974,13 +16070,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'o') goto yy1245; + if (yych <= 'o') goto yy1185; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1245: +yy1185: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { @@ -16994,18 +16090,18 @@ } } else { if (yych <= '`') { - if (yych <= 'U') goto yy1127; + if (yych <= 'U') goto yy1067; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'u') goto yy1246; + if (yych == 'u') goto yy1186; if (yych <= 'z') goto yy178; goto yy3; } } -yy1246: +yy1186: yych = *++YYCURSOR; - if (yych == 'S') goto yy1128; + if (yych == 'S') goto yy1068; if (yych != 's') goto yy179; yych = *++YYCURSOR; if (yybm[0+yych] & 16) { @@ -17014,9 +16110,9 @@ if (yych <= ',') { if (yych <= '\t') { if (yych <= 0x08) goto yy56; - goto yy1129; + goto yy1069; } else { - if (yych == ' ') goto yy1129; + if (yych == ' ') goto yy1069; goto yy56; } } else { @@ -17028,7 +16124,7 @@ goto yy56; } } -yy1248: +yy1188: yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { @@ -17037,7 +16133,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'F') goto yy166; - goto yy1262; + goto yy1202; } } else { if (yych <= 'f') { @@ -17045,12 +16141,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'g') goto yy1262; + if (yych <= 'g') goto yy1202; if (yych <= 'z') goto yy166; goto yy3; } } -yy1249: +yy1189: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -17066,12 +16162,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'e') goto yy1250; + if (yych <= 'e') goto yy1190; if (yych <= 'z') goto yy166; goto yy3; } } -yy1250: +yy1190: yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= ')') { @@ -17087,12 +16183,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'v') goto yy1251; + if (yych <= 'v') goto yy1191; if (yych <= 'z') goto yy167; goto yy3; } } -yy1251: +yy1191: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -17108,12 +16204,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'e') goto yy1252; + if (yych <= 'e') goto yy1192; if (yych <= 'z') goto yy168; goto yy3; } } -yy1252: +yy1192: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -17129,63 +16225,63 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'n') goto yy1253; + if (yych <= 'n') goto yy1193; if (yych <= 'z') goto yy169; goto yy3; } } -yy1253: +yy1193: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'T') goto yy1254; + if (yych <= 'T') goto yy1194; if (yych != 't') goto yy3; } -yy1254: +yy1194: yych = *++YYCURSOR; - if (yych == 'H') goto yy1255; + if (yych == 'H') goto yy1195; if (yych != 'h') goto yy56; -yy1255: +yy1195: yych = *++YYCURSOR; - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; if (yych != ' ') goto yy56; -yy1256: +yy1196: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy1257: +yy1197: if (yych <= 'X') { if (yych <= 'G') { if (yych <= ' ') { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; if (yych <= 0x1F) goto yy56; - goto yy1256; + goto yy1196; } else { if (yych <= 'D') { if (yych <= 'C') goto yy56; - goto yy1136; + goto yy1076; } else { - if (yych == 'F') goto yy1137; + if (yych == 'F') goto yy1077; goto yy56; } } } else { if (yych <= 'S') { if (yych <= 'L') { - if (yych <= 'H') goto yy1135; + if (yych <= 'H') goto yy1075; goto yy56; } else { - if (yych <= 'M') goto yy1131; + if (yych <= 'M') goto yy1071; if (yych <= 'R') goto yy56; - goto yy1134; + goto yy1074; } } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1140; - goto yy1133; + if (yych <= 'T') goto yy1080; + goto yy1073; } else { if (yych != 'W') goto yy56; } @@ -17195,74 +16291,74 @@ if (yych <= 'r') { if (yych <= 'f') { if (yych <= 'c') { - if (yych <= 'Y') goto yy1138; + if (yych <= 'Y') goto yy1078; goto yy56; } else { - if (yych <= 'd') goto yy1136; + if (yych <= 'd') goto yy1076; if (yych <= 'e') goto yy56; - goto yy1137; + goto yy1077; } } else { if (yych <= 'h') { if (yych <= 'g') goto yy56; - goto yy1135; + goto yy1075; } else { - if (yych == 'm') goto yy1131; + if (yych == 'm') goto yy1071; goto yy56; } } } else { if (yych <= 'w') { if (yych <= 't') { - if (yych <= 's') goto yy1134; - goto yy1140; + if (yych <= 's') goto yy1074; + goto yy1080; } else { - if (yych <= 'u') goto yy1133; + if (yych <= 'u') goto yy1073; if (yych <= 'v') goto yy56; } } else { if (yych <= 'y') { if (yych <= 'x') goto yy56; - goto yy1138; + goto yy1078; } else { - if (yych == 0xC2) goto yy1132; + if (yych == 0xC2) goto yy1072; goto yy56; } } } } yych = *++YYCURSOR; - if (yych == 'E') goto yy1259; + if (yych == 'E') goto yy1199; if (yych != 'e') goto yy56; -yy1259: +yy1199: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= 'C') goto yy56; - if (yych <= 'D') goto yy1161; + if (yych <= 'D') goto yy1101; } else { if (yych <= 'c') goto yy56; - if (yych <= 'd') goto yy1161; + if (yych <= 'd') goto yy1101; if (yych >= 'f') goto yy56; } yych = *++YYCURSOR; - if (yych == 'K') goto yy1261; + if (yych == 'K') goto yy1201; if (yych != 'k') goto yy56; -yy1261: +yy1201: yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == 'D') goto yy1170; + if (yych == 'D') goto yy1110; if (yych <= 'R') goto yy56; - goto yy1169; + goto yy1109; } else { if (yych <= 'd') { if (yych <= 'c') goto yy56; - goto yy1170; + goto yy1110; } else { - if (yych == 's') goto yy1169; + if (yych == 's') goto yy1109; goto yy56; } } -yy1262: +yy1202: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -17278,12 +16374,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'h') goto yy1263; + if (yych <= 'h') goto yy1203; if (yych <= 'z') goto yy167; goto yy3; } } -yy1263: +yy1203: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -17299,46 +16395,46 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 't') goto yy1264; + if (yych <= 't') goto yy1204; if (yych <= 'z') goto yy168; goto yy3; } } -yy1264: +yy1204: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; goto yy3; } else { - if (yych <= ' ') goto yy1256; + if (yych <= ' ') goto yy1196; if (yych == ')') goto yy164; goto yy3; } } else { if (yych <= '`') { - if (yych == 'H') goto yy1265; + if (yych == 'H') goto yy1205; if (yych <= 'Z') goto yy169; goto yy3; } else { - if (yych == 'h') goto yy1265; + if (yych == 'h') goto yy1205; if (yych <= 'z') goto yy169; goto yy3; } } -yy1265: +yy1205: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; goto yy3; } else { - if (yych <= ' ') goto yy1256; + if (yych <= ' ') goto yy1196; if (yych == ')') goto yy164; goto yy3; } -yy1266: +yy1206: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { @@ -17353,7 +16449,7 @@ } } else { if (yych <= '_') { - if (yych <= 'G') goto yy1262; + if (yych <= 'G') goto yy1202; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -17362,13 +16458,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'g') goto yy1274; + if (yych <= 'g') goto yy1214; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1267: +yy1207: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -17383,7 +16479,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1250; + if (yych <= 'E') goto yy1190; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -17392,13 +16488,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'e') goto yy1268; + if (yych <= 'e') goto yy1208; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1268: +yy1208: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { @@ -17413,7 +16509,7 @@ } } else { if (yych <= '_') { - if (yych <= 'V') goto yy1251; + if (yych <= 'V') goto yy1191; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -17422,13 +16518,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'v') goto yy1269; + if (yych <= 'v') goto yy1209; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1269: +yy1209: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -17443,7 +16539,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1252; + if (yych <= 'E') goto yy1192; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -17452,13 +16548,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'e') goto yy1270; + if (yych <= 'e') goto yy1210; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1270: +yy1210: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -17473,7 +16569,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1253; + if (yych <= 'N') goto yy1193; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -17482,13 +16578,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'n') goto yy1271; + if (yych <= 'n') goto yy1211; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1271: +yy1211: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -17502,20 +16598,20 @@ } } else { if (yych <= '`') { - if (yych <= 'T') goto yy1254; + if (yych <= 'T') goto yy1194; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 't') goto yy1272; + if (yych == 't') goto yy1212; if (yych <= 'z') goto yy178; goto yy3; } } -yy1272: +yy1212: yych = *++YYCURSOR; - if (yych == 'H') goto yy1255; + if (yych == 'H') goto yy1195; if (yych != 'h') goto yy179; -yy1273: +yy1213: yych = *++YYCURSOR; if (yybm[0+yych] & 16) { goto yy178; @@ -17523,9 +16619,9 @@ if (yych <= ',') { if (yych <= '\t') { if (yych <= 0x08) goto yy56; - goto yy1256; + goto yy1196; } else { - if (yych == ' ') goto yy1256; + if (yych == ' ') goto yy1196; goto yy56; } } else { @@ -17537,7 +16633,7 @@ goto yy56; } } -yy1274: +yy1214: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -17552,7 +16648,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1263; + if (yych <= 'H') goto yy1203; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -17561,13 +16657,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'h') goto yy1275; + if (yych <= 'h') goto yy1215; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1275: +yy1215: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -17582,7 +16678,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1264; + if (yych <= 'T') goto yy1204; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -17591,22 +16687,22 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 't') goto yy1276; + if (yych <= 't') goto yy1216; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1276: +yy1216: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1256; + goto yy1196; } else { - if (yych == ' ') goto yy1256; + if (yych == ' ') goto yy1196; goto yy3; } } else { @@ -17624,7 +16720,7 @@ if (yych <= '@') goto yy3; goto yy169; } else { - if (yych <= 'H') goto yy1265; + if (yych <= 'H') goto yy1205; if (yych <= 'Z') goto yy169; goto yy3; } @@ -17634,13 +16730,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'h') goto yy1277; + if (yych <= 'h') goto yy1217; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1277: +yy1217: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { @@ -17648,10 +16744,10 @@ } if (yych <= ')') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; goto yy3; } else { - if (yych <= ' ') goto yy1256; + if (yych <= ' ') goto yy1196; if (yych <= '(') goto yy3; goto yy164; } @@ -17665,7 +16761,7 @@ goto yy3; } } -yy1278: +yy1218: yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= 'B') { @@ -17674,12 +16770,12 @@ goto yy166; } else { if (yych <= 'O') { - if (yych <= 'C') goto yy1294; + if (yych <= 'C') goto yy1234; goto yy166; } else { - if (yych <= 'P') goto yy1296; + if (yych <= 'P') goto yy1236; if (yych <= 'U') goto yy166; - goto yy1295; + goto yy1235; } } } else { @@ -17688,21 +16784,21 @@ if (yych <= 'Z') goto yy166; goto yy3; } else { - if (yych == 'c') goto yy1294; + if (yych == 'c') goto yy1234; goto yy166; } } else { if (yych <= 'u') { - if (yych <= 'p') goto yy1296; + if (yych <= 'p') goto yy1236; goto yy166; } else { - if (yych <= 'v') goto yy1295; + if (yych <= 'v') goto yy1235; if (yych <= 'z') goto yy166; goto yy3; } } } -yy1279: +yy1219: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -17711,7 +16807,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'S') goto yy166; - goto yy1289; + goto yy1229; } } else { if (yych <= 's') { @@ -17719,12 +16815,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 't') goto yy1289; + if (yych <= 't') goto yy1229; if (yych <= 'z') goto yy166; goto yy3; } } -yy1280: +yy1220: yych = *++YYCURSOR; if (yych <= 'X') { if (yych <= ')') { @@ -17733,7 +16829,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'W') goto yy166; - goto yy1286; + goto yy1226; } } else { if (yych <= 'w') { @@ -17741,12 +16837,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'x') goto yy1286; + if (yych <= 'x') goto yy1226; if (yych <= 'z') goto yy166; goto yy3; } } -yy1281: +yy1221: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -17762,12 +16858,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'n') goto yy1282; + if (yych <= 'n') goto yy1222; if (yych <= 'z') goto yy166; goto yy3; } } -yy1282: +yy1222: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -17783,12 +16879,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 'd') goto yy1283; + if (yych <= 'd') goto yy1223; if (yych <= 'z') goto yy167; goto yy191; } } -yy1283: +yy1223: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -17798,12 +16894,12 @@ if (yych <= 'Z') goto yy168; goto yy3; } else { - if (yych <= 'a') goto yy1284; + if (yych <= 'a') goto yy1224; if (yych <= 'z') goto yy168; goto yy3; } } -yy1284: +yy1224: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { @@ -17819,16 +16915,16 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'y') goto yy1285; + if (yych <= 'y') goto yy1225; if (yych <= 'z') goto yy169; goto yy3; } } -yy1285: +yy1225: yych = *++YYCURSOR; if (yych == ')') goto yy164; goto yy191; -yy1286: +yy1226: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -17844,12 +16940,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1287; + if (yych <= 't') goto yy1227; if (yych <= 'z') goto yy167; goto yy3; } } -yy1287: +yy1227: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -17865,20 +16961,20 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'h') goto yy1288; + if (yych <= 'h') goto yy1228; if (yych <= 'z') goto yy168; goto yy3; } } -yy1288: +yy1228: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1256; + goto yy1196; } else { - if (yych == ' ') goto yy1256; + if (yych == ' ') goto yy1196; goto yy3; } } else { @@ -17892,7 +16988,7 @@ goto yy3; } } -yy1289: +yy1229: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { @@ -17908,12 +17004,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 'u') goto yy1290; + if (yych <= 'u') goto yy1230; if (yych <= 'z') goto yy167; goto yy191; } } -yy1290: +yy1230: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -17929,12 +17025,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'r') goto yy1291; + if (yych <= 'r') goto yy1231; if (yych <= 'z') goto yy168; goto yy3; } } -yy1291: +yy1231: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -17950,27 +17046,27 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'd') goto yy1292; + if (yych <= 'd') goto yy1232; if (yych <= 'z') goto yy169; goto yy3; } } -yy1292: +yy1232: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'A') goto yy1293; + if (yych <= 'A') goto yy1233; if (yych != 'a') goto yy3; } -yy1293: +yy1233: yych = *++YYCURSOR; if (yych == 'Y') goto yy197; if (yych == 'y') goto yy197; goto yy56; -yy1294: +yy1234: yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { @@ -17979,7 +17075,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'N') goto yy167; - goto yy1305; + goto yy1245; } } else { if (yych <= 'n') { @@ -17987,12 +17083,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'o') goto yy1305; + if (yych <= 'o') goto yy1245; if (yych <= 'z') goto yy167; goto yy3; } } -yy1295: +yy1235: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -18001,7 +17097,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy167; - goto yy1302; + goto yy1242; } } else { if (yych <= 'd') { @@ -18009,12 +17105,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'e') goto yy1302; + if (yych <= 'e') goto yy1242; if (yych <= 'z') goto yy167; goto yy3; } } -yy1296: +yy1236: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -18049,13 +17145,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 't') goto yy1297; + if (yych <= 't') goto yy1237; if (yych <= 'z') goto yy167; goto yy218; } } } -yy1297: +yy1237: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -18090,13 +17186,13 @@ if (yych <= '`') goto yy218; goto yy168; } else { - if (yych <= 'e') goto yy1298; + if (yych <= 'e') goto yy1238; if (yych <= 'z') goto yy168; goto yy218; } } } -yy1298: +yy1238: yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { @@ -18112,31 +17208,31 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'm') goto yy1299; + if (yych <= 'm') goto yy1239; if (yych <= 'z') goto yy169; goto yy3; } } -yy1299: +yy1239: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'B') goto yy1300; + if (yych <= 'B') goto yy1240; if (yych != 'b') goto yy3; } -yy1300: +yy1240: yych = *++YYCURSOR; - if (yych == 'E') goto yy1301; + if (yych == 'E') goto yy1241; if (yych != 'e') goto yy56; -yy1301: +yy1241: yych = *++YYCURSOR; - if (yych == 'R') goto yy230; - if (yych == 'r') goto yy230; + if (yych == 'R') goto yy229; + if (yych == 'r') goto yy229; goto yy56; -yy1302: +yy1242: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -18152,12 +17248,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'n') goto yy1303; + if (yych <= 'n') goto yy1243; if (yych <= 'z') goto yy168; goto yy3; } } -yy1303: +yy1243: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -18173,23 +17269,23 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 't') goto yy1304; + if (yych <= 't') goto yy1244; if (yych <= 'z') goto yy169; goto yy3; } } -yy1304: +yy1244: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'H') goto yy1255; - if (yych == 'h') goto yy1255; + if (yych <= 'H') goto yy1195; + if (yych == 'h') goto yy1195; goto yy3; } -yy1305: +yy1245: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -18205,12 +17301,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'n') goto yy1306; + if (yych <= 'n') goto yy1246; if (yych <= 'z') goto yy168; goto yy3; } } -yy1306: +yy1246: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -18219,7 +17315,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'C') goto yy169; - goto yy1265; + goto yy1205; } } else { if (yych <= 'c') { @@ -18227,12 +17323,12 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'd') goto yy1265; + if (yych <= 'd') goto yy1205; if (yych <= 'z') goto yy169; goto yy3; } } -yy1307: +yy1247: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { @@ -18248,16 +17344,16 @@ if (yych <= 'C') { if (yych <= '@') goto yy3; if (yych <= 'B') goto yy166; - goto yy1294; + goto yy1234; } else { - if (yych == 'P') goto yy1296; + if (yych == 'P') goto yy1236; goto yy166; } } } else { if (yych <= 'b') { if (yych <= '^') { - if (yych <= 'V') goto yy1295; + if (yych <= 'V') goto yy1235; if (yych <= 'Z') goto yy166; goto yy3; } else { @@ -18267,17 +17363,17 @@ } } else { if (yych <= 'p') { - if (yych <= 'c') goto yy1323; + if (yych <= 'c') goto yy1263; if (yych <= 'o') goto yy171; - goto yy1325; + goto yy1265; } else { - if (yych == 'v') goto yy1324; + if (yych == 'v') goto yy1264; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1308: +yy1248: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -18292,7 +17388,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1289; + if (yych <= 'T') goto yy1229; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -18301,13 +17397,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 't') goto yy1318; + if (yych <= 't') goto yy1258; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1309: +yy1249: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -18322,7 +17418,7 @@ } } else { if (yych <= '_') { - if (yych <= 'X') goto yy1286; + if (yych <= 'X') goto yy1226; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -18331,13 +17427,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'x') goto yy1315; + if (yych <= 'x') goto yy1255; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1310: +yy1250: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -18352,7 +17448,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1282; + if (yych <= 'N') goto yy1222; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -18361,13 +17457,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'n') goto yy1311; + if (yych <= 'n') goto yy1251; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1311: +yy1251: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -18382,7 +17478,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1283; + if (yych <= 'D') goto yy1223; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -18391,13 +17487,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 'd') goto yy1312; + if (yych <= 'd') goto yy1252; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1312: +yy1252: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -18411,18 +17507,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1284; + if (yych <= 'A') goto yy1224; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1313; + if (yych <= 'a') goto yy1253; if (yych <= 'z') goto yy176; goto yy3; } } -yy1313: +yy1253: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -18437,7 +17533,7 @@ } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1285; + if (yych <= 'Y') goto yy1225; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -18446,13 +17542,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'y') goto yy1314; + if (yych <= 'y') goto yy1254; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1314: +yy1254: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { @@ -18471,7 +17567,7 @@ goto yy191; } } -yy1315: +yy1255: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -18486,7 +17582,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1287; + if (yych <= 'T') goto yy1227; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -18495,13 +17591,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1316; + if (yych <= 't') goto yy1256; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1316: +yy1256: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -18516,7 +17612,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1288; + if (yych <= 'H') goto yy1228; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -18525,20 +17621,20 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'h') goto yy1317; + if (yych <= 'h') goto yy1257; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1317: +yy1257: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; if (yych <= 0x1F) goto yy3; - goto yy1256; + goto yy1196; } else { if (yych == ')') goto yy164; if (yych <= ',') goto yy3; @@ -18560,7 +17656,7 @@ } } } -yy1318: +yy1258: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { @@ -18575,7 +17671,7 @@ } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1290; + if (yych <= 'U') goto yy1230; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -18584,13 +17680,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 'u') goto yy1319; + if (yych <= 'u') goto yy1259; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1319: +yy1259: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -18605,7 +17701,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1291; + if (yych <= 'R') goto yy1231; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -18614,13 +17710,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'r') goto yy1320; + if (yych <= 'r') goto yy1260; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1320: +yy1260: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -18635,7 +17731,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1292; + if (yych <= 'D') goto yy1232; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -18644,13 +17740,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'd') goto yy1321; + if (yych <= 'd') goto yy1261; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1321: +yy1261: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -18664,22 +17760,22 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1293; + if (yych <= 'A') goto yy1233; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1322; + if (yych <= 'a') goto yy1262; if (yych <= 'z') goto yy178; goto yy3; } } -yy1322: +yy1262: yych = *++YYCURSOR; if (yych == 'Y') goto yy197; if (yych == 'y') goto yy210; goto yy179; -yy1323: +yy1263: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -18694,7 +17790,7 @@ } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1305; + if (yych <= 'O') goto yy1245; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -18703,13 +17799,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'o') goto yy1334; + if (yych <= 'o') goto yy1274; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1324: +yy1264: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -18724,7 +17820,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1302; + if (yych <= 'E') goto yy1242; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -18733,13 +17829,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'e') goto yy1331; + if (yych <= 'e') goto yy1271; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1325: +yy1265: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -18755,7 +17851,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -18767,7 +17863,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'T') goto yy1297; + if (yych <= 'T') goto yy1237; if (yych <= 'Z') goto yy167; goto yy218; } @@ -18777,13 +17873,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 't') goto yy1326; + if (yych <= 't') goto yy1266; if (yych <= 'z') goto yy175; goto yy218; } } } -yy1326: +yy1266: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -18799,7 +17895,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -18811,7 +17907,7 @@ if (yych <= '@') goto yy218; goto yy168; } else { - if (yych <= 'E') goto yy1298; + if (yych <= 'E') goto yy1238; if (yych <= 'Z') goto yy168; goto yy218; } @@ -18821,13 +17917,13 @@ if (yych <= '`') goto yy218; goto yy176; } else { - if (yych <= 'e') goto yy1327; + if (yych <= 'e') goto yy1267; if (yych <= 'z') goto yy176; goto yy218; } } } -yy1327: +yy1267: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { @@ -18842,7 +17938,7 @@ } } else { if (yych <= '_') { - if (yych <= 'M') goto yy1299; + if (yych <= 'M') goto yy1239; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -18851,13 +17947,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'm') goto yy1328; + if (yych <= 'm') goto yy1268; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1328: +yy1268: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { @@ -18871,24 +17967,24 @@ } } else { if (yych <= '`') { - if (yych <= 'B') goto yy1300; + if (yych <= 'B') goto yy1240; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'b') goto yy1329; + if (yych == 'b') goto yy1269; if (yych <= 'z') goto yy178; goto yy3; } } -yy1329: +yy1269: yych = *++YYCURSOR; - if (yych == 'E') goto yy1301; + if (yych == 'E') goto yy1241; if (yych != 'e') goto yy179; yych = *++YYCURSOR; - if (yych == 'R') goto yy230; - if (yych == 'r') goto yy401; + if (yych == 'R') goto yy229; + if (yych == 'r') goto yy341; goto yy179; -yy1331: +yy1271: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -18903,7 +17999,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1303; + if (yych <= 'N') goto yy1243; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -18912,13 +18008,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'n') goto yy1332; + if (yych <= 'n') goto yy1272; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1332: +yy1272: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -18933,7 +18029,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1304; + if (yych <= 'T') goto yy1244; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -18942,13 +18038,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 't') goto yy1333; + if (yych <= 't') goto yy1273; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1333: +yy1273: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -18962,16 +18058,16 @@ } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1255; + if (yych <= 'H') goto yy1195; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'h') goto yy1273; + if (yych == 'h') goto yy1213; if (yych <= 'z') goto yy178; goto yy3; } } -yy1334: +yy1274: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -18986,7 +18082,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1306; + if (yych <= 'N') goto yy1246; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -18995,13 +18091,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'n') goto yy1335; + if (yych <= 'n') goto yy1275; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1335: +yy1275: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -19016,7 +18112,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1265; + if (yych <= 'D') goto yy1205; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -19025,13 +18121,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'd') goto yy1277; + if (yych <= 'd') goto yy1217; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1336: +yy1276: yych = *++YYCURSOR; if (yych <= 'C') { if (yych <= ')') { @@ -19047,12 +18143,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'c') goto yy1337; + if (yych <= 'c') goto yy1277; if (yych <= 'z') goto yy166; goto yy3; } } -yy1337: +yy1277: yych = *++YYCURSOR; if (yych <= 'K') { if (yych <= ')') { @@ -19068,16 +18164,16 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'k') goto yy1338; + if (yych <= 'k') goto yy1278; if (yych <= 'z') goto yy167; goto yy3; } } -yy1338: +yy1278: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ')') { - if (yych == ' ') goto yy1339; + if (yych == ' ') goto yy1279; if (yych <= '(') goto yy3; goto yy164; } else { @@ -19090,30 +18186,30 @@ goto yy3; } } -yy1339: +yy1279: yych = *++YYCURSOR; - if (yych == 'O') goto yy1340; + if (yych == 'O') goto yy1280; if (yych != 'o') goto yy56; -yy1340: +yy1280: yych = *++YYCURSOR; - if (yych == 'F') goto yy1341; + if (yych == 'F') goto yy1281; if (yych != 'f') goto yy56; -yy1341: +yy1281: yych = *++YYCURSOR; if (yych != ' ') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy1343; - if (yych <= '2') goto yy1345; - if (yych <= '9') goto yy1346; + if (yych <= '1') goto yy1283; + if (yych <= '2') goto yy1285; + if (yych <= '9') goto yy1286; goto yy56; -yy1343: - yyaccept = 28; +yy1283: + yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1347; - if (yych <= '9') goto yy1346; - goto yy1347; -yy1344: + if (yych <= '/') goto yy1287; + if (yych <= '9') goto yy1286; + goto yy1287; +yy1284: { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@ -19135,66 +18231,66 @@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -yy1345: - yyaccept = 28; +yy1285: + yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1347; - if (yych >= '5') goto yy1347; -yy1346: - yyaccept = 28; + if (yych <= '/') goto yy1287; + if (yych >= '5') goto yy1287; +yy1286: + yyaccept = 27; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; -yy1347: +yy1287: if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1346; - goto yy1344; + if (yych == '\t') goto yy1286; + goto yy1284; } else { - if (yych <= ' ') goto yy1346; - if (yych <= '@') goto yy1344; + if (yych <= ' ') goto yy1286; + if (yych <= '@') goto yy1284; } } else { if (yych <= '`') { - if (yych != 'P') goto yy1344; + if (yych != 'P') goto yy1284; } else { - if (yych <= 'a') goto yy1348; - if (yych != 'p') goto yy1344; + if (yych <= 'a') goto yy1288; + if (yych != 'p') goto yy1284; } } -yy1348: +yy1288: yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy1350; - if (yych == 'm') goto yy1350; + if (yych <= 'M') goto yy1290; + if (yych == 'm') goto yy1290; goto yy56; } yych = *++YYCURSOR; - if (yych == 'M') goto yy1350; + if (yych == 'M') goto yy1290; if (yych != 'm') goto yy56; -yy1350: +yy1290: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy1352; - if (yych == '\t') goto yy1352; + if (yych <= 0x00) goto yy1292; + if (yych == '\t') goto yy1292; goto yy56; } else { - if (yych <= ' ') goto yy1352; + if (yych <= ' ') goto yy1292; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy1352; + if (yych <= 0x00) goto yy1292; if (yych <= 0x08) goto yy56; } else { if (yych != ' ') goto yy56; } -yy1352: +yy1292: yych = *++YYCURSOR; - goto yy1344; -yy1353: + goto yy1284; +yy1293: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { @@ -19209,7 +18305,7 @@ } } else { if (yych <= '_') { - if (yych <= 'C') goto yy1337; + if (yych <= 'C') goto yy1277; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -19218,13 +18314,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'c') goto yy1354; + if (yych <= 'c') goto yy1294; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1354: +yy1294: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'J') { @@ -19239,7 +18335,7 @@ } } else { if (yych <= '_') { - if (yych <= 'K') goto yy1338; + if (yych <= 'K') goto yy1278; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -19248,18 +18344,18 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'k') goto yy1355; + if (yych <= 'k') goto yy1295; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1355: +yy1295: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= '(') { - if (yych == ' ') goto yy1339; + if (yych == ' ') goto yy1279; goto yy3; } else { if (yych <= ')') goto yy164; @@ -19279,7 +18375,7 @@ goto yy3; } } -yy1356: +yy1296: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -19295,12 +18391,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 's') goto yy1357; + if (yych <= 's') goto yy1297; if (yych <= 'z') goto yy166; goto yy3; } } -yy1357: +yy1297: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -19316,18 +18412,18 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1358; + if (yych <= 't') goto yy1298; if (yych <= 'z') goto yy167; goto yy3; } } -yy1358: +yy1298: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1129; + goto yy1069; } else { if (yych != ' ') goto yy3; } @@ -19342,36 +18438,36 @@ goto yy3; } } -yy1359: +yy1299: yych = *++YYCURSOR; - if (yych == 'D') goto yy1360; - if (yych != 'd') goto yy1130; -yy1360: + if (yych == 'D') goto yy1300; + if (yych != 'd') goto yy1070; +yy1300: yych = *++YYCURSOR; - if (yych == 'A') goto yy1361; + if (yych == 'A') goto yy1301; if (yych != 'a') goto yy56; -yy1361: +yy1301: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1362; + if (yych == 'Y') goto yy1302; if (yych != 'y') goto yy56; -yy1362: - yyaccept = 26; +yy1302: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { - if (yych != ' ') goto yy1144; + if (yych != ' ') goto yy1084; } else { - if (yych <= 'S') goto yy1169; - if (yych == 's') goto yy1169; - goto yy1144; + if (yych <= 'S') goto yy1109; + if (yych == 's') goto yy1109; + goto yy1084; } yych = *++YYCURSOR; - if (yych == 'O') goto yy1364; + if (yych == 'O') goto yy1304; if (yych != 'o') goto yy56; -yy1364: +yy1304: yych = *++YYCURSOR; - if (yych == 'F') goto yy1365; + if (yych == 'F') goto yy1305; if (yych != 'f') goto yy56; -yy1365: +yy1305: ++YYCURSOR; { DEBUG_OUTPUT("firstdayof | lastdayof"); @@ -19388,7 +18484,7 @@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -yy1367: +yy1307: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -19403,7 +18499,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1357; + if (yych <= 'S') goto yy1297; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -19412,13 +18508,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 's') goto yy1368; + if (yych <= 's') goto yy1308; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1368: +yy1308: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -19433,7 +18529,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1358; + if (yych <= 'T') goto yy1298; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -19442,20 +18538,20 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1369; + if (yych <= 't') goto yy1309; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1369: +yy1309: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1129; + if (yych == '\t') goto yy1069; if (yych <= 0x1F) goto yy3; - goto yy1359; + goto yy1299; } else { if (yych == ')') goto yy164; if (yych <= ',') goto yy3; @@ -19477,7 +18573,7 @@ } } } -yy1370: +yy1310: yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { @@ -19486,7 +18582,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'A') goto yy166; - goto yy1406; + goto yy1346; } } else { if (yych <= 'a') { @@ -19494,35 +18590,35 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'b') goto yy1406; + if (yych <= 'b') goto yy1346; if (yych <= 'z') goto yy166; goto yy3; } } -yy1371: +yy1311: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'F') goto yy1396; + if (yych == 'F') goto yy1336; if (yych <= 'Q') goto yy166; - goto yy1395; + goto yy1335; } } else { if (yych <= 'f') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'e') goto yy166; - goto yy1396; + goto yy1336; } else { - if (yych == 'r') goto yy1395; + if (yych == 'r') goto yy1335; if (yych <= 'z') goto yy166; goto yy3; } } -yy1372: +yy1312: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { @@ -19531,7 +18627,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'T') goto yy166; - goto yy1392; + goto yy1332; } } else { if (yych <= 't') { @@ -19539,19 +18635,19 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'u') goto yy1392; + if (yych <= 'u') goto yy1332; if (yych <= 'z') goto yy166; goto yy3; } } -yy1373: +yy1313: yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'I') goto yy1375; + if (yych == 'I') goto yy1315; if (yych <= 'N') goto yy166; } } else { @@ -19559,14 +18655,14 @@ if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'h') goto yy166; - goto yy1375; + goto yy1315; } else { - if (yych == 'o') goto yy1374; + if (yych == 'o') goto yy1314; if (yych <= 'z') goto yy166; goto yy3; } } -yy1374: +yy1314: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -19575,7 +18671,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'M') goto yy167; - goto yy1378; + goto yy1318; } } else { if (yych <= 'm') { @@ -19583,12 +18679,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'n') goto yy1378; + if (yych <= 'n') goto yy1318; if (yych <= 'z') goto yy167; goto yy3; } } -yy1375: +yy1315: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -19604,12 +18700,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 'd') goto yy1376; + if (yych <= 'd') goto yy1316; if (yych <= 'z') goto yy167; goto yy191; } } -yy1376: +yy1316: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -19619,12 +18715,12 @@ if (yych <= 'Z') goto yy168; goto yy3; } else { - if (yych <= 'a') goto yy1377; + if (yych <= 'a') goto yy1317; if (yych <= 'z') goto yy168; goto yy3; } } -yy1377: +yy1317: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { @@ -19633,7 +18729,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'X') goto yy169; - goto yy1285; + goto yy1225; } } else { if (yych <= 'x') { @@ -19641,12 +18737,12 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'y') goto yy1285; + if (yych <= 'y') goto yy1225; if (yych <= 'z') goto yy169; goto yy3; } } -yy1378: +yy1318: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -19662,16 +18758,16 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 't') goto yy1379; + if (yych <= 't') goto yy1319; if (yych <= 'z') goto yy168; goto yy3; } } -yy1379: +yy1319: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ')') { - if (yych == ' ') goto yy1380; + if (yych == ' ') goto yy1320; if (yych <= '(') goto yy3; goto yy164; } else { @@ -19684,88 +18780,88 @@ goto yy3; } } -yy1380: +yy1320: yych = *++YYCURSOR; - if (yych == 'O') goto yy1381; + if (yych == 'O') goto yy1321; if (yych != 'o') goto yy56; -yy1381: +yy1321: yych = *++YYCURSOR; - if (yych == 'F') goto yy1382; + if (yych == 'F') goto yy1322; if (yych != 'f') goto yy56; -yy1382: +yy1322: yych = *++YYCURSOR; if (yych != ' ') goto yy56; yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '1') goto yy1384; - if (yych <= '2') goto yy1385; - if (yych <= '9') goto yy1386; + if (yych <= '1') goto yy1324; + if (yych <= '2') goto yy1325; + if (yych <= '9') goto yy1326; goto yy56; -yy1384: - yyaccept = 28; +yy1324: + yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1387; - if (yych <= '9') goto yy1386; - goto yy1387; -yy1385: - yyaccept = 28; + if (yych <= '/') goto yy1327; + if (yych <= '9') goto yy1326; + goto yy1327; +yy1325: + yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1387; - if (yych >= '5') goto yy1387; -yy1386: - yyaccept = 28; + if (yych <= '/') goto yy1327; + if (yych >= '5') goto yy1327; +yy1326: + yyaccept = 27; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; -yy1387: +yy1327: if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1386; - goto yy1344; + if (yych == '\t') goto yy1326; + goto yy1284; } else { - if (yych <= ' ') goto yy1386; - if (yych <= '@') goto yy1344; + if (yych <= ' ') goto yy1326; + if (yych <= '@') goto yy1284; } } else { if (yych <= '`') { - if (yych != 'P') goto yy1344; + if (yych != 'P') goto yy1284; } else { - if (yych <= 'a') goto yy1388; - if (yych != 'p') goto yy1344; + if (yych <= 'a') goto yy1328; + if (yych != 'p') goto yy1284; } } -yy1388: +yy1328: yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy1390; - if (yych == 'm') goto yy1390; + if (yych <= 'M') goto yy1330; + if (yych == 'm') goto yy1330; goto yy56; } yych = *++YYCURSOR; - if (yych == 'M') goto yy1390; + if (yych == 'M') goto yy1330; if (yych != 'm') goto yy56; -yy1390: +yy1330: yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy1352; - if (yych == '\t') goto yy1352; + if (yych <= 0x00) goto yy1292; + if (yych == '\t') goto yy1292; goto yy56; } else { - if (yych <= ' ') goto yy1352; + if (yych <= ' ') goto yy1292; if (yych != '.') goto yy56; } yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy1352; + if (yych <= 0x00) goto yy1292; if (yych <= 0x08) goto yy56; - goto yy1352; + goto yy1292; } else { - if (yych == ' ') goto yy1352; + if (yych == ' ') goto yy1292; goto yy56; } -yy1392: +yy1332: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -19781,12 +18877,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'r') goto yy1393; + if (yych <= 'r') goto yy1333; if (yych <= 'z') goto yy167; goto yy3; } } -yy1393: +yy1333: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -19802,12 +18898,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 't') goto yy1394; + if (yych <= 't') goto yy1334; if (yych <= 'z') goto yy168; goto yy3; } } -yy1394: +yy1334: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -19816,7 +18912,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'G') goto yy169; - goto yy1265; + goto yy1205; } } else { if (yych <= 'g') { @@ -19824,12 +18920,12 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'h') goto yy1265; + if (yych <= 'h') goto yy1205; if (yych <= 'z') goto yy169; goto yy3; } } -yy1395: +yy1335: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -19838,7 +18934,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'R') goto yy167; - goto yy1398; + goto yy1338; } } else { if (yych <= 'r') { @@ -19846,12 +18942,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 's') goto yy1398; + if (yych <= 's') goto yy1338; if (yych <= 'z') goto yy167; goto yy3; } } -yy1396: +yy1336: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -19867,12 +18963,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1397; + if (yych <= 't') goto yy1337; if (yych <= 'z') goto yy167; goto yy3; } } -yy1397: +yy1337: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -19881,7 +18977,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'G') goto yy168; - goto yy1288; + goto yy1228; } } else { if (yych <= 'g') { @@ -19889,12 +18985,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'h') goto yy1288; + if (yych <= 'h') goto yy1228; if (yych <= 'z') goto yy168; goto yy3; } } -yy1398: +yy1338: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -19910,18 +19006,18 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 't') goto yy1399; + if (yych <= 't') goto yy1339; if (yych <= 'z') goto yy168; goto yy3; } } -yy1399: +yy1339: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1256; + goto yy1196; } else { if (yych != ' ') goto yy3; } @@ -19936,37 +19032,37 @@ goto yy3; } } -yy1400: +yy1340: yych = *++YYCURSOR; - if (yych == 'D') goto yy1401; - if (yych != 'd') goto yy1257; -yy1401: + if (yych == 'D') goto yy1341; + if (yych != 'd') goto yy1197; +yy1341: yych = *++YYCURSOR; - if (yych == 'A') goto yy1402; + if (yych == 'A') goto yy1342; if (yych != 'a') goto yy56; -yy1402: +yy1342: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1403; + if (yych == 'Y') goto yy1343; if (yych != 'y') goto yy56; -yy1403: - yyaccept = 26; +yy1343: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { - if (yych != ' ') goto yy1144; + if (yych != ' ') goto yy1084; } else { - if (yych <= 'S') goto yy1169; - if (yych == 's') goto yy1169; - goto yy1144; + if (yych <= 'S') goto yy1109; + if (yych == 's') goto yy1109; + goto yy1084; } yych = *++YYCURSOR; - if (yych == 'O') goto yy1405; + if (yych == 'O') goto yy1345; if (yych != 'o') goto yy56; -yy1405: +yy1345: yych = *++YYCURSOR; - if (yych == 'F') goto yy1365; - if (yych == 'f') goto yy1365; + if (yych == 'F') goto yy1305; + if (yych == 'f') goto yy1305; goto yy56; -yy1406: +yy1346: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -20001,13 +19097,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'r') goto yy1407; + if (yych <= 'r') goto yy1347; if (yych <= 'z') goto yy167; goto yy218; } } } -yy1407: +yy1347: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { @@ -20023,12 +19119,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'u') goto yy1408; + if (yych <= 'u') goto yy1348; if (yych <= 'z') goto yy168; goto yy3; } } -yy1408: +yy1348: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -20038,27 +19134,27 @@ if (yych <= 'Z') goto yy169; goto yy3; } else { - if (yych <= 'a') goto yy1409; + if (yych <= 'a') goto yy1349; if (yych <= 'z') goto yy169; goto yy3; } } -yy1409: +yy1349: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'R') goto yy1410; + if (yych <= 'R') goto yy1350; if (yych != 'r') goto yy3; } -yy1410: +yy1350: yych = *++YYCURSOR; - if (yych == 'Y') goto yy230; - if (yych == 'y') goto yy230; + if (yych == 'Y') goto yy229; + if (yych == 'y') goto yy229; goto yy56; -yy1411: +yy1351: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { @@ -20073,7 +19169,7 @@ } } else { if (yych <= '_') { - if (yych <= 'B') goto yy1406; + if (yych <= 'B') goto yy1346; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -20082,13 +19178,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'b') goto yy1429; + if (yych <= 'b') goto yy1369; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1412: +yy1352: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -20105,14 +19201,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'F') goto yy1396; + if (yych == 'F') goto yy1336; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'R') goto yy1395; + if (yych <= 'R') goto yy1335; goto yy166; } else { if (yych == '_') goto yy172; @@ -20120,16 +19216,16 @@ } } else { if (yych <= 'q') { - if (yych == 'f') goto yy1425; + if (yych == 'f') goto yy1365; goto yy171; } else { - if (yych <= 'r') goto yy1424; + if (yych <= 'r') goto yy1364; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1413: +yy1353: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { @@ -20144,7 +19240,7 @@ } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1392; + if (yych <= 'U') goto yy1332; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -20153,13 +19249,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'u') goto yy1421; + if (yych <= 'u') goto yy1361; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1414: +yy1354: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -20176,14 +19272,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'I') goto yy1375; + if (yych == 'I') goto yy1315; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'O') goto yy1374; + if (yych <= 'O') goto yy1314; goto yy166; } else { if (yych == '_') goto yy172; @@ -20191,16 +19287,16 @@ } } else { if (yych <= 'n') { - if (yych == 'i') goto yy1416; + if (yych == 'i') goto yy1356; goto yy171; } else { - if (yych <= 'o') goto yy1415; + if (yych <= 'o') goto yy1355; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1415: +yy1355: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -20215,7 +19311,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1378; + if (yych <= 'N') goto yy1318; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -20224,13 +19320,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'n') goto yy1419; + if (yych <= 'n') goto yy1359; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1416: +yy1356: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -20245,7 +19341,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1376; + if (yych <= 'D') goto yy1316; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -20254,13 +19350,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 'd') goto yy1417; + if (yych <= 'd') goto yy1357; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1417: +yy1357: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -20274,18 +19370,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1377; + if (yych <= 'A') goto yy1317; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1418; + if (yych <= 'a') goto yy1358; if (yych <= 'z') goto yy176; goto yy3; } } -yy1418: +yy1358: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -20300,7 +19396,7 @@ } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1285; + if (yych <= 'Y') goto yy1225; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -20309,13 +19405,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'y') goto yy1314; + if (yych <= 'y') goto yy1254; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1419: +yy1359: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -20330,7 +19426,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1379; + if (yych <= 'T') goto yy1319; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -20339,18 +19435,18 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 't') goto yy1420; + if (yych <= 't') goto yy1360; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1420: +yy1360: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= '(') { - if (yych == ' ') goto yy1380; + if (yych == ' ') goto yy1320; goto yy3; } else { if (yych <= ')') goto yy164; @@ -20370,7 +19466,7 @@ goto yy3; } } -yy1421: +yy1361: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -20385,7 +19481,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1393; + if (yych <= 'R') goto yy1333; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -20394,13 +19490,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'r') goto yy1422; + if (yych <= 'r') goto yy1362; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1422: +yy1362: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -20415,7 +19511,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1394; + if (yych <= 'T') goto yy1334; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -20424,13 +19520,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 't') goto yy1423; + if (yych <= 't') goto yy1363; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1423: +yy1363: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -20445,7 +19541,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1265; + if (yych <= 'H') goto yy1205; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -20454,13 +19550,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'h') goto yy1277; + if (yych <= 'h') goto yy1217; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1424: +yy1364: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -20475,7 +19571,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1398; + if (yych <= 'S') goto yy1338; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -20484,13 +19580,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 's') goto yy1427; + if (yych <= 's') goto yy1367; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1425: +yy1365: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -20505,7 +19601,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1397; + if (yych <= 'T') goto yy1337; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -20514,13 +19610,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1426; + if (yych <= 't') goto yy1366; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1426: +yy1366: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -20535,7 +19631,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1288; + if (yych <= 'H') goto yy1228; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -20544,13 +19640,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'h') goto yy1317; + if (yych <= 'h') goto yy1257; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1427: +yy1367: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -20565,7 +19661,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1399; + if (yych <= 'T') goto yy1339; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -20574,20 +19670,20 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 't') goto yy1428; + if (yych <= 't') goto yy1368; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1428: +yy1368: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1256; + if (yych == '\t') goto yy1196; if (yych <= 0x1F) goto yy3; - goto yy1400; + goto yy1340; } else { if (yych == ')') goto yy164; if (yych <= ',') goto yy3; @@ -20609,7 +19705,7 @@ } } } -yy1429: +yy1369: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -20625,7 +19721,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -20637,7 +19733,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'R') goto yy1407; + if (yych <= 'R') goto yy1347; if (yych <= 'Z') goto yy167; goto yy218; } @@ -20647,13 +19743,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'r') goto yy1430; + if (yych <= 'r') goto yy1370; if (yych <= 'z') goto yy175; goto yy218; } } } -yy1430: +yy1370: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { @@ -20668,7 +19764,7 @@ } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1408; + if (yych <= 'U') goto yy1348; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -20677,13 +19773,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'u') goto yy1431; + if (yych <= 'u') goto yy1371; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1431: +yy1371: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -20697,18 +19793,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1409; + if (yych <= 'A') goto yy1349; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1432; + if (yych <= 'a') goto yy1372; if (yych <= 'z') goto yy177; goto yy3; } } -yy1432: +yy1372: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -20722,33 +19818,33 @@ } } else { if (yych <= '`') { - if (yych <= 'R') goto yy1410; + if (yych <= 'R') goto yy1350; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'r') goto yy1433; + if (yych == 'r') goto yy1373; if (yych <= 'z') goto yy178; goto yy3; } } -yy1433: +yy1373: yych = *++YYCURSOR; - if (yych == 'Y') goto yy230; - if (yych == 'y') goto yy401; + if (yych == 'Y') goto yy229; + if (yych == 'y') goto yy341; goto yy179; -yy1434: +yy1374: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; -yy1435: - yyaccept = 29; +yy1375: + yyaccept = 28; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; - if (yych == '.') goto yy1438; - if (yych <= '/') goto yy1437; - if (yych <= '9') goto yy1435; -yy1437: + if (yych == '.') goto yy1378; + if (yych <= '/') goto yy1377; + if (yych <= '9') goto yy1375; +yy1377: { timelib_ull i; @@ -20773,7 +19869,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1438: +yy1378: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; @@ -20819,7 +19915,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1446: +yy1386: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -20828,7 +19924,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'M') goto yy166; - goto yy1487; + goto yy1427; } } else { if (yych <= 'm') { @@ -20836,58 +19932,58 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'n') goto yy1487; + if (yych <= 'n') goto yy1427; if (yych <= 'z') goto yy166; goto yy3; } } -yy1447: +yy1387: yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'I') goto yy1479; + if (yych == 'I') goto yy1419; if (yych <= 'T') goto yy166; - goto yy1480; + goto yy1420; } } else { if (yych <= 'i') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'h') goto yy166; - goto yy1479; + goto yy1419; } else { - if (yych == 'u') goto yy1480; + if (yych == 'u') goto yy1420; if (yych <= 'z') goto yy166; goto yy3; } } -yy1448: +yy1388: yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'D') goto yy1468; + if (yych == 'D') goto yy1408; if (yych <= 'L') goto yy166; - goto yy1469; + goto yy1409; } } else { if (yych <= 'd') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'c') goto yy166; - goto yy1468; + goto yy1408; } else { - if (yych == 'm') goto yy1469; + if (yych == 'm') goto yy1409; if (yych <= 'z') goto yy166; goto yy3; } } -yy1449: +yy1389: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -20896,7 +19992,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy166; - goto yy1464; + goto yy1404; } } else { if (yych <= 'd') { @@ -20904,12 +20000,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'e') goto yy1464; + if (yych <= 'e') goto yy1404; if (yych <= 'z') goto yy166; goto yy3; } } -yy1450: +yy1390: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -20918,7 +20014,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'D') goto yy166; - goto yy1460; + goto yy1400; } } else { if (yych <= 'd') { @@ -20926,68 +20022,68 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'e') goto yy1460; + if (yych <= 'e') goto yy1400; if (yych <= 'z') goto yy166; goto yy3; } } -yy1451: +yy1391: yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy1089; + if (yych == '.') goto yy1029; goto yy56; } else { - if (yych <= '9') goto yy1454; - if (yych <= ':') goto yy1089; + if (yych <= '9') goto yy1394; + if (yych <= ':') goto yy1029; goto yy56; } -yy1452: +yy1392: yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy1089; + if (yych == '.') goto yy1029; goto yy56; } else { - if (yych <= '4') goto yy1454; - if (yych == ':') goto yy1089; + if (yych <= '4') goto yy1394; + if (yych == ':') goto yy1029; goto yy56; } -yy1453: +yy1393: yych = *++YYCURSOR; - if (yych == '.') goto yy1089; - if (yych == ':') goto yy1089; + if (yych == '.') goto yy1029; + if (yych == ':') goto yy1029; goto yy56; -yy1454: +yy1394: yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy1089; + if (yych == '.') goto yy1029; goto yy56; } else { - if (yych <= '5') goto yy1455; - if (yych == ':') goto yy1089; + if (yych <= '5') goto yy1395; + if (yych == ':') goto yy1029; goto yy56; } -yy1455: +yy1395: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; - yyaccept = 24; + yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1092; - if (yych <= '5') goto yy1457; - if (yych <= '6') goto yy1458; - goto yy1092; -yy1457: + if (yych <= '/') goto yy1032; + if (yych <= '5') goto yy1397; + if (yych <= '6') goto yy1398; + goto yy1032; +yy1397: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy1459; + if (yych <= '9') goto yy1399; goto yy56; -yy1458: +yy1398: yych = *++YYCURSOR; if (yych != '0') goto yy56; -yy1459: +yy1399: yych = *++YYCURSOR; - goto yy1100; -yy1460: + goto yy1040; +yy1400: yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= ')') { @@ -21003,12 +20099,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'l') goto yy1461; + if (yych <= 'l') goto yy1401; if (yych <= 'z') goto yy167; goto yy3; } } -yy1461: +yy1401: yych = *++YYCURSOR; if (yych <= 'F') { if (yych <= ')') { @@ -21024,12 +20120,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'f') goto yy1462; + if (yych <= 'f') goto yy1402; if (yych <= 'z') goto yy168; goto yy3; } } -yy1462: +yy1402: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -21045,23 +20141,23 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 't') goto yy1463; + if (yych <= 't') goto yy1403; if (yych <= 'z') goto yy169; goto yy3; } } -yy1463: +yy1403: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'H') goto yy1255; - if (yych == 'h') goto yy1255; + if (yych <= 'H') goto yy1195; + if (yych == 'h') goto yy1195; goto yy3; } -yy1464: +yy1404: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -21077,12 +20173,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 's') goto yy1465; + if (yych <= 's') goto yy1405; if (yych <= 'z') goto yy167; goto yy191; } } -yy1465: +yy1405: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -21098,12 +20194,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'd') goto yy1466; + if (yych <= 'd') goto yy1406; if (yych <= 'z') goto yy168; goto yy3; } } -yy1466: +yy1406: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -21113,12 +20209,12 @@ if (yych <= 'Z') goto yy169; goto yy3; } else { - if (yych <= 'a') goto yy1467; + if (yych <= 'a') goto yy1407; if (yych <= 'z') goto yy169; goto yy3; } } -yy1467: +yy1407: yych = *++YYCURSOR; if (yych <= 'X') { if (yych == ')') goto yy164; @@ -21128,23 +20224,23 @@ if (yych == 'y') goto yy197; goto yy3; } -yy1468: +yy1408: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; if (yych <= '@') goto yy3; - goto yy1476; + goto yy1416; } else { if (yych <= '`') { if (yych <= 'Z') goto yy167; goto yy3; } else { - if (yych <= 'a') goto yy1476; + if (yych <= 'a') goto yy1416; if (yych <= 'z') goto yy167; goto yy3; } } -yy1469: +yy1409: yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { @@ -21160,12 +20256,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'o') goto yy1470; + if (yych <= 'o') goto yy1410; if (yych <= 'z') goto yy167; goto yy3; } } -yy1470: +yy1410: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -21181,12 +20277,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'r') goto yy1471; + if (yych <= 'r') goto yy1411; if (yych <= 'z') goto yy168; goto yy3; } } -yy1471: +yy1411: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -21202,28 +20298,28 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'r') goto yy1472; + if (yych <= 'r') goto yy1412; if (yych <= 'z') goto yy169; goto yy3; } } -yy1472: +yy1412: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'O') goto yy1473; + if (yych <= 'O') goto yy1413; if (yych != 'o') goto yy3; } -yy1473: +yy1413: yych = *++YYCURSOR; - if (yych == 'W') goto yy1474; + if (yych == 'W') goto yy1414; if (yych != 'w') goto yy56; -yy1474: +yy1414: ++YYCURSOR; -yy1475: +yy1415: { DEBUG_OUTPUT("tomorrow"); TIMELIB_INIT; @@ -21234,7 +20330,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1476: +yy1416: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { @@ -21250,21 +20346,21 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'y') goto yy1477; + if (yych <= 'y') goto yy1417; if (yych <= 'z') goto yy168; goto yy3; } } -yy1477: +yy1417: ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { if (yych == ')') goto yy164; } else { if (yych <= 'Z') goto yy169; - if (yych <= '`') goto yy1478; + if (yych <= '`') goto yy1418; if (yych <= 'z') goto yy169; } -yy1478: +yy1418: { DEBUG_OUTPUT("midnight | today"); TIMELIB_INIT; @@ -21273,7 +20369,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1479: +yy1419: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= '@') { @@ -21281,8 +20377,8 @@ goto yy3; } else { if (yych <= 'Q') goto yy167; - if (yych <= 'R') goto yy1485; - goto yy1486; + if (yych <= 'R') goto yy1425; + goto yy1426; } } else { if (yych <= 'q') { @@ -21290,13 +20386,13 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'r') goto yy1485; - if (yych <= 's') goto yy1486; + if (yych <= 'r') goto yy1425; + if (yych <= 's') goto yy1426; if (yych <= 'z') goto yy167; goto yy3; } } -yy1480: +yy1420: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -21312,12 +20408,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 'r') goto yy1481; + if (yych <= 'r') goto yy1421; if (yych <= 'z') goto yy167; goto yy191; } } -yy1481: +yy1421: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -21333,12 +20429,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 's') goto yy1482; + if (yych <= 's') goto yy1422; if (yych <= 'z') goto yy168; goto yy3; } } -yy1482: +yy1422: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -21354,27 +20450,27 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'd') goto yy1483; + if (yych <= 'd') goto yy1423; if (yych <= 'z') goto yy169; goto yy3; } } -yy1483: +yy1423: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'A') goto yy1484; + if (yych <= 'A') goto yy1424; if (yych != 'a') goto yy3; } -yy1484: +yy1424: yych = *++YYCURSOR; if (yych == 'Y') goto yy197; if (yych == 'y') goto yy197; goto yy56; -yy1485: +yy1425: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -21383,7 +20479,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'C') goto yy168; - goto yy1288; + goto yy1228; } } else { if (yych <= 'c') { @@ -21391,20 +20487,20 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'd') goto yy1288; + if (yych <= 'd') goto yy1228; if (yych <= 'z') goto yy168; goto yy3; } } -yy1486: +yy1426: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1129; + goto yy1069; } else { - if (yych == ' ') goto yy1129; + if (yych == ' ') goto yy1069; goto yy3; } } else { @@ -21418,7 +20514,7 @@ goto yy3; } } -yy1487: +yy1427: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -21434,12 +20530,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1488; + if (yych <= 't') goto yy1428; if (yych <= 'z') goto yy167; goto yy3; } } -yy1488: +yy1428: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -21448,7 +20544,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'G') goto yy168; - goto yy1288; + goto yy1228; } } else { if (yych <= 'g') { @@ -21456,12 +20552,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'h') goto yy1288; + if (yych <= 'h') goto yy1228; if (yych <= 'z') goto yy168; goto yy3; } } -yy1489: +yy1429: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -21476,7 +20572,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1487; + if (yych <= 'N') goto yy1427; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -21485,13 +20581,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'n') goto yy1519; + if (yych <= 'n') goto yy1459; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1490: +yy1430: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { @@ -21508,14 +20604,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'I') goto yy1479; + if (yych == 'I') goto yy1419; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'U') goto yy1480; + if (yych <= 'U') goto yy1420; goto yy166; } else { if (yych == '_') goto yy172; @@ -21523,16 +20619,16 @@ } } else { if (yych <= 't') { - if (yych == 'i') goto yy1511; + if (yych == 'i') goto yy1451; goto yy171; } else { - if (yych <= 'u') goto yy1512; + if (yych <= 'u') goto yy1452; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1491: +yy1431: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { @@ -21549,14 +20645,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'D') goto yy1468; + if (yych == 'D') goto yy1408; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'M') goto yy1469; + if (yych <= 'M') goto yy1409; goto yy166; } else { if (yych == '_') goto yy172; @@ -21564,16 +20660,16 @@ } } else { if (yych <= 'l') { - if (yych == 'd') goto yy1502; + if (yych == 'd') goto yy1442; goto yy171; } else { - if (yych <= 'm') goto yy1503; + if (yych <= 'm') goto yy1443; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1492: +yy1432: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -21588,7 +20684,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1464; + if (yych <= 'E') goto yy1404; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -21597,13 +20693,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'e') goto yy1498; + if (yych <= 'e') goto yy1438; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1493: +yy1433: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -21618,7 +20714,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1460; + if (yych <= 'E') goto yy1400; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -21627,13 +20723,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'e') goto yy1494; + if (yych <= 'e') goto yy1434; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1494: +yy1434: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'K') { @@ -21648,7 +20744,7 @@ } } else { if (yych <= '_') { - if (yych <= 'L') goto yy1461; + if (yych <= 'L') goto yy1401; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -21657,13 +20753,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'l') goto yy1495; + if (yych <= 'l') goto yy1435; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1495: +yy1435: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { @@ -21678,7 +20774,7 @@ } } else { if (yych <= '_') { - if (yych <= 'F') goto yy1462; + if (yych <= 'F') goto yy1402; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -21687,13 +20783,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'f') goto yy1496; + if (yych <= 'f') goto yy1436; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1496: +yy1436: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -21708,7 +20804,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1463; + if (yych <= 'T') goto yy1403; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -21717,13 +20813,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 't') goto yy1497; + if (yych <= 't') goto yy1437; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1497: +yy1437: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -21737,16 +20833,16 @@ } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1255; + if (yych <= 'H') goto yy1195; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'h') goto yy1273; + if (yych == 'h') goto yy1213; if (yych <= 'z') goto yy178; goto yy3; } } -yy1498: +yy1438: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -21761,7 +20857,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1465; + if (yych <= 'S') goto yy1405; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -21770,13 +20866,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 's') goto yy1499; + if (yych <= 's') goto yy1439; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1499: +yy1439: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -21791,7 +20887,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1466; + if (yych <= 'D') goto yy1406; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -21800,13 +20896,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'd') goto yy1500; + if (yych <= 'd') goto yy1440; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1500: +yy1440: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -21820,18 +20916,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1467; + if (yych <= 'A') goto yy1407; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1501; + if (yych <= 'a') goto yy1441; if (yych <= 'z') goto yy177; goto yy3; } } -yy1501: +yy1441: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -21854,7 +20950,7 @@ goto yy3; } } -yy1502: +yy1442: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -21868,18 +20964,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1476; + if (yych <= 'A') goto yy1416; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1509; + if (yych <= 'a') goto yy1449; if (yych <= 'z') goto yy175; goto yy3; } } -yy1503: +yy1443: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -21894,7 +20990,7 @@ } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1470; + if (yych <= 'O') goto yy1410; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -21903,13 +20999,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'o') goto yy1504; + if (yych <= 'o') goto yy1444; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1504: +yy1444: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -21924,7 +21020,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1471; + if (yych <= 'R') goto yy1411; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -21933,13 +21029,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'r') goto yy1505; + if (yych <= 'r') goto yy1445; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1505: +yy1445: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -21954,7 +21050,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1472; + if (yych <= 'R') goto yy1412; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -21963,13 +21059,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'r') goto yy1506; + if (yych <= 'r') goto yy1446; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1506: +yy1446: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { @@ -21983,33 +21079,33 @@ } } else { if (yych <= '`') { - if (yych <= 'O') goto yy1473; + if (yych <= 'O') goto yy1413; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'o') goto yy1507; + if (yych == 'o') goto yy1447; if (yych <= 'z') goto yy178; goto yy3; } } -yy1507: +yy1447: yych = *++YYCURSOR; - if (yych == 'W') goto yy1474; + if (yych == 'W') goto yy1414; if (yych != 'w') goto yy179; - yyaccept = 30; + yyaccept = 29; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { goto yy178; } if (yych <= '.') { if (yych == '-') goto yy172; - goto yy1475; + goto yy1415; } else { if (yych <= '/') goto yy172; if (yych == '_') goto yy172; - goto yy1475; + goto yy1415; } -yy1509: +yy1449: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -22024,7 +21120,7 @@ } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1477; + if (yych <= 'Y') goto yy1417; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -22033,36 +21129,36 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'y') goto yy1510; + if (yych <= 'y') goto yy1450; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1510: - yyaccept = 31; +yy1450: + yyaccept = 30; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { if (yych == ')') goto yy164; - goto yy1478; + goto yy1418; } else { - if (yych == '.') goto yy1478; + if (yych == '.') goto yy1418; goto yy172; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1478; + if (yych <= '@') goto yy1418; if (yych <= 'Z') goto yy169; - goto yy1478; + goto yy1418; } else { if (yych <= '_') goto yy172; - if (yych <= '`') goto yy1478; + if (yych <= '`') goto yy1418; if (yych <= 'z') goto yy177; - goto yy1478; + goto yy1418; } } -yy1511: +yy1451: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -22077,13 +21173,13 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'Q') goto yy167; - goto yy1485; + goto yy1425; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'S') goto yy1486; + if (yych <= 'S') goto yy1426; goto yy167; } else { if (yych == '_') goto yy172; @@ -22092,15 +21188,15 @@ } else { if (yych <= 'r') { if (yych <= 'q') goto yy175; - goto yy1517; + goto yy1457; } else { - if (yych <= 's') goto yy1518; + if (yych <= 's') goto yy1458; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1512: +yy1452: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -22115,7 +21211,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1481; + if (yych <= 'R') goto yy1421; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -22124,13 +21220,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 'r') goto yy1513; + if (yych <= 'r') goto yy1453; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1513: +yy1453: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -22145,7 +21241,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1482; + if (yych <= 'S') goto yy1422; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -22154,13 +21250,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 's') goto yy1514; + if (yych <= 's') goto yy1454; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1514: +yy1454: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -22175,7 +21271,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1483; + if (yych <= 'D') goto yy1423; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -22184,13 +21280,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'd') goto yy1515; + if (yych <= 'd') goto yy1455; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1515: +yy1455: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -22204,22 +21300,22 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1484; + if (yych <= 'A') goto yy1424; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1516; + if (yych <= 'a') goto yy1456; if (yych <= 'z') goto yy178; goto yy3; } } -yy1516: +yy1456: yych = *++YYCURSOR; if (yych == 'Y') goto yy197; if (yych == 'y') goto yy210; goto yy179; -yy1517: +yy1457: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -22234,7 +21330,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1288; + if (yych <= 'D') goto yy1228; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -22243,20 +21339,20 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'd') goto yy1317; + if (yych <= 'd') goto yy1257; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1518: +yy1458: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1129; + if (yych == '\t') goto yy1069; if (yych <= 0x1F) goto yy3; - goto yy1129; + goto yy1069; } else { if (yych == ')') goto yy164; if (yych <= ',') goto yy3; @@ -22278,7 +21374,7 @@ } } } -yy1519: +yy1459: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -22293,7 +21389,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1488; + if (yych <= 'T') goto yy1428; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -22302,13 +21398,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1520; + if (yych <= 't') goto yy1460; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1520: +yy1460: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -22323,7 +21419,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1288; + if (yych <= 'H') goto yy1228; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -22332,36 +21428,36 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'h') goto yy1317; + if (yych <= 'h') goto yy1257; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1521: +yy1461: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= '@') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych == 'R') goto yy1533; + if (yych == 'R') goto yy1473; if (yych <= 'X') goto yy166; - goto yy1534; + goto yy1474; } } else { if (yych <= 'r') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'q') goto yy166; - goto yy1533; + goto yy1473; } else { - if (yych == 'y') goto yy1534; + if (yych == 'y') goto yy1474; if (yych <= 'z') goto yy166; goto yy3; } } -yy1522: +yy1462: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -22370,7 +21466,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'C') goto yy166; - goto yy1527; + goto yy1467; } } else { if (yych <= 'c') { @@ -22378,12 +21474,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'd') goto yy1527; + if (yych <= 'd') goto yy1467; if (yych <= 'z') goto yy166; goto yy3; } } -yy1523: +yy1463: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -22399,12 +21495,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'n') goto yy1524; + if (yych <= 'n') goto yy1464; if (yych <= 'z') goto yy166; goto yy3; } } -yy1524: +yy1464: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { @@ -22420,12 +21516,12 @@ if (yych <= '`') goto yy191; goto yy167; } else { - if (yych <= 'd') goto yy1525; + if (yych <= 'd') goto yy1465; if (yych <= 'z') goto yy167; goto yy191; } } -yy1525: +yy1465: yych = *++YYCURSOR; if (yych <= 'A') { if (yych == ')') goto yy164; @@ -22435,12 +21531,12 @@ if (yych <= 'Z') goto yy168; goto yy3; } else { - if (yych <= 'a') goto yy1526; + if (yych <= 'a') goto yy1466; if (yych <= 'z') goto yy168; goto yy3; } } -yy1526: +yy1466: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { @@ -22449,7 +21545,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'X') goto yy169; - goto yy1285; + goto yy1225; } } else { if (yych <= 'x') { @@ -22457,12 +21553,12 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'y') goto yy1285; + if (yych <= 'y') goto yy1225; if (yych <= 'z') goto yy169; goto yy3; } } -yy1527: +yy1467: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -22478,12 +21574,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'n') goto yy1528; + if (yych <= 'n') goto yy1468; if (yych <= 'z') goto yy167; goto yy3; } } -yy1528: +yy1468: yych = *++YYCURSOR; if (yych <= 'I') { if (yych <= ')') { @@ -22499,12 +21595,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'i') goto yy1529; + if (yych <= 'i') goto yy1469; if (yych <= 'z') goto yy168; goto yy3; } } -yy1529: +yy1469: yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { @@ -22520,29 +21616,29 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'g') goto yy1530; + if (yych <= 'g') goto yy1470; if (yych <= 'z') goto yy169; goto yy3; } } -yy1530: +yy1470: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'H') goto yy1531; + if (yych <= 'H') goto yy1471; if (yych != 'h') goto yy3; } -yy1531: +yy1471: yych = *++YYCURSOR; - if (yych == 'T') goto yy1532; + if (yych == 'T') goto yy1472; if (yych != 't') goto yy56; -yy1532: +yy1472: yych = *++YYCURSOR; - goto yy1478; -yy1533: + goto yy1418; +yy1473: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -22570,7 +21666,7 @@ if (yych <= '9') goto yy220; goto yy218; } else { - if (yych == 'C') goto yy1535; + if (yych == 'C') goto yy1475; goto yy167; } } else { @@ -22578,13 +21674,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'c') goto yy1535; + if (yych <= 'c') goto yy1475; if (yych <= 'z') goto yy167; goto yy218; } } } -yy1534: +yy1474: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { @@ -22609,7 +21705,7 @@ goto yy218; } } -yy1535: +yy1475: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -22618,7 +21714,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'G') goto yy168; - goto yy420; + goto yy360; } } else { if (yych <= 'g') { @@ -22626,12 +21722,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'h') goto yy420; + if (yych <= 'h') goto yy360; if (yych <= 'z') goto yy168; goto yy3; } } -yy1536: +yy1476: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -22648,14 +21744,14 @@ if (yych <= '/') goto yy172; goto yy3; } else { - if (yych == 'R') goto yy1533; + if (yych == 'R') goto yy1473; goto yy166; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'Y') goto yy1534; + if (yych <= 'Y') goto yy1474; goto yy166; } else { if (yych == '_') goto yy172; @@ -22663,16 +21759,16 @@ } } else { if (yych <= 'x') { - if (yych == 'r') goto yy1548; + if (yych == 'r') goto yy1488; goto yy171; } else { - if (yych <= 'y') goto yy1549; + if (yych <= 'y') goto yy1489; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1537: +yy1477: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -22687,7 +21783,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1527; + if (yych <= 'D') goto yy1467; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -22696,13 +21792,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'd') goto yy1542; + if (yych <= 'd') goto yy1482; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1538: +yy1478: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -22717,7 +21813,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1524; + if (yych <= 'N') goto yy1464; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -22726,13 +21822,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'n') goto yy1539; + if (yych <= 'n') goto yy1479; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1539: +yy1479: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -22747,7 +21843,7 @@ } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1525; + if (yych <= 'D') goto yy1465; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy191; goto yy172; @@ -22756,13 +21852,13 @@ if (yych <= '`') goto yy191; goto yy175; } else { - if (yych <= 'd') goto yy1540; + if (yych <= 'd') goto yy1480; if (yych <= 'z') goto yy175; goto yy191; } } } -yy1540: +yy1480: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { @@ -22776,18 +21872,18 @@ } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1526; + if (yych <= 'A') goto yy1466; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1541; + if (yych <= 'a') goto yy1481; if (yych <= 'z') goto yy176; goto yy3; } } -yy1541: +yy1481: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { @@ -22802,7 +21898,7 @@ } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1285; + if (yych <= 'Y') goto yy1225; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -22811,13 +21907,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'y') goto yy1314; + if (yych <= 'y') goto yy1254; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1542: +yy1482: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -22832,7 +21928,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1528; + if (yych <= 'N') goto yy1468; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -22841,13 +21937,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'n') goto yy1543; + if (yych <= 'n') goto yy1483; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1543: +yy1483: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { @@ -22862,7 +21958,7 @@ } } else { if (yych <= '_') { - if (yych <= 'I') goto yy1529; + if (yych <= 'I') goto yy1469; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -22871,13 +21967,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'i') goto yy1544; + if (yych <= 'i') goto yy1484; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1544: +yy1484: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { @@ -22892,7 +21988,7 @@ } } else { if (yych <= '_') { - if (yych <= 'G') goto yy1530; + if (yych <= 'G') goto yy1470; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -22901,13 +21997,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'g') goto yy1545; + if (yych <= 'g') goto yy1485; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1545: +yy1485: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -22921,33 +22017,33 @@ } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1531; + if (yych <= 'H') goto yy1471; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'h') goto yy1546; + if (yych == 'h') goto yy1486; if (yych <= 'z') goto yy178; goto yy3; } } -yy1546: +yy1486: yych = *++YYCURSOR; - if (yych == 'T') goto yy1532; + if (yych == 'T') goto yy1472; if (yych != 't') goto yy179; - yyaccept = 31; + yyaccept = 30; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { goto yy178; } if (yych <= '.') { if (yych == '-') goto yy172; - goto yy1478; + goto yy1418; } else { if (yych <= '/') goto yy172; if (yych == '_') goto yy172; - goto yy1478; + goto yy1418; } -yy1548: +yy1488: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -22963,7 +22059,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -22975,7 +22071,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'C') goto yy1535; + if (yych <= 'C') goto yy1475; if (yych <= 'Z') goto yy167; goto yy218; } @@ -22985,13 +22081,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'c') goto yy1550; + if (yych <= 'c') goto yy1490; if (yych <= 'z') goto yy175; goto yy218; } } } -yy1549: +yy1489: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { @@ -23005,7 +22101,7 @@ goto yy164; } else { if (yych <= ',') goto yy218; - if (yych <= '-') goto yy396; + if (yych <= '-') goto yy336; goto yy220; } } @@ -23026,7 +22122,7 @@ } } } -yy1550: +yy1490: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -23041,7 +22137,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy420; + if (yych <= 'H') goto yy360; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -23050,13 +22146,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'h') goto yy431; + if (yych <= 'h') goto yy371; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1551: +yy1491: yych = *++YYCURSOR; if (yych <= 'W') { if (yych <= 'N') { @@ -23064,29 +22160,29 @@ if (yych <= '@') goto yy3; goto yy166; } else { - if (yych <= 'O') goto yy1559; + if (yych <= 'O') goto yy1499; if (yych <= 'U') goto yy166; - if (yych <= 'V') goto yy1560; - goto yy1557; + if (yych <= 'V') goto yy1500; + goto yy1497; } } else { if (yych <= 'o') { if (yych <= 'Z') goto yy166; if (yych <= '`') goto yy3; if (yych <= 'n') goto yy166; - goto yy1559; + goto yy1499; } else { if (yych <= 'v') { if (yych <= 'u') goto yy166; - goto yy1560; + goto yy1500; } else { - if (yych <= 'w') goto yy1557; + if (yych <= 'w') goto yy1497; if (yych <= 'z') goto yy166; goto yy3; } } } -yy1552: +yy1492: yych = *++YYCURSOR; if (yych <= 'X') { if (yych <= ')') { @@ -23095,7 +22191,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'W') goto yy166; - goto yy1556; + goto yy1496; } } else { if (yych <= 'w') { @@ -23103,12 +22199,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'x') goto yy1556; + if (yych <= 'x') goto yy1496; if (yych <= 'z') goto yy166; goto yy3; } } -yy1553: +yy1493: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -23124,12 +22220,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 'n') goto yy1554; + if (yych <= 'n') goto yy1494; if (yych <= 'z') goto yy166; goto yy3; } } -yy1554: +yy1494: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -23145,12 +22241,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1555; + if (yych <= 't') goto yy1495; if (yych <= 'z') goto yy167; goto yy3; } } -yy1555: +yy1495: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { @@ -23159,7 +22255,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'G') goto yy168; - goto yy1288; + goto yy1228; } } else { if (yych <= 'g') { @@ -23167,12 +22263,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'h') goto yy1288; + if (yych <= 'h') goto yy1228; if (yych <= 'z') goto yy168; goto yy3; } } -yy1556: +yy1496: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -23181,7 +22277,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'S') goto yy167; - goto yy1486; + goto yy1426; } } else { if (yych <= 's') { @@ -23189,21 +22285,21 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1486; + if (yych <= 't') goto yy1426; if (yych <= 'z') goto yy167; goto yy3; } } -yy1557: +yy1497: ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { if (yych == ')') goto yy164; } else { if (yych <= 'Z') goto yy167; - if (yych <= '`') goto yy1558; + if (yych <= '`') goto yy1498; if (yych <= 'z') goto yy167; } -yy1558: +yy1498: { DEBUG_OUTPUT("now"); TIMELIB_INIT; @@ -23211,7 +22307,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1559: +yy1499: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@ -23220,7 +22316,7 @@ } else { if (yych <= '@') goto yy3; if (yych <= 'M') goto yy167; - goto yy1565; + goto yy1505; } } else { if (yych <= 'm') { @@ -23228,12 +22324,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 'n') goto yy1565; + if (yych <= 'n') goto yy1505; if (yych <= 'z') goto yy167; goto yy3; } } -yy1560: +yy1500: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@ -23268,13 +22364,13 @@ if (yych <= '`') goto yy218; goto yy167; } else { - if (yych <= 'e') goto yy1561; + if (yych <= 'e') goto yy1501; if (yych <= 'z') goto yy167; goto yy218; } } } -yy1561: +yy1501: yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { @@ -23290,12 +22386,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'm') goto yy1562; + if (yych <= 'm') goto yy1502; if (yych <= 'z') goto yy168; goto yy3; } } -yy1562: +yy1502: yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { @@ -23311,36 +22407,36 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'b') goto yy1563; + if (yych <= 'b') goto yy1503; if (yych <= 'z') goto yy169; goto yy3; } } -yy1563: +yy1503: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'E') goto yy1564; + if (yych <= 'E') goto yy1504; if (yych != 'e') goto yy3; } -yy1564: +yy1504: yych = *++YYCURSOR; - if (yych == 'R') goto yy230; - if (yych == 'r') goto yy230; + if (yych == 'R') goto yy229; + if (yych == 'r') goto yy229; goto yy56; -yy1565: +yy1505: ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { if (yych == ')') goto yy164; } else { if (yych <= 'Z') goto yy168; - if (yych <= '`') goto yy1566; + if (yych <= '`') goto yy1506; if (yych <= 'z') goto yy168; } -yy1566: +yy1506: { DEBUG_OUTPUT("noon"); TIMELIB_INIT; @@ -23351,7 +22447,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1567: +yy1507: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@ -23369,15 +22465,15 @@ if (yych <= '@') goto yy3; goto yy166; } else { - if (yych <= 'O') goto yy1559; + if (yych <= 'O') goto yy1499; if (yych <= 'U') goto yy166; - goto yy1560; + goto yy1500; } } } else { if (yych <= 'n') { if (yych <= '^') { - if (yych <= 'W') goto yy1557; + if (yych <= 'W') goto yy1497; if (yych <= 'Z') goto yy166; goto yy3; } else { @@ -23387,17 +22483,17 @@ } } else { if (yych <= 'v') { - if (yych <= 'o') goto yy1574; + if (yych <= 'o') goto yy1514; if (yych <= 'u') goto yy171; - goto yy1575; + goto yy1515; } else { - if (yych <= 'w') goto yy1573; + if (yych <= 'w') goto yy1513; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1568: +yy1508: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { @@ -23412,7 +22508,7 @@ } } else { if (yych <= '_') { - if (yych <= 'X') goto yy1556; + if (yych <= 'X') goto yy1496; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -23421,13 +22517,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'x') goto yy1572; + if (yych <= 'x') goto yy1512; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1569: +yy1509: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -23442,7 +22538,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1554; + if (yych <= 'N') goto yy1494; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -23451,13 +22547,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 'n') goto yy1570; + if (yych <= 'n') goto yy1510; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1570: +yy1510: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -23472,7 +22568,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1555; + if (yych <= 'T') goto yy1495; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -23481,13 +22577,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1571; + if (yych <= 't') goto yy1511; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1571: +yy1511: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { @@ -23502,7 +22598,7 @@ } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1288; + if (yych <= 'H') goto yy1228; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -23511,13 +22607,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'h') goto yy1317; + if (yych <= 'h') goto yy1257; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1572: +yy1512: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -23532,7 +22628,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1486; + if (yych <= 'T') goto yy1426; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -23541,36 +22637,36 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1518; + if (yych <= 't') goto yy1458; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1573: - yyaccept = 32; +yy1513: + yyaccept = 31; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { if (yych == ')') goto yy164; - goto yy1558; + goto yy1498; } else { - if (yych == '.') goto yy1558; + if (yych == '.') goto yy1498; goto yy172; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1558; + if (yych <= '@') goto yy1498; if (yych <= 'Z') goto yy167; - goto yy1558; + goto yy1498; } else { if (yych <= '_') goto yy172; - if (yych <= '`') goto yy1558; + if (yych <= '`') goto yy1498; if (yych <= 'z') goto yy175; - goto yy1558; + goto yy1498; } } -yy1574: +yy1514: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { @@ -23585,7 +22681,7 @@ } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1565; + if (yych <= 'N') goto yy1505; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -23594,13 +22690,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 'n') goto yy1580; + if (yych <= 'n') goto yy1520; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1575: +yy1515: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@ -23616,7 +22712,7 @@ if (yych <= '-') { if (yych <= ')') goto yy164; if (yych <= ',') goto yy218; - goto yy396; + goto yy336; } else { if (yych == '/') goto yy172; goto yy220; @@ -23628,7 +22724,7 @@ if (yych <= '@') goto yy218; goto yy167; } else { - if (yych <= 'E') goto yy1561; + if (yych <= 'E') goto yy1501; if (yych <= 'Z') goto yy167; goto yy218; } @@ -23638,13 +22734,13 @@ if (yych <= '`') goto yy218; goto yy175; } else { - if (yych <= 'e') goto yy1576; + if (yych <= 'e') goto yy1516; if (yych <= 'z') goto yy175; goto yy218; } } } -yy1576: +yy1516: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { @@ -23659,7 +22755,7 @@ } } else { if (yych <= '_') { - if (yych <= 'M') goto yy1562; + if (yych <= 'M') goto yy1502; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -23668,13 +22764,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'm') goto yy1577; + if (yych <= 'm') goto yy1517; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1577: +yy1517: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { @@ -23689,7 +22785,7 @@ } } else { if (yych <= '_') { - if (yych <= 'B') goto yy1563; + if (yych <= 'B') goto yy1503; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -23698,13 +22794,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'b') goto yy1578; + if (yych <= 'b') goto yy1518; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1578: +yy1518: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -23718,44 +22814,44 @@ } } else { if (yych <= '`') { - if (yych <= 'E') goto yy1564; + if (yych <= 'E') goto yy1504; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'e') goto yy1579; + if (yych == 'e') goto yy1519; if (yych <= 'z') goto yy178; goto yy3; } } -yy1579: +yy1519: yych = *++YYCURSOR; - if (yych == 'R') goto yy230; - if (yych == 'r') goto yy401; + if (yych == 'R') goto yy229; + if (yych == 'r') goto yy341; goto yy179; -yy1580: - yyaccept = 33; +yy1520: + yyaccept = 32; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { if (yych == ')') goto yy164; - goto yy1566; + goto yy1506; } else { - if (yych == '.') goto yy1566; + if (yych == '.') goto yy1506; goto yy172; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1566; + if (yych <= '@') goto yy1506; if (yych <= 'Z') goto yy168; - goto yy1566; + goto yy1506; } else { if (yych <= '_') goto yy172; - if (yych <= '`') goto yy1566; + if (yych <= '`') goto yy1506; if (yych <= 'z') goto yy176; - goto yy1566; + goto yy1506; } } -yy1581: +yy1521: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { @@ -23771,12 +22867,12 @@ if (yych <= '`') goto yy3; goto yy166; } else { - if (yych <= 's') goto yy1582; + if (yych <= 's') goto yy1522; if (yych <= 'z') goto yy166; goto yy3; } } -yy1582: +yy1522: yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { @@ -23792,12 +22888,12 @@ if (yych <= '`') goto yy3; goto yy167; } else { - if (yych <= 't') goto yy1583; + if (yych <= 't') goto yy1523; if (yych <= 'z') goto yy167; goto yy3; } } -yy1583: +yy1523: yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@ -23813,12 +22909,12 @@ if (yych <= '`') goto yy3; goto yy168; } else { - if (yych <= 'e') goto yy1584; + if (yych <= 'e') goto yy1524; if (yych <= 'z') goto yy168; goto yy3; } } -yy1584: +yy1524: yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { @@ -23834,32 +22930,32 @@ if (yych <= '`') goto yy3; goto yy169; } else { - if (yych <= 'r') goto yy1585; + if (yych <= 'r') goto yy1525; if (yych <= 'z') goto yy169; goto yy3; } } -yy1585: +yy1525: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych == ')') goto yy164; goto yy3; } else { - if (yych <= 'D') goto yy1586; + if (yych <= 'D') goto yy1526; if (yych != 'd') goto yy3; } -yy1586: +yy1526: yych = *++YYCURSOR; - if (yych == 'A') goto yy1587; + if (yych == 'A') goto yy1527; if (yych != 'a') goto yy56; -yy1587: +yy1527: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1588; + if (yych == 'Y') goto yy1528; if (yych != 'y') goto yy56; -yy1588: +yy1528: ++YYCURSOR; -yy1589: +yy1529: { DEBUG_OUTPUT("yesterday"); TIMELIB_INIT; @@ -23870,7 +22966,7 @@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -yy1590: +yy1530: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@ -23885,7 +22981,7 @@ } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1582; + if (yych <= 'S') goto yy1522; if (yych <= 'Z') goto yy166; if (yych <= '^') goto yy3; goto yy172; @@ -23894,13 +22990,13 @@ if (yych <= '`') goto yy3; goto yy171; } else { - if (yych <= 's') goto yy1591; + if (yych <= 's') goto yy1531; if (yych <= 'z') goto yy171; goto yy3; } } } -yy1591: +yy1531: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { @@ -23915,7 +23011,7 @@ } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1583; + if (yych <= 'T') goto yy1523; if (yych <= 'Z') goto yy167; if (yych <= '^') goto yy3; goto yy172; @@ -23924,13 +23020,13 @@ if (yych <= '`') goto yy3; goto yy175; } else { - if (yych <= 't') goto yy1592; + if (yych <= 't') goto yy1532; if (yych <= 'z') goto yy175; goto yy3; } } } -yy1592: +yy1532: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { @@ -23945,7 +23041,7 @@ } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1584; + if (yych <= 'E') goto yy1524; if (yych <= 'Z') goto yy168; if (yych <= '^') goto yy3; goto yy172; @@ -23954,13 +23050,13 @@ if (yych <= '`') goto yy3; goto yy176; } else { - if (yych <= 'e') goto yy1593; + if (yych <= 'e') goto yy1533; if (yych <= 'z') goto yy176; goto yy3; } } } -yy1593: +yy1533: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { @@ -23975,7 +23071,7 @@ } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1585; + if (yych <= 'R') goto yy1525; if (yych <= 'Z') goto yy169; if (yych <= '^') goto yy3; goto yy172; @@ -23984,13 +23080,13 @@ if (yych <= '`') goto yy3; goto yy177; } else { - if (yych <= 'r') goto yy1594; + if (yych <= 'r') goto yy1534; if (yych <= 'z') goto yy177; goto yy3; } } } -yy1594: +yy1534: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { @@ -24004,40 +23100,40 @@ } } else { if (yych <= '`') { - if (yych <= 'D') goto yy1586; + if (yych <= 'D') goto yy1526; if (yych == '_') goto yy172; goto yy3; } else { - if (yych == 'd') goto yy1595; + if (yych == 'd') goto yy1535; if (yych <= 'z') goto yy178; goto yy3; } } -yy1595: +yy1535: yych = *++YYCURSOR; - if (yych == 'A') goto yy1587; + if (yych == 'A') goto yy1527; if (yych != 'a') goto yy179; yych = *++YYCURSOR; - if (yych == 'Y') goto yy1588; + if (yych == 'Y') goto yy1528; if (yych != 'y') goto yy179; - yyaccept = 34; + yyaccept = 33; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { goto yy178; } if (yych <= '.') { if (yych == '-') goto yy172; - goto yy1589; + goto yy1529; } else { if (yych <= '/') goto yy172; if (yych == '_') goto yy172; - goto yy1589; + goto yy1529; } } } -#define YYMAXFILL 31 +#define YYMAXFILL 33 timelib_time* timelib_strtotime(char *s, size_t len, struct timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper) { diff -Nru php7.1-7.1.6/ext/date/lib/parse_date.re php7.1-7.1.8/ext/date/lib/parse_date.re --- php7.1-7.1.6/ext/date/lib/parse_date.re 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/date/lib/parse_date.re 2017-08-01 17:36:53.000000000 +0000 @@ -913,7 +913,7 @@ datenoday = monthtext ([ .\t-])* year4; datenodayrev = year4 ([ .\t-])* monthtext; datetextual = monthtext ([ .\t-])* day [,.stndrh\t ]+ year; -datenoyear = monthtext ([ .\t-])* day [,.stndrh\t ]*; +datenoyear = monthtext ([ .\t-])* day ([,.stndrh\t ]+|[\000]); datenoyearrev = day ([ .\t-])* monthtext; datenocolon = year4 monthlz daylz; diff -Nru php7.1-7.1.6/ext/date/php_date.c php7.1-7.1.8/ext/date/php_date.c --- php7.1-7.1.6/ext/date/php_date.c 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/date/php_date.c 2017-08-01 17:36:53.000000000 +0000 @@ -1998,7 +1998,7 @@ zval *prop; int retval = 0; - if (Z_TYPE_P(member) != IS_STRING) { + if (UNEXPECTED(Z_TYPE_P(member) != IS_STRING)) { ZVAL_COPY(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; @@ -2014,10 +2014,10 @@ } return retval; } - - prop = date_interval_read_property(object, member, type, cache_slot, &rv); - - if (prop != NULL) { + + prop = date_interval_read_property(object, member, BP_VAR_IS, cache_slot, &rv); + + if (prop != &EG(uninitialized_zval)) { if (type == 2) { retval = 1; } else if (type == 1) { @@ -2397,8 +2397,11 @@ php_interval_obj *new_obj = php_interval_obj_from_obj(date_object_new_interval_ex(old_obj->std.ce, 0)); zend_objects_clone_members(&new_obj->std, &old_obj->std); + new_obj->initialized = old_obj->initialized; + if (old_obj->diff) { + new_obj->diff = timelib_rel_time_clone(old_obj->diff); + } - /** FIX ME ADD CLONE STUFF **/ return &new_obj->std; } /* }}} */ @@ -2481,8 +2484,23 @@ php_period_obj *new_obj = php_period_obj_from_obj(date_object_new_period_ex(old_obj->std.ce, 0)); zend_objects_clone_members(&new_obj->std, &old_obj->std); - - /** FIX ME ADD CLONE STUFF **/ + new_obj->initialized = old_obj->initialized; + new_obj->recurrences = old_obj->recurrences; + new_obj->include_start_date = old_obj->include_start_date; + new_obj->start_ce = old_obj->start_ce; + + if (old_obj->start) { + new_obj->start = timelib_time_clone(old_obj->start); + } + if (old_obj->current) { + new_obj->current = timelib_time_clone(old_obj->current); + } + if (old_obj->end) { + new_obj->end = timelib_time_clone(old_obj->end); + } + if (old_obj->interval) { + new_obj->interval = timelib_rel_time_clone(old_obj->interval); + } return &new_obj->std; } /* }}} */ diff -Nru php7.1-7.1.6/ext/date/tests/bug73837.phpt php7.1-7.1.8/ext/date/tests/bug73837.phpt --- php7.1-7.1.6/ext/date/tests/bug73837.phpt 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/date/tests/bug73837.phpt 2017-08-01 17:36:53.000000000 +0000 @@ -12,7 +12,7 @@ } var_dump($n = count( $collect )); -echo ( $n > 800 ) ? "microseconds differ\n" : "microseconds do not differ enough ($n)\n"; +echo ( $n > 700 ) ? "microseconds differ\n" : "microseconds do not differ enough ($n)\n"; ?> --EXPECTF-- int(%d) diff -Nru php7.1-7.1.6/ext/date/tests/bug74639.phpt php7.1-7.1.8/ext/date/tests/bug74639.phpt --- php7.1-7.1.6/ext/date/tests/bug74639.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/date/tests/bug74639.phpt 2017-08-01 17:36:53.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +Bug #74639 Cloning DatePeriod leads to segfault +--FILE-- +diff($end); + +$period = new DatePeriod($start, $interval, $end); +$clonedPeriod = clone $period; +$clonedInterval = clone $interval; + +if ($period->getStartDate() != $clonedPeriod->getStartDate()) { + echo "failure\n"; +} + +if ($period->getEndDate() != $clonedPeriod->getEndDate()) { + echo "failure\n"; +} + +if ($period->getDateInterval() != $clonedPeriod->getDateInterval()) { + echo "failure\n"; +} + +if ($interval->format('Y-m-d H:i:s') != $clonedInterval->format('Y-m-d H:i:s')) { + echo "failure\n"; +} + +echo 'success'; +?> +--EXPECT-- +success diff -Nru php7.1-7.1.6/ext/date/tests/bug74652.phpt php7.1-7.1.8/ext/date/tests/bug74652.phpt --- php7.1-7.1.6/ext/date/tests/bug74652.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/date/tests/bug74652.phpt 2017-08-01 17:36:52.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +Test for bug #74652: Incomplete dates +--INI-- +date.timezone=UTC +--FILE-- +format( 'Y-m-d H:i:s' ), "\n"; +} +?> +--EXPECT-- +2017-03-25 10:52:09 +2017-03-25 10:52:00 +2017-03-25 10:00:00 +2017-03-25 00:00:00 +2017-03-01 00:00:00 +2017-02-11 00:00:00 +2017-02-12 00:00:00 diff -Nru php7.1-7.1.6/ext/date/tests/bug74852.phpt php7.1-7.1.8/ext/date/tests/bug74852.phpt --- php7.1-7.1.6/ext/date/tests/bug74852.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/date/tests/bug74852.phpt 2017-08-01 17:36:53.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +Bug #74852 property_exists returns true on unknown DateInterval property +--FILE-- +abcde)); +var_dump($interval->abcde); + +?> +--EXPECTF-- +bool(false) +bool(false) + +Notice: Undefined property: DateInterval::$abcde in %s on line %d +NULL diff -Nru php7.1-7.1.6/ext/date/tests/date-time-modify-times.phpt php7.1-7.1.8/ext/date/tests/date-time-modify-times.phpt --- php7.1-7.1.6/ext/date/tests/date-time-modify-times.phpt 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/date/tests/date-time-modify-times.phpt 2017-08-01 17:36:52.000000000 +0000 @@ -34,14 +34,14 @@ echo "\n"; ?> --EXPECT-- -Sat, 23 Oct 2010 00:00:00 +0000 +Fri, 15 Oct 2010 23:00:00 +0000 Wed, 15 Dec 2010 16:15:00 +0000 Mon, 20 Dec 2010 00:00:00 +0000 Mon, 20 Dec 2010 10:00:00 +0000 Tue, 21 Dec 2010 12:00:00 +0000 Mon, 03 Jan 2011 00:00:00 +0000 Mon, 03 Jan 2011 09:00:00 +0000 -Sat, 23 Oct 2010 00:00:00 +0100 +Fri, 15 Oct 2010 23:00:00 +0100 Sun, 28 Mar 2010 00:15:00 +0000 Sun, 28 Mar 2010 02:15:00 +0100 Sun, 28 Mar 2010 02:15:00 +0100 diff -Nru php7.1-7.1.6/ext/dom/node.c php7.1-7.1.8/ext/dom/node.c --- php7.1-7.1.6/ext/dom/node.c 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/dom/node.c 2017-08-01 17:36:54.000000000 +0000 @@ -337,6 +337,8 @@ case XML_ATTRIBUTE_NODE: if (nodep->children) { node_list_unlink(nodep->children); + php_libxml_node_free_list((xmlNodePtr) nodep->children); + nodep->children = NULL; } case XML_TEXT_NODE: case XML_COMMENT_NODE: @@ -854,6 +856,14 @@ return FAILURE; } + if (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE) { + if (nodep->children) { + node_list_unlink(nodep->children); + php_libxml_node_free_list((xmlNodePtr) nodep->children); + nodep->children = NULL; + } + } + str = zval_get_string(newval); /* we have to use xmlNodeAddContent() to get the same behavior as with xmlNewText() */ xmlNodeSetContent(nodep, (xmlChar *) ""); diff -Nru php7.1-7.1.6/ext/dom/tests/bug69373.phpt php7.1-7.1.8/ext/dom/tests/bug69373.phpt --- php7.1-7.1.6/ext/dom/tests/bug69373.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/dom/tests/bug69373.phpt 2017-08-01 17:36:54.000000000 +0000 @@ -0,0 +1,15 @@ +--TEST-- +Bug #69373 References to deleted XPath query results +--FILE-- +loadXML(""); + $xpath = new DOMXpath($doc); + $all = $xpath->query('//*'); + $doc->firstChild->nodeValue = ''; +} +echo 'DONE', PHP_EOL; +?> +--EXPECT-- +DONE diff -Nru php7.1-7.1.6/ext/gd/libgd/gd_gif_in.c php7.1-7.1.8/ext/gd/libgd/gd_gif_in.c --- php7.1-7.1.6/ext/gd/libgd/gd_gif_in.c 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/gd/libgd/gd_gif_in.c 2017-08-01 17:36:53.000000000 +0000 @@ -147,6 +147,9 @@ int haveGlobalColormap; gdImagePtr im = 0; + memset(ColorMap, 0, 3 * MAXCOLORMAPSIZE); + memset(localColorMap, 0, 3 * MAXCOLORMAPSIZE); + /*1.4//imageNumber = 1; */ if (! ReadOK(fd,buf,6)) { return 0; Binary files /tmp/tmpF6lqJH/ZLhZG9Uhj6/php7.1-7.1.6/ext/gd/tests/bug74435.gif and /tmp/tmpF6lqJH/Id1YO4MrVJ/php7.1-7.1.8/ext/gd/tests/bug74435.gif differ diff -Nru php7.1-7.1.6/ext/gd/tests/bug74435.phpt php7.1-7.1.8/ext/gd/tests/bug74435.phpt --- php7.1-7.1.6/ext/gd/tests/bug74435.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/gd/tests/bug74435.phpt 2017-08-01 17:36:53.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Bug #74435 (Buffer over-read into uninitialized memory) +--SKIPIF-- + +--FILE-- += 2) { + list($red, $green, $blue, $alpha) = array_values(imagecolorsforindex($im, $index)); + if ($red !== 0 || $green !== 0 || $blue !== 0 || $alpha !== 0) { + echo "unexpected color at ($i, $j)\n"; + } + } + } +} +?> +===DONE=== +--EXPECTF-- +resource(%d) of type (gd) +===DONE=== diff -Nru php7.1-7.1.6/ext/intl/collator/collator_class.c php7.1-7.1.8/ext/intl/collator/collator_class.c --- php7.1-7.1.6/ext/intl/collator/collator_class.c 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/intl/collator/collator_class.c 2017-08-01 17:36:52.000000000 +0000 @@ -112,7 +112,7 @@ PHP_NAMED_FE( getLocale, ZEND_FN( collator_get_locale ), collator_1_arg ) PHP_NAMED_FE( getErrorCode, ZEND_FN( collator_get_error_code ), collator_0_args ) PHP_NAMED_FE( getErrorMessage, ZEND_FN( collator_get_error_message ), collator_0_args ) - PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_2_args ) + PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_1_arg ) PHP_FE_END }; /* }}} */ diff -Nru php7.1-7.1.6/ext/intl/msgformat/msgformat_parse.c php7.1-7.1.8/ext/intl/msgformat/msgformat_parse.c --- php7.1-7.1.6/ext/intl/msgformat/msgformat_parse.c 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/intl/msgformat/msgformat_parse.c 2017-08-01 17:36:52.000000000 +0000 @@ -110,6 +110,7 @@ RETURN_FALSE; } + INTL_CHECK_LOCALE_LEN(slocale_len); memset(mfo, 0, sizeof(*mfo)); msgformat_data_init(&mfo->mf_data); diff -Nru php7.1-7.1.6/ext/intl/php_intl.c php7.1-7.1.8/ext/intl/php_intl.c --- php7.1-7.1.6/ext/intl/php_intl.c 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/intl/php_intl.c 2017-08-01 17:36:52.000000000 +0000 @@ -639,7 +639,7 @@ PHP_FE( collator_get_locale, collator_1_arg ) PHP_FE( collator_get_error_code, collator_0_args ) PHP_FE( collator_get_error_message, collator_0_args ) - PHP_FE( collator_get_sort_key, collator_2_args ) + PHP_FE( collator_get_sort_key, collator_1_arg ) /* formatter functions */ PHP_FE( numfmt_create, arginfo_numfmt_create ) diff -Nru php7.1-7.1.6/ext/intl/tests/bug74298.phpt php7.1-7.1.8/ext/intl/tests/bug74298.phpt --- php7.1-7.1.6/ext/intl/tests/bug74298.phpt 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/intl/tests/bug74298.phpt 2017-08-01 17:36:52.000000000 +0000 @@ -13,7 +13,7 @@ 'UTC', \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss.SSSSSS' -))->format(new \DateTime('2017-01-01 01:02:03.123456'))); +))->format(new \DateTime('2017-01-01 01:02:03.123456', new \DateTimeZone('UTC')))); var_dump(datefmt_create( 'en-US', @@ -22,7 +22,7 @@ 'UTC', \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss.SSSSSS' -)->format(new \DateTime('2017-01-01 01:02:03.123456'))); +)->format(new \DateTime('2017-01-01 01:02:03.123456', new \DateTimeZone('UTC')))); ?> --EXPECTF-- string(26) "2017-01-01T01:02:03.123456" diff -Nru php7.1-7.1.6/ext/intl/tests/bug74705.phpt php7.1-7.1.8/ext/intl/tests/bug74705.phpt --- php7.1-7.1.6/ext/intl/tests/bug74705.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/intl/tests/bug74705.phpt 2017-08-01 17:36:52.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Bug #74705 Wrong reflection on Collator::getSortKey +--SKIPIF-- + +--FILE-- +getNumberOfParameters()); +var_dump($rm->getNumberOfRequiredParameters()); + +$rf = new ReflectionFunction('collator_get_sort_key'); +var_dump($rf->getNumberOfParameters()); +var_dump($rf->getNumberOfRequiredParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +int(1) +int(2) +int(2) +===DONE=== diff -Nru php7.1-7.1.6/ext/json/json_scanner.c php7.1-7.1.8/ext/json/json_scanner.c --- php7.1-7.1.6/ext/json/json_scanner.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/json/json_scanner.c 2017-08-01 17:36:55.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 */ +/* Generated by re2c 0.16 */ /* +----------------------------------------------------------------------+ | PHP Version 7 | @@ -115,13 +115,13 @@ { static const unsigned char yybm[] = { 0, 0, 0, 0, 0, 0, 0, 0, - 0, 128, 0, 0, 0, 128, 0, 0, + 0, 64, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 128, 0, 0, 0, 0, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 0, 0, 0, 0, 0, 0, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -147,47 +147,46 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - yych = *YYCURSOR; if (yych <= ']') { if (yych <= '"') { if (yych <= '\f') { if (yych <= 0x08) { - if (yych >= 0x01) goto yy4; + if (yych >= 0x01) goto yy5; } else { - if (yych <= '\t') goto yy6; - if (yych <= '\n') goto yy8; - goto yy4; + if (yych <= '\t') goto yy7; + if (yych <= '\n') goto yy10; + goto yy5; } } else { if (yych <= 0x1F) { - if (yych <= '\r') goto yy9; - goto yy4; + if (yych <= '\r') goto yy11; + goto yy5; } else { - if (yych <= ' ') goto yy10; - if (yych <= '!') goto yy11; - goto yy13; + if (yych <= ' ') goto yy7; + if (yych <= '!') goto yy12; + goto yy14; } } } else { if (yych <= '0') { if (yych <= ',') { - if (yych <= '+') goto yy11; - goto yy15; + if (yych <= '+') goto yy12; + goto yy16; } else { - if (yych <= '-') goto yy17; - if (yych <= '/') goto yy11; - goto yy18; + if (yych <= '-') goto yy18; + if (yych <= '/') goto yy12; + goto yy19; } } else { if (yych <= 'Z') { - if (yych <= '9') goto yy20; - if (yych <= ':') goto yy21; - goto yy11; + if (yych <= '9') goto yy21; + if (yych <= ':') goto yy23; + goto yy12; } else { - if (yych <= '[') goto yy23; - if (yych <= '\\') goto yy11; - goto yy25; + if (yych <= '[') goto yy25; + if (yych <= '\\') goto yy12; + goto yy27; } } } @@ -195,41 +194,41 @@ if (yych <= '}') { if (yych <= 's') { if (yych <= 'f') { - if (yych <= 'e') goto yy11; - goto yy27; + if (yych <= 'e') goto yy12; + goto yy29; } else { - if (yych == 'n') goto yy28; - goto yy11; + if (yych == 'n') goto yy30; + goto yy12; } } else { if (yych <= 'z') { - if (yych <= 't') goto yy29; - goto yy11; + if (yych <= 't') goto yy31; + goto yy12; } else { - if (yych <= '{') goto yy30; - if (yych <= '|') goto yy11; - goto yy32; + if (yych <= '{') goto yy32; + if (yych <= '|') goto yy12; + goto yy34; } } } else { if (yych <= 0xEC) { if (yych <= 0xC1) { - if (yych <= 0x7F) goto yy11; - goto yy34; + if (yych <= 0x7F) goto yy12; + goto yy36; } else { - if (yych <= 0xDF) goto yy36; - if (yych <= 0xE0) goto yy37; - goto yy38; + if (yych <= 0xDF) goto yy38; + if (yych <= 0xE0) goto yy39; + goto yy40; } } else { if (yych <= 0xF0) { - if (yych <= 0xED) goto yy39; + if (yych <= 0xED) goto yy41; if (yych <= 0xEF) goto yy40; - goto yy41; + goto yy42; } else { - if (yych <= 0xF3) goto yy42; - if (yych <= 0xF4) goto yy43; - goto yy34; + if (yych <= 0xF3) goto yy43; + if (yych <= 0xF4) goto yy44; + goto yy36; } } } @@ -243,36 +242,36 @@ return PHP_JSON_T_ERROR; } } -yy4: +yy5: ++YYCURSOR; { s->errcode = PHP_JSON_ERROR_CTRL_CHAR; return PHP_JSON_T_ERROR; } -yy6: +yy7: ++YYCURSOR; yych = *YYCURSOR; - goto yy81; -yy7: - { goto std; } yy8: - yych = *++YYCURSOR; - goto yy7; + if (yybm[0+yych] & 64) { + goto yy7; + } yy9: - yych = *++YYCURSOR; - if (yych == '\n') goto yy82; - goto yy81; + { goto std; } yy10: yych = *++YYCURSOR; - goto yy81; + goto yy9; yy11: - ++YYCURSOR; + yych = *++YYCURSOR; + if (yych == '\n') goto yy10; + goto yy8; yy12: + ++YYCURSOR; +yy13: { s->errcode = PHP_JSON_ERROR_SYNTAX; return PHP_JSON_T_ERROR; } -yy13: +yy14: ++YYCURSOR; { s->str_start = s->cursor; @@ -280,25 +279,25 @@ PHP_JSON_CONDITION_SET(STR_P1); PHP_JSON_CONDITION_GOTO(STR_P1); } -yy15: +yy16: ++YYCURSOR; { return ','; } -yy17: - yych = *++YYCURSOR; - if (yych <= '/') goto yy12; - if (yych <= '0') goto yy79; - if (yych <= '9') goto yy69; - goto yy12; yy18: + yych = *++YYCURSOR; + if (yych <= '/') goto yy13; + if (yych <= '0') goto yy19; + if (yych <= '9') goto yy21; + goto yy13; +yy19: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '.') goto yy71; + if (yych == '.') goto yy45; } else { - if (yych <= 'E') goto yy72; - if (yych == 'e') goto yy72; + if (yych <= 'E') goto yy47; + if (yych == 'e') goto yy47; } -yy19: +yy20: { zend_bool bigint = 0, negative = s->token[0] == '-'; size_t digits = (size_t) (s->cursor - s->token - negative); @@ -323,305 +322,248 @@ return PHP_JSON_T_DOUBLE; } } -yy20: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - goto yy70; yy21: + yyaccept = 0; + YYMARKER = ++YYCURSOR; + yych = *YYCURSOR; + if (yybm[0+yych] & 128) { + goto yy21; + } + if (yych <= 'D') { + if (yych == '.') goto yy45; + goto yy20; + } else { + if (yych <= 'E') goto yy47; + if (yych == 'e') goto yy47; + goto yy20; + } +yy23: ++YYCURSOR; { return ':'; } -yy23: +yy25: ++YYCURSOR; { return '['; } -yy25: +yy27: ++YYCURSOR; { return ']'; } -yy27: +yy29: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'a') goto yy64; - goto yy12; -yy28: + if (yych == 'a') goto yy48; + goto yy13; +yy30: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'u') goto yy60; - goto yy12; -yy29: + if (yych == 'u') goto yy49; + goto yy13; +yy31: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'r') goto yy56; - goto yy12; -yy30: + if (yych == 'r') goto yy50; + goto yy13; +yy32: ++YYCURSOR; { return '{'; } -yy32: +yy34: ++YYCURSOR; { return '}'; } -yy34: +yy36: ++YYCURSOR; -yy35: +yy37: { s->errcode = PHP_JSON_ERROR_UTF8; return PHP_JSON_T_ERROR; } -yy36: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy35; - if (yych <= 0xBF) goto yy47; - goto yy35; -yy37: - yyaccept = 2; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x9F) goto yy35; - if (yych <= 0xBF) goto yy55; - goto yy35; yy38: - yyaccept = 2; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy35; - if (yych <= 0xBF) goto yy54; - goto yy35; + yych = *++YYCURSOR; + if (yych <= 0x7F) goto yy37; + if (yych <= 0xBF) goto yy12; + goto yy37; yy39: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy35; - if (yych <= 0x9F) goto yy53; - goto yy35; + if (yych <= 0x9F) goto yy37; + if (yych <= 0xBF) goto yy51; + goto yy37; yy40: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy35; - if (yych <= 0xBF) goto yy52; - goto yy35; + if (yych <= 0x7F) goto yy37; + if (yych <= 0xBF) goto yy51; + goto yy37; yy41: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x8F) goto yy35; - if (yych <= 0xBF) goto yy50; - goto yy35; + if (yych <= 0x7F) goto yy37; + if (yych <= 0x9F) goto yy51; + goto yy37; yy42: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy35; - if (yych <= 0xBF) goto yy48; - goto yy35; + if (yych <= 0x8F) goto yy37; + if (yych <= 0xBF) goto yy52; + goto yy37; yy43: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy35; - if (yych >= 0x90) goto yy35; - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy46; + if (yych <= 0x7F) goto yy37; + if (yych <= 0xBF) goto yy52; + goto yy37; +yy44: + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x7F) goto yy37; + if (yych <= 0x8F) goto yy52; + goto yy37; yy45: + yych = *++YYCURSOR; + if (yych <= '/') goto yy46; + if (yych <= '9') goto yy53; +yy46: YYCURSOR = YYMARKER; if (yyaccept <= 1) { - if (yyaccept <= 0) { - goto yy19; + if (yyaccept == 0) { + goto yy20; } else { - goto yy12; + goto yy13; } } else { - if (yyaccept <= 2) { - goto yy35; + if (yyaccept == 2) { + goto yy37; } else { - goto yy76; + goto yy55; } } -yy46: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych >= 0xC0) goto yy45; yy47: yych = *++YYCURSOR; - goto yy12; + if (yych <= ',') { + if (yych == '+') goto yy56; + goto yy46; + } else { + if (yych <= '-') goto yy56; + if (yych <= '/') goto yy46; + if (yych <= '9') goto yy57; + goto yy46; + } yy48: yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych >= 0xC0) goto yy45; + if (yych == 'l') goto yy59; + goto yy46; +yy49: yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; + if (yych == 'l') goto yy60; + goto yy46; yy50: yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych >= 0xC0) goto yy45; - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; + if (yych == 'u') goto yy61; + goto yy46; +yy51: + yych = *++YYCURSOR; + if (yych <= 0x7F) goto yy46; + if (yych <= 0xBF) goto yy12; + goto yy46; yy52: yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; + if (yych <= 0x7F) goto yy46; + if (yych <= 0xBF) goto yy51; + goto yy46; yy53: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; -yy54: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; + yyaccept = 3; + YYMARKER = ++YYCURSOR; + yych = *YYCURSOR; + if (yych <= 'D') { + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy53; + } else { + if (yych <= 'E') goto yy47; + if (yych == 'e') goto yy47; + } yy55: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy45; - if (yych <= 0xBF) goto yy47; - goto yy45; + { + ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL)); + return PHP_JSON_T_DOUBLE; + } yy56: yych = *++YYCURSOR; - if (yych != 'u') goto yy45; - yych = *++YYCURSOR; - if (yych != 'e') goto yy45; + if (yych <= '/') goto yy46; + if (yych >= ':') goto yy46; +yy57: ++YYCURSOR; - { - ZVAL_TRUE(&s->value); - return PHP_JSON_T_TRUE; - } -yy60: + yych = *YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy57; + goto yy55; +yy59: yych = *++YYCURSOR; - if (yych != 'l') goto yy45; + if (yych == 's') goto yy62; + goto yy46; +yy60: yych = *++YYCURSOR; - if (yych != 'l') goto yy45; + if (yych == 'l') goto yy63; + goto yy46; +yy61: + yych = *++YYCURSOR; + if (yych == 'e') goto yy65; + goto yy46; +yy62: + yych = *++YYCURSOR; + if (yych == 'e') goto yy67; + goto yy46; +yy63: ++YYCURSOR; { ZVAL_NULL(&s->value); return PHP_JSON_T_NUL; } -yy64: - yych = *++YYCURSOR; - if (yych != 'l') goto yy45; - yych = *++YYCURSOR; - if (yych != 's') goto yy45; - yych = *++YYCURSOR; - if (yych != 'e') goto yy45; +yy65: ++YYCURSOR; { - ZVAL_FALSE(&s->value); - return PHP_JSON_T_FALSE; + ZVAL_TRUE(&s->value); + return PHP_JSON_T_TRUE; } -yy69: - yyaccept = 0; - YYMARKER = ++YYCURSOR; - yych = *YYCURSOR; -yy70: - if (yybm[0+yych] & 64) { - goto yy69; - } - if (yych <= 'D') { - if (yych != '.') goto yy19; - } else { - if (yych <= 'E') goto yy72; - if (yych == 'e') goto yy72; - goto yy19; - } -yy71: - yych = *++YYCURSOR; - if (yych <= '/') goto yy45; - if (yych <= '9') goto yy77; - goto yy45; -yy72: - yych = *++YYCURSOR; - if (yych <= ',') { - if (yych != '+') goto yy45; - } else { - if (yych <= '-') goto yy73; - if (yych <= '/') goto yy45; - if (yych <= '9') goto yy74; - goto yy45; - } -yy73: - yych = *++YYCURSOR; - if (yych <= '/') goto yy45; - if (yych >= ':') goto yy45; -yy74: +yy67: ++YYCURSOR; - yych = *YYCURSOR; - if (yych <= '/') goto yy76; - if (yych <= '9') goto yy74; -yy76: { - ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL)); - return PHP_JSON_T_DOUBLE; + ZVAL_FALSE(&s->value); + return PHP_JSON_T_FALSE; } -yy77: - yyaccept = 3; - YYMARKER = ++YYCURSOR; - yych = *YYCURSOR; - if (yych <= 'D') { - if (yych <= '/') goto yy76; - if (yych <= '9') goto yy77; - goto yy76; - } else { - if (yych <= 'E') goto yy72; - if (yych == 'e') goto yy72; - goto yy76; - } -yy79: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { - if (yych == '.') goto yy71; - goto yy19; - } else { - if (yych <= 'E') goto yy72; - if (yych == 'e') goto yy72; - goto yy19; - } -yy80: - ++YYCURSOR; - yych = *YYCURSOR; -yy81: - if (yybm[0+yych] & 128) { - goto yy80; - } - goto yy7; -yy82: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy7; } /* *********************************** */ yyc_STR_P1: yych = *YYCURSOR; if (yych <= 0xDF) { if (yych <= '[') { - if (yych <= 0x1F) goto yy85; - if (yych == '"') goto yy89; - goto yy87; - } else { - if (yych <= '\\') goto yy91; - if (yych <= 0x7F) goto yy87; - if (yych <= 0xC1) goto yy93; - goto yy95; + if (yych <= 0x1F) goto yy71; + if (yych == '"') goto yy75; + goto yy73; + } else { + if (yych <= '\\') goto yy77; + if (yych <= 0x7F) goto yy73; + if (yych <= 0xC1) goto yy79; + goto yy81; } } else { if (yych <= 0xEF) { - if (yych <= 0xE0) goto yy96; - if (yych <= 0xEC) goto yy97; - if (yych <= 0xED) goto yy98; - goto yy99; - } else { - if (yych <= 0xF0) goto yy100; - if (yych <= 0xF3) goto yy101; - if (yych <= 0xF4) goto yy102; - goto yy93; + if (yych <= 0xE0) goto yy82; + if (yych == 0xED) goto yy84; + goto yy83; + } else { + if (yych <= 0xF0) goto yy85; + if (yych <= 0xF3) goto yy86; + if (yych <= 0xF4) goto yy87; + goto yy79; } } -yy85: +yy71: ++YYCURSOR; { s->errcode = PHP_JSON_ERROR_CTRL_CHAR; return PHP_JSON_T_ERROR; } -yy87: +yy73: ++YYCURSOR; -yy88: { PHP_JSON_CONDITION_GOTO(STR_P1); } -yy89: +yy75: ++YYCURSOR; { zend_string *str; @@ -645,416 +587,391 @@ return PHP_JSON_T_STRING; } } -yy91: +yy77: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'e') { if (yych <= '/') { - if (yych == '"') goto yy115; - if (yych >= '/') goto yy115; + if (yych == '"') goto yy88; + if (yych >= '/') goto yy88; } else { if (yych <= '\\') { - if (yych >= '\\') goto yy115; + if (yych >= '\\') goto yy88; } else { - if (yych == 'b') goto yy115; + if (yych == 'b') goto yy88; } } } else { if (yych <= 'q') { - if (yych <= 'f') goto yy115; - if (yych == 'n') goto yy115; + if (yych <= 'f') goto yy88; + if (yych == 'n') goto yy88; } else { if (yych <= 's') { - if (yych <= 'r') goto yy115; + if (yych <= 'r') goto yy88; } else { - if (yych <= 't') goto yy115; - if (yych <= 'u') goto yy117; + if (yych <= 't') goto yy88; + if (yych <= 'u') goto yy90; } } } -yy92: +yy78: { s->errcode = PHP_JSON_ERROR_SYNTAX; return PHP_JSON_T_ERROR; } -yy93: +yy79: ++YYCURSOR; -yy94: +yy80: { s->errcode = PHP_JSON_ERROR_UTF8; return PHP_JSON_T_ERROR; } -yy95: +yy81: yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy94; - if (yych <= 0xBF) goto yy106; - goto yy94; -yy96: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x9F) goto yy94; - if (yych <= 0xBF) goto yy114; - goto yy94; -yy97: + if (yych <= 0x7F) goto yy80; + if (yych <= 0xBF) goto yy73; + goto yy80; +yy82: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy94; - if (yych <= 0xBF) goto yy113; - goto yy94; -yy98: + if (yych <= 0x9F) goto yy80; + if (yych <= 0xBF) goto yy92; + goto yy80; +yy83: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy94; - if (yych <= 0x9F) goto yy112; - goto yy94; -yy99: + if (yych <= 0x7F) goto yy80; + if (yych <= 0xBF) goto yy92; + goto yy80; +yy84: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy94; - if (yych <= 0xBF) goto yy111; - goto yy94; -yy100: + if (yych <= 0x7F) goto yy80; + if (yych <= 0x9F) goto yy92; + goto yy80; +yy85: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x8F) goto yy94; - if (yych <= 0xBF) goto yy109; - goto yy94; -yy101: + if (yych <= 0x8F) goto yy80; + if (yych <= 0xBF) goto yy93; + goto yy80; +yy86: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy94; - if (yych <= 0xBF) goto yy107; - goto yy94; -yy102: + if (yych <= 0x7F) goto yy80; + if (yych <= 0xBF) goto yy93; + goto yy80; +yy87: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x7F) goto yy94; - if (yych >= 0x90) goto yy94; - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy105; -yy104: - YYCURSOR = YYMARKER; - if (yyaccept <= 1) { - if (yyaccept <= 0) { - goto yy92; - } else { - goto yy94; - } - } else { - goto yy126; - } -yy105: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych >= 0xC0) goto yy104; -yy106: - yych = *++YYCURSOR; - goto yy88; -yy107: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych >= 0xC0) goto yy104; - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy109: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych >= 0xC0) goto yy104; - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy111: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy112: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy113: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy114: - yych = *++YYCURSOR; - if (yych <= 0x7F) goto yy104; - if (yych <= 0xBF) goto yy106; - goto yy104; -yy115: + if (yych <= 0x7F) goto yy80; + if (yych <= 0x8F) goto yy93; + goto yy80; +yy88: ++YYCURSOR; { s->str_esc++; PHP_JSON_CONDITION_GOTO(STR_P1); } -yy117: +yy90: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= '9') { - if (yych <= '/') goto yy104; - if (yych >= '1') goto yy119; + if (yych <= '/') goto yy91; + if (yych <= '0') goto yy94; + goto yy95; } else { - if (yych <= '@') goto yy104; - if (yych <= 'C') goto yy119; - goto yy120; + if (yych <= '@') goto yy91; + if (yych <= 'C') goto yy95; + goto yy96; } } else { if (yych <= 'c') { - if (yych <= 'F') goto yy119; - if (yych <= '`') goto yy104; - goto yy119; - } else { - if (yych <= 'd') goto yy120; - if (yych <= 'f') goto yy119; - goto yy104; + if (yych <= 'F') goto yy95; + if (yych >= 'a') goto yy95; + } else { + if (yych <= 'd') goto yy96; + if (yych <= 'f') goto yy95; + } + } +yy91: + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept == 0) { + goto yy78; + } else { + goto yy80; } + } else { + goto yy114; } +yy92: + yych = *++YYCURSOR; + if (yych <= 0x7F) goto yy91; + if (yych <= 0xBF) goto yy73; + goto yy91; +yy93: + yych = *++YYCURSOR; + if (yych <= 0x7F) goto yy91; + if (yych <= 0xBF) goto yy92; + goto yy91; +yy94: yych = *++YYCURSOR; if (yych <= '9') { - if (yych <= '/') goto yy104; - if (yych <= '0') goto yy139; - if (yych <= '7') goto yy140; - goto yy121; + if (yych <= '/') goto yy91; + if (yych <= '0') goto yy97; + if (yych <= '7') goto yy98; + goto yy99; } else { if (yych <= 'F') { - if (yych <= '@') goto yy104; - goto yy121; + if (yych <= '@') goto yy91; + goto yy99; } else { - if (yych <= '`') goto yy104; - if (yych <= 'f') goto yy121; - goto yy104; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy99; + goto yy91; } } -yy119: +yy95: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych <= '9') goto yy121; - goto yy104; - } else { - if (yych <= 'F') goto yy121; - if (yych <= '`') goto yy104; - if (yych <= 'f') goto yy121; - goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy99; + goto yy91; + } else { + if (yych <= 'F') goto yy99; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy99; + goto yy91; } -yy120: +yy96: yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= '7') { - if (yych <= '/') goto yy104; + if (yych <= '/') goto yy91; + goto yy99; } else { - if (yych <= '9') goto yy122; - if (yych <= '@') goto yy104; - goto yy122; + if (yych <= '9') goto yy100; + if (yych <= '@') goto yy91; + goto yy100; } } else { if (yych <= '`') { - if (yych <= 'F') goto yy123; - goto yy104; + if (yych <= 'F') goto yy101; + goto yy91; } else { - if (yych <= 'b') goto yy122; - if (yych <= 'f') goto yy123; - goto yy104; + if (yych <= 'b') goto yy100; + if (yych <= 'f') goto yy101; + goto yy91; } } -yy121: +yy97: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych <= '9') goto yy136; - goto yy104; - } else { - if (yych <= 'F') goto yy136; - if (yych <= '`') goto yy104; - if (yych <= 'f') goto yy136; - goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '7') goto yy102; + if (yych <= '9') goto yy103; + goto yy91; + } else { + if (yych <= 'F') goto yy103; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy103; + goto yy91; } -yy122: +yy98: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych <= '9') goto yy127; - goto yy104; - } else { - if (yych <= 'F') goto yy127; - if (yych <= '`') goto yy104; - if (yych <= 'f') goto yy127; - goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy103; + goto yy91; + } else { + if (yych <= 'F') goto yy103; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy103; + goto yy91; } -yy123: +yy99: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy124; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy104; + goto yy91; + } else { + if (yych <= 'F') goto yy104; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy104; + goto yy91; } -yy124: +yy100: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy125; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy105; + goto yy91; + } else { + if (yych <= 'F') goto yy105; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy105; + goto yy91; } -yy125: - ++YYCURSOR; -yy126: - { - s->errcode = PHP_JSON_ERROR_UTF16; - return PHP_JSON_T_ERROR; - } -yy127: +yy101: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy128; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy106; + goto yy91; + } else { + if (yych <= 'F') goto yy106; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy106; + goto yy91; } -yy128: - yyaccept = 2; - yych = *(YYMARKER = ++YYCURSOR); - if (yych != '\\') goto yy126; - yych = *++YYCURSOR; - if (yych != 'u') goto yy104; +yy102: yych = *++YYCURSOR; - if (yych == 'D') goto yy131; - if (yych != 'd') goto yy104; -yy131: + if (yych <= '@') { + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy107; + goto yy91; + } else { + if (yych <= 'F') goto yy107; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy107; + goto yy91; + } +yy103: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy109; + goto yy91; + } else { + if (yych <= 'F') goto yy109; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy109; + goto yy91; + } +yy104: yych = *++YYCURSOR; - if (yych <= 'B') goto yy104; - if (yych <= 'F') goto yy132; - if (yych <= 'b') goto yy104; - if (yych >= 'g') goto yy104; -yy132: + if (yych <= '@') { + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy111; + goto yy91; + } else { + if (yych <= 'F') goto yy111; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy111; + goto yy91; + } +yy105: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy133; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy113; + goto yy91; + } else { + if (yych <= 'F') goto yy113; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy113; + goto yy91; } -yy133: +yy106: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy134; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= '/') goto yy91; + if (yych <= '9') goto yy115; + goto yy91; + } else { + if (yych <= 'F') goto yy115; + if (yych <= '`') goto yy91; + if (yych <= 'f') goto yy115; + goto yy91; } -yy134: +yy107: ++YYCURSOR; { - s->str_esc += 8; + s->str_esc += 5; PHP_JSON_CONDITION_GOTO(STR_P1); } -yy136: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy137; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; - } -yy137: +yy109: + ++YYCURSOR; + { + s->str_esc += 4; + PHP_JSON_CONDITION_GOTO(STR_P1); + } +yy111: ++YYCURSOR; { s->str_esc += 3; PHP_JSON_CONDITION_GOTO(STR_P1); } -yy139: +yy113: + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '\\') goto yy116; +yy114: + { + s->errcode = PHP_JSON_ERROR_UTF16; + return PHP_JSON_T_ERROR; + } +yy115: yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych <= '7') goto yy144; - if (yych <= '9') goto yy141; - goto yy104; - } else { - if (yych <= 'F') goto yy141; - if (yych <= '`') goto yy104; - if (yych <= 'f') goto yy141; - goto yy104; - } -yy140: + goto yy114; +yy116: yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; - } else { - if (yych <= 'F') goto yy141; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; - } -yy141: + if (yych != 'u') goto yy91; + yych = *++YYCURSOR; + if (yych == 'D') goto yy118; + if (yych != 'd') goto yy91; +yy118: + yych = *++YYCURSOR; + if (yych <= 'B') goto yy91; + if (yych <= 'F') goto yy119; + if (yych <= 'b') goto yy91; + if (yych >= 'g') goto yy91; +yy119: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; + if (yych <= '/') goto yy91; + if (yych >= ':') goto yy91; } else { - if (yych <= 'F') goto yy142; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= 'F') goto yy120; + if (yych <= '`') goto yy91; + if (yych >= 'g') goto yy91; } -yy142: - ++YYCURSOR; - { - s->str_esc += 4; - PHP_JSON_CONDITION_GOTO(STR_P1); - } -yy144: +yy120: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy104; - if (yych >= ':') goto yy104; + if (yych <= '/') goto yy91; + if (yych >= ':') goto yy91; } else { - if (yych <= 'F') goto yy145; - if (yych <= '`') goto yy104; - if (yych >= 'g') goto yy104; + if (yych <= 'F') goto yy121; + if (yych <= '`') goto yy91; + if (yych >= 'g') goto yy91; } -yy145: +yy121: ++YYCURSOR; { - s->str_esc += 5; + s->str_esc += 8; PHP_JSON_CONDITION_GOTO(STR_P1); } /* *********************************** */ yyc_STR_P2: yych = *YYCURSOR; - if (yych == '"') goto yy151; - if (yych == '\\') goto yy153; + if (yych == '"') goto yy127; + if (yych == '\\') goto yy129; ++YYCURSOR; { PHP_JSON_CONDITION_GOTO(STR_P2); } -yy151: +yy127: ++YYCURSOR; YYSETCONDITION(yycJS); { PHP_JSON_SCANNER_COPY_ESC(); return PHP_JSON_T_STRING; } -yy153: - yyaccept = 0; +yy129: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'u') goto yy155; -yy154: + if (yych == 'u') goto yy131; +yy130: { char esc; PHP_JSON_SCANNER_COPY_ESC(); @@ -1088,103 +1005,189 @@ s->str_start = s->cursor; PHP_JSON_CONDITION_GOTO(STR_P2); } -yy155: +yy131: yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= '9') { - if (yych <= '/') goto yy156; - if (yych <= '0') goto yy157; - goto yy158; - } else { - if (yych <= '@') goto yy156; - if (yych <= 'C') goto yy158; - goto yy159; + if (yych <= '/') goto yy132; + if (yych <= '0') goto yy133; + goto yy134; + } else { + if (yych <= '@') goto yy132; + if (yych <= 'C') goto yy134; + goto yy135; } } else { if (yych <= 'c') { - if (yych <= 'F') goto yy158; - if (yych >= 'a') goto yy158; + if (yych <= 'F') goto yy134; + if (yych >= 'a') goto yy134; } else { - if (yych <= 'd') goto yy159; - if (yych <= 'f') goto yy158; + if (yych <= 'd') goto yy135; + if (yych <= 'f') goto yy134; } } -yy156: +yy132: YYCURSOR = YYMARKER; - goto yy154; -yy157: + goto yy130; +yy133: yych = *++YYCURSOR; if (yych <= '9') { - if (yych <= '/') goto yy156; - if (yych <= '0') goto yy174; - if (yych <= '7') goto yy175; - goto yy161; + if (yych <= '/') goto yy132; + if (yych <= '0') goto yy136; + if (yych <= '7') goto yy137; + goto yy138; } else { if (yych <= 'F') { - if (yych <= '@') goto yy156; - goto yy161; + if (yych <= '@') goto yy132; + goto yy138; } else { - if (yych <= '`') goto yy156; - if (yych <= 'f') goto yy161; - goto yy156; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy138; + goto yy132; } } -yy158: +yy134: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych <= '9') goto yy161; - goto yy156; - } else { - if (yych <= 'F') goto yy161; - if (yych <= '`') goto yy156; - if (yych <= 'f') goto yy161; - goto yy156; + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy138; + goto yy132; + } else { + if (yych <= 'F') goto yy138; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy138; + goto yy132; + } +yy135: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy132; + if (yych <= '7') goto yy138; + if (yych <= '9') goto yy139; + goto yy132; + } else { + if (yych <= 'B') goto yy139; + if (yych <= '`') goto yy132; + if (yych <= 'b') goto yy139; + goto yy132; } -yy159: +yy136: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych <= '7') goto yy161; - if (yych >= ':') goto yy156; + if (yych <= '/') goto yy132; + if (yych <= '7') goto yy140; + if (yych <= '9') goto yy141; + goto yy132; } else { - if (yych <= 'B') goto yy160; - if (yych <= '`') goto yy156; - if (yych >= 'c') goto yy156; + if (yych <= 'F') goto yy141; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy141; + goto yy132; } -yy160: +yy137: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych <= '9') goto yy165; - goto yy156; + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy141; + goto yy132; } else { - if (yych <= 'F') goto yy165; - if (yych <= '`') goto yy156; - if (yych <= 'f') goto yy165; - goto yy156; + if (yych <= 'F') goto yy141; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy141; + goto yy132; } -yy161: +yy138: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy142; + goto yy132; } else { - if (yych <= 'F') goto yy162; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; + if (yych <= 'F') goto yy142; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy142; + goto yy132; } -yy162: +yy139: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; - } else { - if (yych <= 'F') goto yy163; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy143; + goto yy132; + } else { + if (yych <= 'F') goto yy143; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy143; + goto yy132; } -yy163: +yy140: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy144; + goto yy132; + } else { + if (yych <= 'F') goto yy144; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy144; + goto yy132; + } +yy141: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy146; + goto yy132; + } else { + if (yych <= 'F') goto yy146; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy146; + goto yy132; + } +yy142: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy148; + goto yy132; + } else { + if (yych <= 'F') goto yy148; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy148; + goto yy132; + } +yy143: + yych = *++YYCURSOR; + if (yych <= '@') { + if (yych <= '/') goto yy132; + if (yych <= '9') goto yy150; + goto yy132; + } else { + if (yych <= 'F') goto yy150; + if (yych <= '`') goto yy132; + if (yych <= 'f') goto yy150; + goto yy132; + } +yy144: + ++YYCURSOR; + { + int utf16 = php_json_ucs2_to_int(s, 2); + PHP_JSON_SCANNER_COPY_UTF(); + *(s->pstr++) = (char) utf16; + s->str_start = s->cursor; + PHP_JSON_CONDITION_GOTO(STR_P2); + } +yy146: + ++YYCURSOR; + { + int utf16 = php_json_ucs2_to_int(s, 3); + PHP_JSON_SCANNER_COPY_UTF(); + *(s->pstr++) = (char) (0xc0 | (utf16 >> 6)); + *(s->pstr++) = (char) (0x80 | (utf16 & 0x3f)); + s->str_start = s->cursor; + PHP_JSON_CONDITION_GOTO(STR_P2); + } +yy148: ++YYCURSOR; { int utf16 = php_json_ucs2_to_int(s, 4); @@ -1195,51 +1198,41 @@ s->str_start = s->cursor; PHP_JSON_CONDITION_GOTO(STR_P2); } -yy165: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; - } else { - if (yych <= 'F') goto yy166; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; - } -yy166: +yy150: yych = *++YYCURSOR; - if (yych != '\\') goto yy156; + if (yych != '\\') goto yy132; yych = *++YYCURSOR; - if (yych != 'u') goto yy156; + if (yych != 'u') goto yy132; yych = *++YYCURSOR; - if (yych == 'D') goto yy169; - if (yych != 'd') goto yy156; -yy169: + if (yych == 'D') goto yy153; + if (yych != 'd') goto yy132; +yy153: yych = *++YYCURSOR; - if (yych <= 'B') goto yy156; - if (yych <= 'F') goto yy170; - if (yych <= 'b') goto yy156; - if (yych >= 'g') goto yy156; -yy170: + if (yych <= 'B') goto yy132; + if (yych <= 'F') goto yy154; + if (yych <= 'b') goto yy132; + if (yych >= 'g') goto yy132; +yy154: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; + if (yych <= '/') goto yy132; + if (yych >= ':') goto yy132; } else { - if (yych <= 'F') goto yy171; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; + if (yych <= 'F') goto yy155; + if (yych <= '`') goto yy132; + if (yych >= 'g') goto yy132; } -yy171: +yy155: yych = *++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; + if (yych <= '/') goto yy132; + if (yych >= ':') goto yy132; } else { - if (yych <= 'F') goto yy172; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; + if (yych <= 'F') goto yy156; + if (yych <= '`') goto yy132; + if (yych >= 'g') goto yy132; } -yy172: +yy156: ++YYCURSOR; { int utf32, utf16_hi, utf16_lo; @@ -1254,68 +1247,6 @@ s->str_start = s->cursor; PHP_JSON_CONDITION_GOTO(STR_P2); } -yy174: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych <= '7') goto yy179; - if (yych <= '9') goto yy176; - goto yy156; - } else { - if (yych <= 'F') goto yy176; - if (yych <= '`') goto yy156; - if (yych <= 'f') goto yy176; - goto yy156; - } -yy175: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; - } else { - if (yych <= 'F') goto yy176; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; - } -yy176: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; - } else { - if (yych <= 'F') goto yy177; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; - } -yy177: - ++YYCURSOR; - { - int utf16 = php_json_ucs2_to_int(s, 3); - PHP_JSON_SCANNER_COPY_UTF(); - *(s->pstr++) = (char) (0xc0 | (utf16 >> 6)); - *(s->pstr++) = (char) (0x80 | (utf16 & 0x3f)); - s->str_start = s->cursor; - PHP_JSON_CONDITION_GOTO(STR_P2); - } -yy179: - yych = *++YYCURSOR; - if (yych <= '@') { - if (yych <= '/') goto yy156; - if (yych >= ':') goto yy156; - } else { - if (yych <= 'F') goto yy180; - if (yych <= '`') goto yy156; - if (yych >= 'g') goto yy156; - } -yy180: - ++YYCURSOR; - { - int utf16 = php_json_ucs2_to_int(s, 2); - PHP_JSON_SCANNER_COPY_UTF(); - *(s->pstr++) = (char) utf16; - s->str_start = s->cursor; - PHP_JSON_CONDITION_GOTO(STR_P2); - } } diff -Nru php7.1-7.1.6/ext/json/php_json_scanner_defs.h php7.1-7.1.8/ext/json/php_json_scanner_defs.h --- php7.1-7.1.6/ext/json/php_json_scanner_defs.h 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/json/php_json_scanner_defs.h 2017-08-01 17:36:55.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 */ +/* Generated by re2c 0.16 */ enum YYCONDTYPE { yycJS, diff -Nru php7.1-7.1.6/ext/json/README php7.1-7.1.8/ext/json/README --- php7.1-7.1.6/ext/json/README 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/json/README 2017-08-01 17:36:55.000000000 +0000 @@ -8,7 +8,7 @@ The parser is implemented using re2c and Bison. The used versions of both tools for generating files in the repository are following: -re2c 0.14.3 +re2c 0.16 Bison 3.0.4 It is recommended to do all contributions to the JSON extension diff -Nru php7.1-7.1.6/ext/ldap/ldap.c php7.1-7.1.8/ext/ldap/ldap.c --- php7.1-7.1.6/ext/ldap/ldap.c 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/ldap/ldap.c 2017-08-01 17:36:54.000000000 +0000 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: 1a2168f979730c42ec291285f5183076688f4509 $ */ +/* $Id: 0779387e5f88edc656159d12b9302a053e82cc79 $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -320,7 +320,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: 1a2168f979730c42ec291285f5183076688f4509 $"); + php_info_print_table_row(2, "RCS Version", "$Id: 0779387e5f88edc656159d12b9302a053e82cc79 $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, ZEND_LONG_FMT "/unlimited", LDAPG(num_links)); @@ -415,7 +415,7 @@ { int rc = LDAP_SUCCESS; char *url = host; - if (!ldap_is_ldap_url(url)) { + if (url && !ldap_is_ldap_url(url)) { int urllen = hostlen + sizeof( "ldap://:65535" ); if (port <= 0 || port > 65535) { @@ -425,7 +425,7 @@ } url = emalloc(urllen); - snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host ? host : "", port ); + snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host, port ); } #ifdef LDAP_API_FEATURE_X_OPENLDAP diff -Nru php7.1-7.1.6/ext/ldap/tests/ldap_connect_ldap_conf.phpt php7.1-7.1.8/ext/ldap/tests/ldap_connect_ldap_conf.phpt --- php7.1-7.1.6/ext/ldap/tests/ldap_connect_ldap_conf.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/ldap/tests/ldap_connect_ldap_conf.phpt 2017-08-01 17:36:54.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +ldap_connect() - Connection using default host from openldap's ldap.conf +--CREDITS-- +David Caldwell +--SKIPIF-- + openldap/i", ob_get_clean())) + die("skip not openldap"); +?> +--FILE-- + +===DONE=== +--EXPECTF-- +string(16) "example.com:3141" +===DONE=== diff -Nru php7.1-7.1.6/ext/libxml/libxml.c php7.1-7.1.8/ext/libxml/libxml.c --- php7.1-7.1.6/ext/libxml/libxml.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/libxml/libxml.c 2017-08-01 17:36:55.000000000 +0000 @@ -224,7 +224,7 @@ } } -static void php_libxml_node_free_list(xmlNodePtr node) +PHP_LIBXML_API void php_libxml_node_free_list(xmlNodePtr node) { xmlNodePtr curnode; diff -Nru php7.1-7.1.6/ext/libxml/php_libxml.h php7.1-7.1.8/ext/libxml/php_libxml.h --- php7.1-7.1.6/ext/libxml/php_libxml.h 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/libxml/php_libxml.h 2017-08-01 17:36:55.000000000 +0000 @@ -100,6 +100,7 @@ PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object); PHP_LIBXML_API zval *php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node export_function); /* When an explicit freeing of node and children is required */ +PHP_LIBXML_API void php_libxml_node_free_list(xmlNodePtr node); PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node); /* When object dtor is called as node may still be referenced */ PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object); diff -Nru php7.1-7.1.6/ext/mbstring/oniguruma/regexec.c php7.1-7.1.8/ext/mbstring/oniguruma/regexec.c --- php7.1-7.1.6/ext/mbstring/oniguruma/regexec.c 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/mbstring/oniguruma/regexec.c 2017-08-01 17:36:53.000000000 +0000 @@ -1425,14 +1425,9 @@ break; case OP_EXACT1: MOP_IN(OP_EXACT1); -#if 0 DATA_ENSURE(1); if (*p != *s) goto fail; p++; s++; -#endif - if (*p != *s++) goto fail; - DATA_ENSURE(0); - p++; MOP_OUT; break; @@ -3128,6 +3123,8 @@ } else { UChar *q = p + reg->dmin; + + if (q >= end) return 0; /* fail */ while (p < q) p += enclen(reg->enc, p); } } @@ -3208,7 +3205,13 @@ else { if (reg->dmax != ONIG_INFINITE_DISTANCE) { *low = p - reg->dmax; - if (*low > s) { + if (p - str < reg->dmax) { + *low = (UChar* )str; + if (low_prev) + *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low); + } + else { + if (*low > s) { *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s, *low, (const UChar** )low_prev); if (low_prev && IS_NULL(*low_prev)) @@ -3221,6 +3224,7 @@ (pprev ? pprev : str), *low); } } + } } /* no needs to adjust *high, *high is used as range check only */ *high = p - reg->dmin; diff -Nru php7.1-7.1.6/ext/mbstring/oniguruma/regparse.c php7.1-7.1.8/ext/mbstring/oniguruma/regparse.c --- php7.1-7.1.6/ext/mbstring/oniguruma/regparse.c 2017-06-07 08:09:34.000000000 +0000 +++ php7.1-7.1.8/ext/mbstring/oniguruma/regparse.c 2017-08-01 17:36:53.000000000 +0000 @@ -3064,7 +3064,7 @@ PUNFETCH; prev = p; num = scan_unsigned_octal_number(&p, end, 3, enc); - if (num < 0) return ONIGERR_TOO_BIG_NUMBER; + if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER; if (p == prev) { /* can't read nothing. */ num = 0; /* but, it's not error */ } @@ -3436,7 +3436,7 @@ if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) { prev = p; num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc); - if (num < 0) return ONIGERR_TOO_BIG_NUMBER; + if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER; if (p == prev) { /* can't read nothing. */ num = 0; /* but, it's not error */ } @@ -4068,7 +4068,9 @@ } } - *state = CCS_VALUE; + if (*state != CCS_START) + *state = CCS_VALUE; + *type = CCV_CLASS; return 0; } @@ -4084,7 +4086,11 @@ switch (*state) { case CCS_VALUE: if (*type == CCV_SB) + { + if (*vs > 0xff) + return ONIGERR_INVALID_CODE_POINT_VALUE; BITSET_SET_BIT(cc->bs, (int )(*vs)); + } else if (*type == CCV_CODE_POINT) { r = add_code_range(&(cc->mbuf), env, *vs, *vs); if (r < 0) return r; diff -Nru php7.1-7.1.6/ext/mysqli/tests/mysqli_reap_async_query.phpt php7.1-7.1.8/ext/mysqli/tests/mysqli_reap_async_query.phpt --- php7.1-7.1.6/ext/mysqli/tests/mysqli_reap_async_query.phpt 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/mysqli/tests/mysqli_reap_async_query.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -38,7 +38,7 @@ function poll_async($offset, $link, $links, $errors, $reject, $exp_ready, $use_oo_syntax) { - if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 1000))) + if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 2000))) printf("[%03d + 1] There should be %d links ready to read from, %d ready\n", $offset, $exp_ready, $tmp); diff -Nru php7.1-7.1.6/ext/oci8/config.m4 php7.1-7.1.8/ext/oci8/config.m4 --- php7.1-7.1.6/ext/oci8/config.m4 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/config.m4 2017-08-01 17:36:51.000000000 +0000 @@ -335,7 +335,7 @@ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) - PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c, $ext_shared) + PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c, $ext_shared) AC_DEFINE(HAVE_OCI8,1,[Defined to 1 if the PHP OCI8 extension for Oracle Database is configured]) PHP_SUBST_OLD(OCI8_SHARED_LIBADD) @@ -406,7 +406,7 @@ AC_DEFINE(HAVE_OCI_INSTANT_CLIENT,1,[Defined to 1 if OCI8 configuration located Oracle's Instant Client libraries]) - PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c, $ext_shared) + PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c, $ext_shared) AC_DEFINE(HAVE_OCI8,1,[Defined to 1 if the PHP OCI8 extension for Oracle Database is configured]) PHP_SUBST_OLD(OCI8_SHARED_LIBADD) diff -Nru php7.1-7.1.6/ext/oci8/config.w32 php7.1-7.1.8/ext/oci8/config.w32 --- php7.1-7.1.6/ext/oci8/config.w32 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/config.w32 2017-08-01 17:36:51.000000000 +0000 @@ -80,7 +80,7 @@ if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8_11G", oci8_11g_inc_paths) && CHECK_LIB("oci.lib", "oci8_11g", oci8_11g_lib_paths)) { - EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c', null, null, null, "ext\\oci8_11g") + EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c', null, null, null, "ext\\oci8_11g") AC_DEFINE('HAVE_OCI8', 1); AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); @@ -115,7 +115,7 @@ if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8_12C", oci8_12c_inc_paths) && CHECK_LIB("oci.lib", "oci8_12c", oci8_12c_lib_paths)) { - EXTENSION('oci8_12c', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c', null, null, null, "ext\\oci8_12c") + EXTENSION('oci8_12c', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c', null, null, null, "ext\\oci8_12c") AC_DEFINE('HAVE_OCI8', 1); AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); diff -Nru php7.1-7.1.6/ext/oci8/oci8.c php7.1-7.1.8/ext/oci8/oci8.c --- php7.1-7.1.6/ext/oci8/oci8.c 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/oci8.c 2017-08-01 17:36:51.000000000 +0000 @@ -504,6 +504,11 @@ ZEND_ARG_INFO(0, type_name) ZEND_ARG_INFO(0, schema_name) ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_register_taf_callback, 0, 0, 1) + ZEND_ARG_INFO(0, connection_resource) + ZEND_ARG_INFO(0, function_name) +ZEND_END_ARG_INFO() /* }}} */ /* {{{ LOB Method arginfo */ @@ -701,6 +706,7 @@ PHP_FUNCTION(oci_collection_size); PHP_FUNCTION(oci_collection_max); PHP_FUNCTION(oci_collection_trim); +PHP_FUNCTION(oci_register_taf_callback); /* }}} */ /* {{{ extension definition structures @@ -783,6 +789,7 @@ PHP_FE(oci_collection_max, arginfo_oci_collection_max) PHP_FE(oci_collection_trim, arginfo_oci_collection_trim) PHP_FE(oci_new_collection, arginfo_oci_new_collection) + PHP_FE(oci_register_taf_callback, arginfo_oci_register_taf_callback) PHP_FALIAS(oci_free_cursor, oci_free_statement, arginfo_oci_free_statement) PHP_FALIAS(ocifreecursor, oci_free_statement, arginfo_oci_free_statement) @@ -1129,6 +1136,20 @@ REGISTER_LONG_CONSTANT("OCI_TEMP_CLOB",OCI_TEMP_CLOB, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OCI_TEMP_BLOB",OCI_TEMP_BLOB, CONST_CS | CONST_PERSISTENT); +/* for Transparent Application Failover */ + REGISTER_LONG_CONSTANT("OCI_FO_END", OCI_FO_END, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_ABORT", OCI_FO_ABORT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_REAUTH", OCI_FO_REAUTH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_BEGIN", OCI_FO_BEGIN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_ERROR", OCI_FO_ERROR, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("OCI_FO_NONE", OCI_FO_NONE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_SESSION", OCI_FO_SESSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_SELECT", OCI_FO_SELECT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OCI_FO_TXNAL", OCI_FO_TXNAL, CONST_CS | CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("OCI_FO_RETRY", OCI_FO_RETRY, CONST_CS | CONST_PERSISTENT); + return SUCCESS; } @@ -1180,7 +1201,7 @@ php_info_print_table_row(2, "OCI8 DTrace Support", "disabled"); #endif php_info_print_table_row(2, "OCI8 Version", PHP_OCI8_VERSION); - php_info_print_table_row(2, "Revision", "$Id: 03698b2e9b50593039b7ca292b2e3cf9eaf064b9 $"); + php_info_print_table_row(2, "Revision", "$Id: 084655103ff7d247974759eca0e03332016c022c $"); #if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))) php_oci_client_get_version(ver, sizeof(ver)); @@ -1930,6 +1951,7 @@ connection = (php_oci_connection *) ecalloc(1, sizeof(php_oci_connection)); connection->hash_key = zend_string_dup(hashed_details.s, 0); connection->is_persistent = 0; + ZVAL_UNDEF(&connection->taf_callback); #ifdef HAVE_OCI8_DTRACE connection->client_id = NULL; #endif @@ -1944,6 +1966,7 @@ return NULL; } connection->is_persistent = 1; + ZVAL_UNDEF(&connection->taf_callback); #ifdef HAVE_OCI8_DTRACE connection->client_id = NULL; #endif @@ -1952,6 +1975,7 @@ connection = (php_oci_connection *) ecalloc(1, sizeof(php_oci_connection)); connection->hash_key = zend_string_dup(hashed_details.s, 0); connection->is_persistent = 0; + ZVAL_UNDEF(&connection->taf_callback); #ifdef HAVE_OCI8_DTRACE connection->client_id = NULL; #endif @@ -2225,6 +2249,15 @@ connection->client_id = NULL; } #endif /* HAVE_OCI8_DTRACE */ + + if (!Z_ISUNDEF(connection->taf_callback)) { + /* If it's NULL, then its value should be freed already */ + if (!Z_ISNULL(connection->taf_callback)) { + zval_ptr_dtor(&connection->taf_callback); + } + ZVAL_UNDEF(&connection->taf_callback); + } + pefree(connection, connection->is_persistent); connection = NULL; OCI_G(in_call) = in_call_save; @@ -2667,6 +2700,11 @@ if (le->type == le_pconnection) { connection = (php_oci_connection *)le->ptr; + /* Remove TAF callback function as it's bound to current request */ + if (connection->used_this_request && !Z_ISUNDEF(connection->taf_callback) && !Z_ISNULL(connection->taf_callback)) { + php_oci_disable_taf_callback(connection); + } + if (!connection->used_this_request && OCI_G(persistent_timeout) != -1) { #ifdef HAVE_OCI8_DTRACE if (DTRACE_OCI8_CONNECT_EXPIRY_ENABLED()) { diff -Nru php7.1-7.1.6/ext/oci8/oci8_failover.c php7.1-7.1.8/ext/oci8/oci8_failover.c --- php7.1-7.1.6/ext/oci8/oci8_failover.c 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/oci8_failover.c 2017-08-01 17:36:51.000000000 +0000 @@ -0,0 +1,162 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Stig Sæther Bakken | + | Thies C. Arntzen | + | | + | Collection support by Andy Sautins | + | Temporary LOB support by David Benson | + | ZTS per process OCIPLogon by Harald Radi | + | | + | Redesigned by: Antony Dovgal | + | Andi Gutmans | + | Wez Furlong | + +----------------------------------------------------------------------+ +*/ + + + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php.h" +#include "ext/standard/info.h" +#include "php_ini.h" + +#if HAVE_OCI8 + +#include "php_oci8.h" +#include "php_oci8_int.h" + +/* {{{ callback_fn() + OCI TAF callback function, calling userspace function */ +sb4 callback_fn(OCISvcCtx *svchp, OCIEnv *envhp, php_oci_connection *fo_ctx, ub4 fo_type, ub4 fo_event) +{ + /* Create zval */ + zval retval, params[3]; + + /* Default return value */ + sb4 returnValue = 0; + + /* Check if userspace callback function was disabled */ + if (Z_ISUNDEF(fo_ctx->taf_callback) || Z_ISNULL(fo_ctx->taf_callback)) { + return 0; + } + + /* Initialize zval */ + ZVAL_RES(¶ms[0], fo_ctx->id); + ZVAL_LONG(¶ms[1], fo_event); + ZVAL_LONG(¶ms[2], fo_type); + + /* Call user function (if possible) */ + if (call_user_function(EG(function_table), NULL, &fo_ctx->taf_callback, &retval, 3, params) == FAILURE) { + php_error_docref(NULL, E_WARNING, "Unable to call taf callback function, is it defined?"); + } + + /* Set return value */ + if (Z_TYPE(retval) == IS_LONG) { + returnValue = (sb4) Z_LVAL(retval); + } + + /* Setting params[0] to null so ressource isn't destroyed on zval_dtor */ + ZVAL_NULL(¶ms[0]); + + /* Cleanup */ + zval_dtor(&retval); + zval_dtor(¶ms[0]); + zval_dtor(¶ms[1]); + zval_dtor(¶ms[2]); + + return returnValue; +} +/* }}} */ + +/* {{{ php_oci_disable_taf_callback() + Disables the userspace callback function for Oracle TAF, + while keeping the OCI callback alive */ +int php_oci_disable_taf_callback(php_oci_connection *connection) +{ + return php_oci_register_taf_callback(connection, NULL); +} +/* }}} */ + +/* {{{ php_oci_register_taf_callback() + Register a callback function for Oracle TAF */ +int php_oci_register_taf_callback(php_oci_connection *connection, zval *callback) +{ + sword errstatus; + int registered = 0; + + /* temporary failover callback structure */ + OCIFocbkStruct failover; + + if (!callback) { + /* Disable callback */ + if (Z_ISUNDEF(connection->taf_callback) || Z_ISNULL(connection->taf_callback)) { + return 0; // Nothing to disable + } + + registered = 1; + zval_ptr_dtor(&connection->taf_callback); + ZVAL_NULL(&connection->taf_callback); + } else { + if (!Z_ISUNDEF(connection->taf_callback)) { + registered = 1; + if (!Z_ISNULL(connection->taf_callback)) { + zval_ptr_dtor(&connection->taf_callback); + ZVAL_NULL(&connection->taf_callback); + } + } + + /* Set userspace callback function */ + ZVAL_COPY(&connection->taf_callback, callback); + } + + /* OCI callback function already registered */ + if (registered) { + return 0; + } + + /* set context */ + failover.fo_ctx = connection; + + /* set callback function */ + failover.callback_function = &callback_fn; + + /* do the registration */ + PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, (connection->server, (ub4) OCI_HTYPE_SERVER, (void *) &failover, (ub4) 0, (ub4) OCI_ATTR_FOCBK, connection->err)); + + if (errstatus != OCI_SUCCESS) { + zval_ptr_dtor(&connection->taf_callback); + ZVAL_UNDEF(&connection->taf_callback); + connection->errcode = php_oci_error(connection->err, errstatus); + return 1; + } + + /* successful conclusion */ + return 0; +} +/* }}} */ + +#endif /* HAVE_OCI8 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff -Nru php7.1-7.1.6/ext/oci8/oci8_interface.c php7.1-7.1.8/ext/oci8/oci8_interface.c --- php7.1-7.1.6/ext/oci8/oci8_interface.c 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/oci8_interface.c 2017-08-01 17:36:51.000000000 +0000 @@ -42,6 +42,39 @@ #define OCI_STMT_CALL 10 #endif +/* {{{ proto bool oci_register_taf_callback( resource connection [, mixed callback] ) + Register a callback function for Oracle Transparent Application Failover (TAF) */ +PHP_FUNCTION(oci_register_taf_callback) +{ + zval *z_connection; + php_oci_connection *connection; + zval *callback; + zend_string *callback_name; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|z!", &z_connection, &callback) == FAILURE) { + return; + } + + if (callback) { + if (!zend_is_callable(callback, 0, &callback_name)) { + php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(callback_name)); + zend_string_release(callback_name); + RETURN_FALSE; + } + + zend_string_release(callback_name); + } + + PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection); + + if (php_oci_register_taf_callback(connection, callback) == 0) { + RETURN_TRUE; + } else { + RETURN_FALSE; + } +} +/* }}} */ + /* {{{ proto bool oci_define_by_name(resource stmt, string name, mixed &var [, int type]) Define a PHP variable to an Oracle column by name */ /* if you want to define a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE defining!!! */ @@ -1553,6 +1586,9 @@ internally Zend engine increments RefCount value by 1 */ zend_list_close(connection->id); + + /* Disable Oracle TAF */ + php_oci_disable_taf_callback(connection); /* ZVAL_NULL(z_connection); */ diff -Nru php7.1-7.1.6/ext/oci8/oci8_statement.c php7.1-7.1.8/ext/oci8/oci8_statement.c --- php7.1-7.1.6/ext/oci8/oci8_statement.c 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/oci8_statement.c 2017-08-01 17:36:51.000000000 +0000 @@ -38,6 +38,13 @@ #include "php_oci8.h" #include "php_oci8_int.h" +#if defined(OCI_MAJOR_VERSION) && (OCI_MAJOR_VERSION > 10) && \ + (defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)) +typedef ub8 oci_phpsized_int; +#else +typedef ub4 oci_phpsized_int; +#endif + /* {{{ php_oci_statement_create() Create statemend handle and allocate necessary resources */ php_oci_statement *php_oci_statement_create(php_oci_connection *connection, char *query, int query_len) @@ -997,10 +1004,10 @@ for (i = 0; i < (int) bind->array.current_length; i++) { if ((i < (int) bind->array.old_length) && (entry = zend_hash_get_current_data(hash)) != NULL) { zval_dtor(entry); - ZVAL_LONG(entry, ((ub4 *)(bind->array.elements))[i]); + ZVAL_LONG(entry, ((oci_phpsized_int *)(bind->array.elements))[i]); zend_hash_move_forward(hash); } else { - add_next_index_long(bind->zval, ((ub4 *)(bind->array.elements))[i]); + add_next_index_long(bind->zval, ((oci_phpsized_int *)(bind->array.elements))[i]); } } break; @@ -1153,14 +1160,8 @@ return 1; } convert_to_long(param); -#if defined(OCI_MAJOR_VERSION) && (OCI_MAJOR_VERSION > 10) && \ - (defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)) - bind_data = (ub8 *)&Z_LVAL_P(param); - value_sz = sizeof(ub8); -#else - bind_data = (ub4 *)&Z_LVAL_P(param); - value_sz = sizeof(ub4); -#endif + bind_data = (oci_phpsized_int *)&Z_LVAL_P(param); + value_sz = sizeof(oci_phpsized_int); mode = OCI_DEFAULT; break; @@ -1783,10 +1784,10 @@ bind = emalloc(sizeof(php_oci_bind)); ZVAL_UNDEF(&bind->parameter); - bind->array.elements = (ub4 *)safe_emalloc(max_table_length, sizeof(ub4), 0); + bind->array.elements = (oci_phpsized_int *)safe_emalloc(max_table_length, sizeof(oci_phpsized_int), 0); bind->array.current_length = zend_hash_num_elements(Z_ARRVAL_P(var)); bind->array.old_length = bind->array.current_length; - bind->array.max_length = sizeof(ub4); + bind->array.max_length = sizeof(oci_phpsized_int); bind->array.element_lengths = safe_emalloc(max_table_length, sizeof(ub2), 0); memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2)); bind->array.indicators = NULL; @@ -1794,14 +1795,14 @@ zend_hash_internal_pointer_reset(hash); for (i = 0; i < max_table_length; i++) { if (i < bind->array.current_length) { - bind->array.element_lengths[i] = sizeof(ub4); + bind->array.element_lengths[i] = sizeof(oci_phpsized_int); } if ((i < bind->array.current_length) && (entry = zend_hash_get_current_data(hash)) != NULL) { convert_to_long_ex(entry); - ((ub4 *)bind->array.elements)[i] = (ub4) Z_LVAL_P(entry); + ((oci_phpsized_int *)bind->array.elements)[i] = (oci_phpsized_int) Z_LVAL_P(entry); zend_hash_move_forward(hash); } else { - ((ub4 *)bind->array.elements)[i] = 0; + ((oci_phpsized_int *)bind->array.elements)[i] = 0; } } zend_hash_internal_pointer_reset(hash); diff -Nru php7.1-7.1.6/ext/oci8/package.xml php7.1-7.1.8/ext/oci8/package.xml --- php7.1-7.1.6/ext/oci8/package.xml 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/package.xml 2017-08-01 17:36:51.000000000 +0000 @@ -46,12 +46,12 @@ no - 2017-04-12 + 2017-06-20 - 2.1.4 - 2.1.4 + 2.1.6 + 2.1.6 stable @@ -60,7 +60,7 @@ PHP This version is for PHP 7 only. -Fixed uninitialized data causing random crash +Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge) @@ -164,6 +164,7 @@ + @@ -447,6 +448,7 @@ + @@ -468,6 +470,38 @@ + + + 2.1.5 + 2.1.5 + + + stable + stable + + PHP + +This version is for PHP 7 only. +Added TAF callback support (PR #2459, KoenigsKind) + + + + + + 2.1.4 + 2.1.4 + + + stable + stable + + PHP + +This version is for PHP 7 only. +Fixed uninitialized data causing random crash + + + 2.1.3 diff -Nru php7.1-7.1.6/ext/oci8/php_oci8.h php7.1-7.1.8/ext/oci8/php_oci8.h --- php7.1-7.1.6/ext/oci8/php_oci8.h 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/php_oci8.h 2017-08-01 17:36:51.000000000 +0000 @@ -43,11 +43,12 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "2.1.4" +#define PHP_OCI8_VERSION "2.1.6" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry #define phpext_oci8_11g_ptr &oci8_module_entry +#define phpext_oci8_12c_ptr &oci8_module_entry PHP_MINIT_FUNCTION(oci); diff -Nru php7.1-7.1.6/ext/oci8/php_oci8_int.h php7.1-7.1.8/ext/oci8/php_oci8_int.h --- php7.1-7.1.6/ext/oci8/php_oci8_int.h 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/php_oci8_int.h 2017-08-01 17:36:51.000000000 +0000 @@ -164,6 +164,8 @@ #ifdef HAVE_OCI8_DTRACE char *client_id; /* The oci_set_client_identifier() value */ #endif + + zval taf_callback; /* The Oracle TAF callback function in the userspace */ } php_oci_connection; /* }}} */ @@ -531,6 +533,13 @@ char *edition; ZEND_END_MODULE_GLOBALS(oci) /* }}} */ +/* {{{ transparent failover related prototypes */ + +int php_oci_register_taf_callback(php_oci_connection *connection, zval *callback); +int php_oci_disable_taf_callback(php_oci_connection *connection); + +/* }}} */ + #ifdef ZTS #define OCI_G(v) TSRMG(oci_globals_id, zend_oci_globals *, v) #else diff -Nru php7.1-7.1.6/ext/oci8/tests/bug70700.phpt php7.1-7.1.8/ext/oci8/tests/bug70700.phpt --- php7.1-7.1.6/ext/oci8/tests/bug70700.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/bug70700.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -0,0 +1,183 @@ +--TEST-- +Tests for LOBs with multibyte strings, reading them out in chunks +(Doc Bug #70700) +--CREDITS-- +Chuck Burgess +ashnazg@php.net +--SKIPIF-- + true, 'timesten' => false); // test runs on these DBs +require(dirname(__FILE__).'/skipif.inc'); +?> +--ENV-- +NLS_LANG=.AL32UTF8 +--FILE-- +writeTemporary($string1, OCI_TEMP_CLOB); +oci_execute($insert); +$desc->save($string1); +oci_commit($c); +$desc->close(); +oci_bind_by_name($select, ':id', $id); +oci_execute($select); +$row = oci_fetch_array($select, OCI_ASSOC); +$lob = $row['DATA']; +$fh = fopen('php://temp', 'rw'); +while (! $lob->eof()) { + $data = $lob->read(8192); // read($characters), not read($bytes) + fwrite($fh, $data, strlen($data)); // fwrite(a, b, $bytes) +} +$lob->free(); +rewind($fh); +$stream1a = stream_get_contents($fh); +fclose($fh); +$start1a = mb_substr($stream1a, 0, 10); +$ending1a = mb_substr($stream1a, -10); +echo 'size of string1 is ', strlen($string1), ' bytes, ', mb_strlen($string1), ' chars.', PHP_EOL; +echo 'size of stream1a is ', strlen($stream1a), ' bytes, ', mb_strlen($stream1a), ' chars.', PHP_EOL; +echo 'beg of stream1a is ', $start1a, PHP_EOL; +echo 'end of stream1a is ', $ending1a, PHP_EOL; + + +echo PHP_EOL, 'Test 2: £', PHP_EOL; +$string2 = 'abc' . str_repeat('£', 4094) . 'xyz'; +$id = 2; +$desc = oci_new_descriptor($c, OCI_D_LOB); +oci_bind_by_name($insert, ':data', $desc, -1, OCI_B_CLOB); +$desc->writeTemporary($string2, OCI_TEMP_CLOB); +oci_execute($insert); +$desc->save($string2); +oci_commit($c); +$desc->close(); +oci_bind_by_name($select, ':id', $id); +oci_execute($select); +$row = oci_fetch_array($select, OCI_ASSOC); +$lob = $row['DATA']; +$fh = fopen('php://temp', 'rw'); +while (! $lob->eof()) { + $data = $lob->read(8192); // read($characters), not read($bytes) + fwrite($fh, $data, strlen($data)); // fwrite(a, b, $bytes) +} +$lob->free(); +rewind($fh); +$stream2a = stream_get_contents($fh); +fclose($fh); +$start2a = mb_substr($stream2a, 0, 10); +$ending2a = mb_substr($stream2a, -10); +echo 'size of string2 is ', strlen($string2), ' bytes, ', mb_strlen($string2), ' chars.', PHP_EOL; +echo 'size of stream2a is ', strlen($stream2a), ' bytes, ', mb_strlen($stream2a), ' chars.', PHP_EOL; +echo 'beg of stream2a is ', $start2a, PHP_EOL; +echo 'end of stream2a is ', $ending2a, PHP_EOL; + + +echo PHP_EOL, 'Test 3: Җ', PHP_EOL; +$string3 = 'abc' . str_repeat('Җ', 4094) . 'xyz'; +$id = 3; +$desc = oci_new_descriptor($c, OCI_D_LOB); +oci_bind_by_name($insert, ':data', $desc, -1, OCI_B_CLOB); +$desc->writeTemporary($string3, OCI_TEMP_CLOB); +oci_execute($insert); +$desc->save($string3); +oci_commit($c); +$desc->close(); +oci_bind_by_name($select, ':id', $id); +oci_execute($select); +$row = oci_fetch_array($select, OCI_ASSOC); +$lob = $row['DATA']; +$fh = fopen('php://temp', 'rw'); +while (! $lob->eof()) { + $data = $lob->read(8192); // read($characters), not read($bytes) + fwrite($fh, $data, strlen($data)); // fwrite(a, b, $bytes) +} +$lob->free(); +rewind($fh); +$stream3a = stream_get_contents($fh); +fclose($fh); +$start3a = mb_substr($stream3a, 0, 10); +$ending3a = mb_substr($stream3a, -10); +echo 'size of string3 is ', strlen($string3), ' bytes, ', mb_strlen($string3), ' chars.', PHP_EOL; +echo 'size of stream3a is ', strlen($stream3a), ' bytes, ', mb_strlen($stream3a), ' chars.', PHP_EOL; +echo 'beg of stream3a is ', $start3a, PHP_EOL; +echo 'end of stream3a is ', $ending3a, PHP_EOL; + + +echo PHP_EOL, 'Test 4: の', PHP_EOL; +$string4 = 'abc' . str_repeat('の', 2729) . 'xyz'; +$id = 4; +$desc = oci_new_descriptor($c, OCI_D_LOB); +oci_bind_by_name($insert, ':data', $desc, -1, OCI_B_CLOB); +$desc->writeTemporary($string4, OCI_TEMP_CLOB); +oci_execute($insert); +$desc->save($string4); +oci_commit($c); +$desc->close(); +oci_bind_by_name($select, ':id', $id); +oci_execute($select); +$row = oci_fetch_array($select, OCI_ASSOC); +$lob = $row['DATA']; +$fh = fopen('php://temp', 'rw'); +while (! $lob->eof()) { + $data = $lob->read(8192); // read($characters), not read($bytes) + fwrite($fh, $data, strlen($data)); // fwrite(a, b, $bytes) +} +$lob->free(); +rewind($fh); +$stream4a = stream_get_contents($fh); +fclose($fh); +$start4a = mb_substr($stream4a, 0, 10); +$ending4a = mb_substr($stream4a, -10); +echo 'size of string4 is ', strlen($string4), ' bytes, ', mb_strlen($string4), ' chars.', PHP_EOL; +echo 'size of stream4a is ', strlen($stream4a), ' bytes, ', mb_strlen($stream4a), ' chars.', PHP_EOL; +echo 'beg of stream4a is ', $start4a, PHP_EOL; +echo 'end of stream4a is ', $ending4a, PHP_EOL; + +--EXPECTF-- + +Test 1: j +size of string1 is 1000006 bytes, 1000006 chars. +size of stream1a is 1000006 bytes, 1000006 chars. +beg of stream1a is abcjjjjjjj +end of stream1a is jjjjjjjxyz + +Test 2: £ +size of string2 is 8194 bytes, 4100 chars. +size of stream2a is 8194 bytes, 4100 chars. +beg of stream2a is abc£££££££ +end of stream2a is £££££££xyz + +Test 3: Җ +size of string3 is 8194 bytes, 4100 chars. +size of stream3a is 8194 bytes, 4100 chars. +beg of stream3a is abcҖҖҖҖҖҖҖ +end of stream3a is ҖҖҖҖҖҖҖxyz + +Test 4: の +size of string4 is 8193 bytes, 2735 chars. +size of stream4a is 8193 bytes, 2735 chars. +beg of stream4a is abcののののののの +end of stream4a is のののののののxyz + diff -Nru php7.1-7.1.6/ext/oci8/tests/bug74625.phpt php7.1-7.1.8/ext/oci8/tests/bug74625.phpt --- php7.1-7.1.6/ext/oci8/tests/bug74625.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/bug74625.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -0,0 +1,65 @@ +--TEST-- +Bug #74625 (Integer overflow in oci_bind_array_by_name) +--SKIPIF-- + +--FILE-- + +===DONE=== + +--EXPECTF-- +array(5) { + [0]=> + int(-2) + [1]=> + int(-4) + [2]=> + int(-6) + [3]=> + int(-8) + [4]=> + int(-10) +} +===DONE=== diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try1.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try1.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try1.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try1.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try2.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try2.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try2.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try2.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try3.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try3.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try3.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try3.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try4.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try4.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try4.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try4.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try5.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try5.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try5.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try5.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/connect_scope_try6.phpt php7.1-7.1.8/ext/oci8/tests/connect_scope_try6.phpt --- php7.1-7.1.6/ext/oci8/tests/connect_scope_try6.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/connect_scope_try6.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -29,7 +29,7 @@ // Make errors throw exceptions -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { diff -Nru php7.1-7.1.6/ext/oci8/tests/driver_name.phpt php7.1-7.1.8/ext/oci8/tests/driver_name.phpt --- php7.1-7.1.6/ext/oci8/tests/driver_name.phpt 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/oci8/tests/driver_name.phpt 2017-08-01 17:36:51.000000000 +0000 @@ -57,11 +57,11 @@ ?> --EXPECT-- **Test 1.1 - Default values for the attribute ************** -The value of DRIVER_NAME is PHP OCI8 : 2.1.3 +The value of DRIVER_NAME is PHP OCI8 : 2.1.6 ***Test 1.2 - Get the values from different connections ************** Testing with oci_pconnect() -The value of DRIVER_NAME is PHP OCI8 : 2.1.3 +The value of DRIVER_NAME is PHP OCI8 : 2.1.6 Testing with oci_new_connect() -The value of DRIVER_NAME is PHP OCI8 : 2.1.3 +The value of DRIVER_NAME is PHP OCI8 : 2.1.6 Done diff -Nru php7.1-7.1.6/ext/opcache/Optimizer/optimize_temp_vars_5.c php7.1-7.1.8/ext/opcache/Optimizer/optimize_temp_vars_5.c --- php7.1-7.1.6/ext/opcache/Optimizer/optimize_temp_vars_5.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/Optimizer/optimize_temp_vars_5.c 2017-08-01 17:36:55.000000000 +0000 @@ -109,6 +109,7 @@ */ if ((op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) && (opline->opcode == ZEND_RETURN || + opline->opcode == ZEND_GENERATOR_RETURN || opline->opcode == ZEND_RETURN_BY_REF || opline->opcode == ZEND_FREE || opline->opcode == ZEND_FE_FREE)) { diff -Nru php7.1-7.1.6/ext/opcache/Optimizer/pass1_5.c php7.1-7.1.8/ext/opcache/Optimizer/pass1_5.c --- php7.1-7.1.6/ext/opcache/Optimizer/pass1_5.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/Optimizer/pass1_5.c 2017-08-01 17:36:55.000000000 +0000 @@ -493,7 +493,7 @@ zend_string_release(lc_name); if (!m) { - if (!PG(enable_dl)) { + if (PG(enable_dl)) { break; } else { ZVAL_FALSE(&t); diff -Nru php7.1-7.1.6/ext/opcache/Optimizer/zend_inference.c php7.1-7.1.8/ext/opcache/Optimizer/zend_inference.c --- php7.1-7.1.6/ext/opcache/Optimizer/zend_inference.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/Optimizer/zend_inference.c 2017-08-01 17:36:55.000000000 +0000 @@ -1753,8 +1753,11 @@ } \ } \ if (ssa_var_info[__var].type != __type) { \ - check_type_narrowing(op_array, ssa, worklist, \ - __var, ssa_var_info[__var].type, __type); \ + if (ssa_var_info[__var].type & ~__type) { \ + handle_type_narrowing(op_array, ssa, worklist, \ + __var, ssa_var_info[__var].type, __type); \ + return FAILURE; \ + } \ ssa_var_info[__var].type = __type; \ add_usages(op_array, ssa, worklist, __var); \ } \ @@ -1891,15 +1894,17 @@ #endif } -static void check_type_narrowing(const zend_op_array *op_array, zend_ssa *ssa, zend_bitset worklist, int var, uint32_t old_type, uint32_t new_type) +static void handle_type_narrowing(const zend_op_array *op_array, zend_ssa *ssa, zend_bitset worklist, int var, uint32_t old_type, uint32_t new_type) { - /* if new_type set resets some bits from old_type set - * We have completely recalculate types of some dependent SSA variables - * (this may occurs mainly because of incremental inter-precudure - * type inference) - */ - if (old_type & ~new_type) { - ZEND_ASSERT(0); /* Currently this should never happen */ + if (1) { + /* Right now, this is always a bug */ + zend_error(E_WARNING, "Narrowing occurred during type inference. Please file a bug report on bugs.php.net"); + } else { + /* if new_type set resets some bits from old_type set + * We have completely recalculate types of some dependent SSA variables + * (this may occurs mainly because of incremental inter-precudure + * type inference) + */ reset_dependent_vars(op_array, ssa, worklist, var); } } @@ -2125,7 +2130,7 @@ return tmp; } -static void zend_update_type_info(const zend_op_array *op_array, +static int zend_update_type_info(const zend_op_array *op_array, zend_ssa *ssa, const zend_script *script, zend_bitset worklist, @@ -3104,7 +3109,7 @@ opline->opcode == ZEND_FETCH_OBJ_RW || opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG) { if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) { - if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_NULL)) { + if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN; } @@ -3219,6 +3224,8 @@ } break; } + + return SUCCESS; } static uint32_t get_class_entry_rank(zend_class_entry *ce) { @@ -3329,7 +3336,9 @@ } } else if (ssa_vars[j].definition >= 0) { i = ssa_vars[j].definition; - zend_update_type_info(op_array, ssa, script, worklist, i); + if (zend_update_type_info(op_array, ssa, script, worklist, i) == FAILURE) { + return FAILURE; + } } } WHILE_WORKLIST_END(); return SUCCESS; diff -Nru php7.1-7.1.6/ext/opcache/shared_alloc_win32.c php7.1-7.1.8/ext/opcache/shared_alloc_win32.c --- php7.1-7.1.6/ext/opcache/shared_alloc_win32.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/shared_alloc_win32.c 2017-08-01 17:36:55.000000000 +0000 @@ -221,8 +221,10 @@ */ #if defined(_WIN64) void *vista_mapping_base_set[] = { (void *) 0x0000100000000000, (void *) 0x0000200000000000, (void *) 0x0000300000000000, (void *) 0x0000700000000000, 0 }; + DWORD size_high = (requested_size >> 32), size_low = (requested_size & 0xffffffff); #else void *vista_mapping_base_set[] = { (void *) 0x20000000, (void *) 0x21000000, (void *) 0x30000000, (void *) 0x31000000, (void *) 0x50000000, 0 }; + DWORD size_high = 0, size_low = requested_size; #endif void **wanted_mapping_base = default_mapping_base_set; @@ -275,7 +277,7 @@ shared_segment = (zend_shared_segment *)((char *)(*shared_segments_p) + sizeof(void *)); (*shared_segments_p)[0] = shared_segment; - memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, requested_size, + memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, size_high, size_low, create_name_with_username(ACCEL_FILEMAP_NAME)); if (memfile == NULL) { err = GetLastError(); diff -Nru php7.1-7.1.6/ext/opcache/tests/bug74623.phpt php7.1-7.1.8/ext/opcache/tests/bug74623.phpt --- php7.1-7.1.6/ext/opcache/tests/bug74623.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/tests/bug74623.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Bug #74623: Infinite loop in type inference when using HTMLPurifier +--FILE-- +name === 'string') { + $current_item = $item; + } else { + $current_item->a[] = ''; + } + } + +} + +?> +===DONE=== +--EXPECT-- +===DONE=== diff -Nru php7.1-7.1.6/ext/opcache/tests/bug74663.phpt php7.1-7.1.8/ext/opcache/tests/bug74663.phpt --- php7.1-7.1.6/ext/opcache/tests/bug74663.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/opcache/tests/bug74663.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #74663 (Segfault with opcache.memory_protect and validate_timestamp) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.enable_file_override=1 +opcache.validate_timestamps=1 +opcache.revalidate_freq=0 +opcache.protect_memory=1 +--SKIPIF-- + +--FILE-- + +--CLEAN-- +spkac->challenge)); + RETVAL_STRING((const char *)ASN1_STRING_get0_data(spki->spkac->challenge)); goto cleanup; cleanup: @@ -2237,19 +2251,19 @@ case GEN_EMAIL: BIO_puts(bio, "email:"); as = name->d.rfc822Name; - BIO_write(bio, ASN1_STRING_data(as), + BIO_write(bio, ASN1_STRING_get0_data(as), ASN1_STRING_length(as)); break; case GEN_DNS: BIO_puts(bio, "DNS:"); as = name->d.dNSName; - BIO_write(bio, ASN1_STRING_data(as), + BIO_write(bio, ASN1_STRING_get0_data(as), ASN1_STRING_length(as)); break; case GEN_URI: BIO_puts(bio, "URI:"); as = name->d.uniformResourceIdentifier; - BIO_write(bio, ASN1_STRING_data(as), + BIO_write(bio, ASN1_STRING_get0_data(as), ASN1_STRING_length(as)); break; default: @@ -2990,6 +3004,7 @@ } X509_free(aCA); + BIO_free(bio_out); } sk_X509_free(ca); @@ -5000,7 +5015,7 @@ goto clean_exit; } - in = BIO_new_file(filename, (flags & PKCS7_BINARY) ? "rb" : "r"); + in = BIO_new_file(filename, PHP_OPENSSL_BIO_MODE_R(flags)); if (in == NULL) { php_openssl_store_errors(); goto clean_exit; @@ -5112,7 +5127,7 @@ return; } - infile = BIO_new_file(infilename, "r"); + infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); goto clean_exit; @@ -5270,7 +5285,7 @@ goto clean_exit; } - infile = BIO_new_file(infilename, "r"); + infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); php_error_docref(NULL, E_WARNING, "error opening input file %s!", infilename); @@ -5373,12 +5388,12 @@ goto clean_exit; } - in = BIO_new_file(infilename, "r"); + in = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY)); if (in == NULL) { php_openssl_store_errors(); goto clean_exit; } - out = BIO_new_file(outfilename, "w"); + out = BIO_new_file(outfilename, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY)); if (out == NULL) { php_openssl_store_errors(); goto clean_exit; @@ -5912,7 +5927,7 @@ buf = emalloc(data_len + EVP_CIPHER_CTX_block_size(ctx)); EVP_CIPHER_CTX_cleanup(ctx); - if (!EVP_SealInit(ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) || + if (EVP_SealInit(ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) <= 0 || !EVP_SealUpdate(ctx, buf, &len1, (unsigned char *)data, (int)data_len) || !EVP_SealFinal(ctx, buf + len1, &len2)) { efree(buf); @@ -6266,20 +6281,7 @@ int key_len, password_len; size_t max_iv_len; - /* check and set key */ - password_len = (int) *ppassword_len; - key_len = EVP_CIPHER_key_length(cipher_type); - if (key_len > password_len) { - key = emalloc(key_len); - memset(key, 0, key_len); - memcpy(key, *ppassword, password_len); - *ppassword = (char *) key; - *ppassword_len = key_len; - *free_password = 1; - } else { - key = (unsigned char*)*ppassword; - *free_password = 0; - } + *free_password = 0; max_iv_len = EVP_CIPHER_iv_length(cipher_type); if (enc && *piv_len == 0 && max_iv_len > 0 && !mode->is_aead) { @@ -6304,9 +6306,28 @@ return FAILURE; } } - if (password_len > key_len && !EVP_CIPHER_CTX_set_key_length(cipher_ctx, password_len)) { - php_openssl_store_errors(); + /* check and set key */ + password_len = (int) *ppassword_len; + key_len = EVP_CIPHER_key_length(cipher_type); + if (key_len > password_len) { + if ((OPENSSL_DONT_ZERO_PAD_KEY & options) && !EVP_CIPHER_CTX_set_key_length(cipher_ctx, password_len)) { + php_openssl_store_errors(); + php_error_docref(NULL, E_WARNING, "Key length cannot be set for the cipher method"); + return FAILURE; + } + key = emalloc(key_len); + memset(key, 0, key_len); + memcpy(key, *ppassword, password_len); + *ppassword = (char *) key; + *ppassword_len = key_len; + *free_password = 1; + } else { + if (password_len > key_len && !EVP_CIPHER_CTX_set_key_length(cipher_ctx, password_len)) { + php_openssl_store_errors(); + } + key = (unsigned char*)*ppassword; } + if (!EVP_CipherInit_ex(cipher_ctx, NULL, NULL, key, (unsigned char *)*piv, enc)) { php_openssl_store_errors(); return FAILURE; diff -Nru php7.1-7.1.6/ext/openssl/php_openssl.h php7.1-7.1.8/ext/openssl/php_openssl.h --- php7.1-7.1.6/ext/openssl/php_openssl.h 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/php_openssl.h 2017-08-01 17:36:55.000000000 +0000 @@ -31,6 +31,7 @@ #define OPENSSL_RAW_DATA 1 #define OPENSSL_ZERO_PADDING 2 +#define OPENSSL_DONT_ZERO_PAD_KEY 4 #define OPENSSL_ERROR_X509_PRIVATE_KEY_VALUES_MISMATCH 0x0B080074 diff -Nru php7.1-7.1.6/ext/openssl/tests/74651.pem php7.1-7.1.8/ext/openssl/tests/74651.pem --- php7.1-7.1.6/ext/openssl/tests/74651.pem 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/74651.pem 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEoDCCBAmgAwIBAgIBJzANBgkqhkiG9w0BAQQFADCBkDELMAkGA1UEFhMCUk8x +EDAOBgNVBAgTB1JvbWFuaWExEDAOBgNVBAcTB0NyYWlvdmExDzANBgNVBAoTBlNl +cmdpdTETMBEGA1UECxMKU2VyZ2l1IFNSTDESMBAGA1UEAxMJU2VyZ2l1IENBMSMw +IQYJKoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTAeFw0wNDA1MTQxMzM0 +NTZaFw0wNTA1MTQxMzM0NTZaMIGaMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9t +YW5pYTEQMA4GA1UEBxMHQ3JhaW92YTETMBEGA1UEChMKU2VyZ2l1IFNSTDETMBEG +A1UECxMKU2VyZ2l1IFNSTDEYMBYGA1UEAxMPU2VyZ2l1IHBlcnNvbmFsMSMwIQYJ +KoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTCBnzANBgkqhkiG9w0BAQEF +AAOBjQAwgYkCgYEApNj7XXz8T8FcLIWpBniPYom3QcT6T7u0xRPHqtqzj5oboBYp +DJe5d354/y0gJTpiLt8+fTrPgWXnbHm3pOHgXzTcX6Arani0GDU0/xDi4VkCRGcS +YqX2sJpcDzAbmK9UDMt3xf/O1B8AJan3RfO0Bm3ozTEPziLMkmsiYr5b/L4CAwEA +AaOCAfwwggH4MAkGA1UdEwQCMAAwNQYJYIZIAYb4QgENBCgWJkZvciBHcmlkIHVz +ZSBvbmx5OyByZXF1ZXN0IHRhZyB1c2VyVGFnMBEGCWCGSAGG+EIBAQQEAwIF4DA/ +BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vbW9iaWxlLmJsdWUtc29mdHdhcmUucm86 +OTAvY2EvY3JsLnNodG1sMDUGCWCGSAGG+EIBCAQoFiZodHRwOi8vbW9iaWxlLmJs +dWUtc29mdHdhcmUucm86OTAvcHViLzAhBgNVHREEGjAYgRZzZXJnaXVAYmx1ZXNv +ZnR3YXJlLnJvMB0GA1UdDgQWBBSwp//5QRXeIzm93TEPl6CyonTg/DCBpwYDVR0j +BIGfMIGcoYGWpIGTMIGQMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9tYW5pYTEQ +MA4GA1UEBxMHQ3JhaW92YTEPMA0GA1UEChMGU2VyZ2l1MRMwEQYDVQQLEwpTZXJn +aXUgU1JMMRIwEAYDVQQDEwlTZXJnaXUgQ0ExIzAhBgkqhkiG9w0BCQEWFG5fc2Vy +Z2l1QGhvdG1haWwuY29tggEAMAsGA1UdDwQEAwIE8DAjBglghkgBhvhCAQIEFhYU +aHR0cDovLzYyLjIzMS45OC41Mi8wCwYDKgMEBAQ+52I0MA0GCSqGSIb3DQEBBAUA +A4GBAIBIOJ+iiLyQfNJEY+IMefayQea0nmuXYY+F+L1DFjSC7xChytgYoPNnKkhh +3dWPtxbswiqKYUnGi6y3Hi4UhDsOaDW29t2S305hSc2qgjOiNtRYQIVYQ8EHG1k7 +Fl63S7uCOhnVJt+4MnUK1N6/pwgsp+Z2GvEsDG1qCKnvNpf6 +-----END CERTIFICATE----- diff -Nru php7.1-7.1.6/ext/openssl/tests/bug71917.phpt php7.1-7.1.8/ext/openssl/tests/bug71917.phpt --- php7.1-7.1.6/ext/openssl/tests/bug71917.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug71917.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #71917: openssl_open() returns junk on envelope < 16 bytes +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(true) +bool(true) diff -Nru php7.1-7.1.6/ext/openssl/tests/bug72362.phpt php7.1-7.1.8/ext/openssl/tests/bug72362.phpt --- php7.1-7.1.6/ext/openssl/tests/bug72362.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug72362.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,14 @@ +--TEST-- +Bug #72362: OpenSSL Blowfish encryption is incorrect for short keys +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(48) "e3214d1b16e574828c8a3e222202dde81afd1ad2cb165ab3" +string(48) "e3214d1b16e574828c8a3e222202dde81afd1ad2cb165ab3" diff -Nru php7.1-7.1.6/ext/openssl/tests/bug74651.phpt php7.1-7.1.8/ext/openssl/tests/bug74651.phpt --- php7.1-7.1.6/ext/openssl/tests/bug74651.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug74651.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +Bug #74651: negative-size-param (-1) in memcpy in zif_openssl_seal() +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +resource(%d) of type (OpenSSL key) +bool(false) \ No newline at end of file diff -Nru php7.1-7.1.6/ext/openssl/tests/bug74720_0.phpt php7.1-7.1.8/ext/openssl/tests/bug74720_0.phpt --- php7.1-7.1.6/ext/openssl/tests/bug74720_0.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug74720_0.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,93 @@ +--TEST-- +Bug #74720 pkcs7_en/decrypt does not work if \x1a is used in content, variant 0 +--SKIPIF-- + +--FILE-- + +==DONE== +--EXPECTF-- +bool(true) +bool(true) +int(39) +int(39) +int(39) +==DONE== + diff -Nru php7.1-7.1.6/ext/openssl/tests/bug74720_1.phpt php7.1-7.1.8/ext/openssl/tests/bug74720_1.phpt --- php7.1-7.1.6/ext/openssl/tests/bug74720_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug74720_1.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,88 @@ +--TEST-- +Bug #74720 pkcs7_en/decrypt does not work if \x1a is used in content, variant 1 +--SKIPIF-- + +--FILE-- + +==DONE== +--EXPECTF-- +bool(true) +==DONE== + diff -Nru php7.1-7.1.6/ext/openssl/tests/bug74798.phpt php7.1-7.1.8/ext/openssl/tests/bug74798.phpt --- php7.1-7.1.6/ext/openssl/tests/bug74798.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/bug74798.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,96 @@ +--TEST-- +Bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECTF-- +bool(true) +bool(true) +int(40) +int(40) +int(40) +string(80) "537472696e672077697468200a2077696c6c20656e6420696e206f6e652062797465206d6f72652e" +string(80) "537472696e672077697468200a2077696c6c20656e6420696e206f6e652062797465206d6f72652e" +===DONE=== diff -Nru php7.1-7.1.6/ext/openssl/tests/openssl_decrypt_basic.phpt php7.1-7.1.8/ext/openssl/tests/openssl_decrypt_basic.phpt --- php7.1-7.1.6/ext/openssl/tests/openssl_decrypt_basic.phpt 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/openssl_decrypt_basic.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -24,8 +24,13 @@ $encrypted = openssl_encrypt($padded_data, $method, $password, OPENSSL_RAW_DATA|OPENSSL_ZERO_PADDING, $iv); $output = openssl_decrypt($encrypted, $method, $password, OPENSSL_RAW_DATA|OPENSSL_ZERO_PADDING, $iv); var_dump(rtrim($output)); +// if we want to prefer variable length cipher setting +$encrypted = openssl_encrypt($data, "bf-ecb", $password, OPENSSL_DONT_ZERO_PAD_KEY); +$output = openssl_decrypt($encrypted, "bf-ecb", $password, OPENSSL_DONT_ZERO_PAD_KEY); +var_dump($output); ?> --EXPECT-- string(45) "openssl_encrypt() and openssl_decrypt() tests" string(45) "openssl_encrypt() and openssl_decrypt() tests" string(45) "openssl_encrypt() and openssl_decrypt() tests" +string(45) "openssl_encrypt() and openssl_decrypt() tests" diff -Nru php7.1-7.1.6/ext/openssl/tests/openssl_encrypt_error.phpt php7.1-7.1.8/ext/openssl/tests/openssl_encrypt_error.phpt --- php7.1-7.1.6/ext/openssl/tests/openssl_encrypt_error.phpt 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/openssl_encrypt_error.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -23,6 +23,9 @@ // invalid using of an authentication tag var_dump(openssl_encrypt($data, $method, $password, 0, $iv, $wrong)); + +// padding of the key is disabled +var_dump(openssl_encrypt($data, $method, $password, OPENSSL_DONT_ZERO_PAD_KEY, $iv)); ?> --EXPECTF-- Warning: openssl_encrypt(): Unknown cipher algorithm in %s on line %d @@ -48,3 +51,6 @@ Warning: openssl_encrypt(): The authenticated tag cannot be provided for cipher that doesn not support AEAD in %s on line %d string(44) "iPR4HulskuaP5Z6me5uImk6BqVyJG73+63tkPauVZYk=" + +Warning: openssl_encrypt(): Key length cannot be set for the cipher method in %s on line %d +bool(false) diff -Nru php7.1-7.1.6/ext/openssl/tests/openssl_pkcs12_export_basic.phpt php7.1-7.1.8/ext/openssl/tests/openssl_pkcs12_export_basic.phpt --- php7.1-7.1.6/ext/openssl/tests/openssl_pkcs12_export_basic.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/openssl_pkcs12_export_basic.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,55 @@ +--TEST-- +openssl_pkcs12_export() tests +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) + +Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +bool(false) + +Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +bool(false) + +Warning: openssl_pkcs12_export(): supplied resource is not a valid OpenSSL X.509 resource in %s on line %d + +Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +bool(false) diff -Nru php7.1-7.1.6/ext/openssl/tests/openssl_pkcs12_read_basic.phpt php7.1-7.1.8/ext/openssl/tests/openssl_pkcs12_read_basic.phpt --- php7.1-7.1.6/ext/openssl/tests/openssl_pkcs12_read_basic.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/openssl_pkcs12_read_basic.phpt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,97 @@ +--TEST-- +openssl_pkcs12_read() tests +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +bool(false) +bool(false) +bool(true) +array(3) { + ["cert"]=> + string(1111) "-----BEGIN CERTIFICATE----- +MIIDBjCCAe4CCQCS/had1ITjDjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJQ +TDETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMB4XDTE1MDYxMDEyMTI0N1oXDTE2MDYwOTEyMTI0N1owRTELMAkG +A1UEBhMCUEwxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 +IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ANHezJRoGMbtDzSwK7WPjj6+Yhj7R9LJyR7TjvxH01ZVA+sHUrcXs3tDXukIQcH1 +rsnf4WbBjGbQT3jlLicsll6gMOh8oaCdi6863cvw1XRUmlezpAs2V5MZOEgqkWvU +8OKHqjt8o9F07T3n1zYeeBjiUsr6UWqX4+Znwa25UF0Fid1R4BxmX7GpDoq0Weuv +WQafbM9qs3Qrd7Ea3Lqz9pGkWx1BmOv49XorAhQadxCT32GbUdhmhxgrDgyW5M7m +ECz4DngZLhZvLC8Juf/Q6R5SjhN5/f/TBq//QpKaCjBAamhZDJtWMv80IDKJO7Ir +fQMnPEq4vCnHdKvG7N6ZjsECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHGAiEN0o +tOV2tbK0Qm/mWlyuRKtxqnP3y/2Q5SFMmRpkOS54hFf9YBNgT7nWK3Z5fPKor17t +rGthXPSZU8hxY5iHFhELurp23qGmJftdcYL2mF7IyoGOiZ1Q6Vt9LnRTDtgrHh/f +ZziI+gaPpmAfEAh48xQrlviHqaR9F63d0UN1jz9cF1kIj1H21PAGC0tmAIxxb4ee +hjipL+JLH0iRoBQE83cF2BOQCfRzRekotnDYon6v7mTjYu7kwl8paRIEMNrBckby +IL3CJOZFesaFO7suK7oP7r6BIATpVcg2m0V25mVMVFRm4F/JOvSkB381Pte/Ccuv +dxPWHER13ptIVg== +-----END CERTIFICATE----- +" + ["pkey"]=> + string(1704) "-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDR3syUaBjG7Q80 +sCu1j44+vmIY+0fSycke0478R9NWVQPrB1K3F7N7Q17pCEHB9a7J3+FmwYxm0E94 +5S4nLJZeoDDofKGgnYuvOt3L8NV0VJpXs6QLNleTGThIKpFr1PDih6o7fKPRdO09 +59c2HngY4lLK+lFql+PmZ8GtuVBdBYndUeAcZl+xqQ6KtFnrr1kGn2zParN0K3ex +Gty6s/aRpFsdQZjr+PV6KwIUGncQk99hm1HYZocYKw4MluTO5hAs+A54GS4Wbywv +Cbn/0OkeUo4Tef3/0wav/0KSmgowQGpoWQybVjL/NCAyiTuyK30DJzxKuLwpx3Sr +xuzemY7BAgMBAAECggEAbdYX5ZexV/LbYWzOA2CVRnsnJgHkrgnTS2HXVGtWzLkD +qu6TOKWb1mgE9RrQJ22oQ5j7A2dKTsi4vwHarL/mFrHpxtLrV/78CwJY8BIj9JUO +jdXDheaz4JVzYjl9EB1K0JPF4QozRjzWqO58MKOzoPpZ8EcfcxT5Pi2RLJVu3K9F +DR3cUNa9h66j84sDJARzvxMfgR6VysHVmgN1aR78Mye0dFVYeL7wCXFJmJXa2AYw +TQR5FcFRa0h8t40EOJdXcoWu63TUd7rvDgebHXJeKax8W2pGREHZfeEw5wWpFQn8 +j+znHSISe7eM9wmW6ombab7zcJsCwXDYgtY/6OqRAQKBgQD6EXKfXThfnrN/od/Y +jF8mfKdJ67HOc8WVPlB9vHDsduFyX914ahJHeCVQPkV1a2nx+bv3PviWbrKreEKl +b7aAAAkbxy/FakcxE9b0wC5JsSW9vByXQiRn0iDqDNl9iwzX/LLW6wE7SruCPp+z +mzCHArp6mvJmRFooR8e3IXiA0QKBgQDW2T9xXFBpumSOBRpn7Zc9SGiQ9qZTSKKb +boVSDd2cod8O1aow3gnQNid/cNnt54Yh5Z3KlYfFWkmrV+0/yQZ/SThZ1uHAaZVy +OnWKVELykpYLnKGlHoQpOYTCfdYan5xOfkw55em3TTeQq5tETYWMdhS/9VVxeLKZ +k2xr+CYq8QKBgQCzHpJK4nwByexq7KkpNIrnR3yQb1oiNjz9xO/k0HjWd+TOhypd +GSVUuhOIIcKg87qkj6x60kk/f7VNK0wZsiY4E05y7j8imhi6Z6qeD5ZYRKJzAG4+ +TitDjnjzDRcwXMxrXV9AoH52WPZsuays+ulMm8C1F42vgSBPH/NHEpt9MQKBgAIw +nLDvG/K376Zy7t34Uf5R6p7vpKpcpyumaL15XrTmAXwJOX7eBIOWybhG0jHWlktq +J72U4JlmXjHc55Iq3mIVwPlJc2uep+NOLTyHt1b5n4Xmxs8EDJzO9Ud2OOR0lAdI +ykYczdEMfHCBD0gW8jGIUpXSTlilvkxKcGR5VwpBAoGBANdAWL3lw+/P43x6Rxth +GJN8QzWe5vRFJYS5mkeaa/6jrFrsvk176WudopropFGtRc/44E1IDOZULJM80Xgb +JTeUFyb+ZjYLrHUp1yir+oZIm5DBZDZjYclanrPPHg9YwVxcHtunPeCFy3iC+W+F +MK80GEnRQIkB7uZVk+r0HusK +-----END PRIVATE KEY----- +" + ["extracerts"]=> + array(1) { + [0]=> + string(1111) "-----BEGIN CERTIFICATE----- +MIIDBjCCAe4CCQDaL5/+UVeXuTANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB +VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMB4XDTE1MDYxMDEyNDAwNVoXDTE2MDYwOTEyNDAwNVowRTELMAkG +A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 +IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AL/IF7bW0vpEg5A054SDqTi5pkSeie6nyIT77qCAVI5PMlhNjxuqDIlLpCWonvKb +LMRtp7t24BsQBRgQgps8mtfRr0gV1qq9HMfDj2bZdGcTShZN/M/BFATwxaNRTHl9 +ey8zxGcLd4aFFBlVhXHYdBXg/PG/oxJMAFuMwa+KxSP6Mqp1FlOZtvUUieQcToMf +Mh8Lbr4g/yHFj5lgWIJ2fmJjHJZ4wf9QBeGUrVqqxzSDEL9f0PGy+grqSHoIzLr3 ++uhvhoI85nCyZs9+lrELuQKqbiZ8Q6Vmj6JGt3miNBFVTbBpP9GK8sVuVQwgqd8p +C3e8hHqv7vwF+s0zjiZ+rCcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdpTtiyDJ +0wLB18iunXCMUJpjc/HVYEp5P9vl2E/bcZfGns/8KxNHoe9mgJycr3mwjCjMjVx2 +L/9q/8XoT02aBncwAx4oZ2H0qfjZppaUSnSc1Uv+dsldDC2mZvJgwXN7jtQmU5P3 +cspFHuJoYK8AqYJqlO6E4L9uRF7dLEliUnrBpF4BxziwskTquRX+zgD+fmk0L5O8 +qqvm8btWCxfng+qD7UHFWbUQ2IegZ3VrBWJ2XsxOvokMM4HoHVb0BZgq8Dvu0XJ9 +EriEQkcydtrRKtlcWHLKcJuNUnkw2qfj+F8mmdaZib8Apa1UCkt0ZlpyYO3V2ejY +WIjafwJYrv6f5g== +-----END CERTIFICATE----- +" + } +} diff -Nru php7.1-7.1.6/ext/openssl/tests/private.crt php7.1-7.1.8/ext/openssl/tests/private.crt --- php7.1-7.1.6/ext/openssl/tests/private.crt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/private.crt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDR3syUaBjG7Q80 +sCu1j44+vmIY+0fSycke0478R9NWVQPrB1K3F7N7Q17pCEHB9a7J3+FmwYxm0E94 +5S4nLJZeoDDofKGgnYuvOt3L8NV0VJpXs6QLNleTGThIKpFr1PDih6o7fKPRdO09 +59c2HngY4lLK+lFql+PmZ8GtuVBdBYndUeAcZl+xqQ6KtFnrr1kGn2zParN0K3ex +Gty6s/aRpFsdQZjr+PV6KwIUGncQk99hm1HYZocYKw4MluTO5hAs+A54GS4Wbywv +Cbn/0OkeUo4Tef3/0wav/0KSmgowQGpoWQybVjL/NCAyiTuyK30DJzxKuLwpx3Sr +xuzemY7BAgMBAAECggEAbdYX5ZexV/LbYWzOA2CVRnsnJgHkrgnTS2HXVGtWzLkD +qu6TOKWb1mgE9RrQJ22oQ5j7A2dKTsi4vwHarL/mFrHpxtLrV/78CwJY8BIj9JUO +jdXDheaz4JVzYjl9EB1K0JPF4QozRjzWqO58MKOzoPpZ8EcfcxT5Pi2RLJVu3K9F +DR3cUNa9h66j84sDJARzvxMfgR6VysHVmgN1aR78Mye0dFVYeL7wCXFJmJXa2AYw +TQR5FcFRa0h8t40EOJdXcoWu63TUd7rvDgebHXJeKax8W2pGREHZfeEw5wWpFQn8 +j+znHSISe7eM9wmW6ombab7zcJsCwXDYgtY/6OqRAQKBgQD6EXKfXThfnrN/od/Y +jF8mfKdJ67HOc8WVPlB9vHDsduFyX914ahJHeCVQPkV1a2nx+bv3PviWbrKreEKl +b7aAAAkbxy/FakcxE9b0wC5JsSW9vByXQiRn0iDqDNl9iwzX/LLW6wE7SruCPp+z +mzCHArp6mvJmRFooR8e3IXiA0QKBgQDW2T9xXFBpumSOBRpn7Zc9SGiQ9qZTSKKb +boVSDd2cod8O1aow3gnQNid/cNnt54Yh5Z3KlYfFWkmrV+0/yQZ/SThZ1uHAaZVy +OnWKVELykpYLnKGlHoQpOYTCfdYan5xOfkw55em3TTeQq5tETYWMdhS/9VVxeLKZ +k2xr+CYq8QKBgQCzHpJK4nwByexq7KkpNIrnR3yQb1oiNjz9xO/k0HjWd+TOhypd +GSVUuhOIIcKg87qkj6x60kk/f7VNK0wZsiY4E05y7j8imhi6Z6qeD5ZYRKJzAG4+ +TitDjnjzDRcwXMxrXV9AoH52WPZsuays+ulMm8C1F42vgSBPH/NHEpt9MQKBgAIw +nLDvG/K376Zy7t34Uf5R6p7vpKpcpyumaL15XrTmAXwJOX7eBIOWybhG0jHWlktq +J72U4JlmXjHc55Iq3mIVwPlJc2uep+NOLTyHt1b5n4Xmxs8EDJzO9Ud2OOR0lAdI +ykYczdEMfHCBD0gW8jGIUpXSTlilvkxKcGR5VwpBAoGBANdAWL3lw+/P43x6Rxth +GJN8QzWe5vRFJYS5mkeaa/6jrFrsvk176WudopropFGtRc/44E1IDOZULJM80Xgb +JTeUFyb+ZjYLrHUp1yir+oZIm5DBZDZjYclanrPPHg9YwVxcHtunPeCFy3iC+W+F +MK80GEnRQIkB7uZVk+r0HusK +-----END PRIVATE KEY----- diff -Nru php7.1-7.1.6/ext/openssl/tests/public.crt php7.1-7.1.8/ext/openssl/tests/public.crt --- php7.1-7.1.6/ext/openssl/tests/public.crt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/openssl/tests/public.crt 2017-08-01 17:36:55.000000000 +0000 @@ -0,0 +1,23 @@ +Bag Attributes + localKeyID: E1 BC BF 63 1E 2A A4 F6 4C 71 6B E7 CE E2 6D 4A 95 CD 26 5B +subject=/C=PL/ST=Some-State/O=Internet Widgits Pty Ltd +issuer=/C=PL/ST=Some-State/O=Internet Widgits Pty Ltd +-----BEGIN CERTIFICATE----- +MIIDBjCCAe4CCQCS/had1ITjDjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJQ +TDETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMB4XDTE1MDYxMDEyMTI0N1oXDTE2MDYwOTEyMTI0N1owRTELMAkG +A1UEBhMCUEwxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 +IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ANHezJRoGMbtDzSwK7WPjj6+Yhj7R9LJyR7TjvxH01ZVA+sHUrcXs3tDXukIQcH1 +rsnf4WbBjGbQT3jlLicsll6gMOh8oaCdi6863cvw1XRUmlezpAs2V5MZOEgqkWvU +8OKHqjt8o9F07T3n1zYeeBjiUsr6UWqX4+Znwa25UF0Fid1R4BxmX7GpDoq0Weuv +WQafbM9qs3Qrd7Ea3Lqz9pGkWx1BmOv49XorAhQadxCT32GbUdhmhxgrDgyW5M7m +ECz4DngZLhZvLC8Juf/Q6R5SjhN5/f/TBq//QpKaCjBAamhZDJtWMv80IDKJO7Ir +fQMnPEq4vCnHdKvG7N6ZjsECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHGAiEN0o +tOV2tbK0Qm/mWlyuRKtxqnP3y/2Q5SFMmRpkOS54hFf9YBNgT7nWK3Z5fPKor17t +rGthXPSZU8hxY5iHFhELurp23qGmJftdcYL2mF7IyoGOiZ1Q6Vt9LnRTDtgrHh/f +ZziI+gaPpmAfEAh48xQrlviHqaR9F63d0UN1jz9cF1kIj1H21PAGC0tmAIxxb4ee +hjipL+JLH0iRoBQE83cF2BOQCfRzRekotnDYon6v7mTjYu7kwl8paRIEMNrBckby +IL3CJOZFesaFO7suK7oP7r6BIATpVcg2m0V25mVMVFRm4F/JOvSkB381Pte/Ccuv +dxPWHER13ptIVg== +-----END CERTIFICATE----- diff -Nru php7.1-7.1.6/ext/pcre/pcrelib/pcre_jit_compile.c php7.1-7.1.8/ext/pcre/pcrelib/pcre_jit_compile.c --- php7.1-7.1.6/ext/pcre/pcrelib/pcre_jit_compile.c 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/ext/pcre/pcrelib/pcre_jit_compile.c 2017-08-01 17:36:48.000000000 +0000 @@ -7307,7 +7307,7 @@ if (*matchingpath == OP_FAIL) stacksize = 0; - if (*matchingpath == OP_RREF) + else if (*matchingpath == OP_RREF) { stacksize = GET2(matchingpath, 1); if (common->currententry == NULL) diff -Nru php7.1-7.1.6/ext/pdo/pdo_stmt.c php7.1-7.1.8/ext/pdo/pdo_stmt.c --- php7.1-7.1.6/ext/pdo/pdo_stmt.c 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/pdo/pdo_stmt.c 2017-08-01 17:36:49.000000000 +0000 @@ -2104,9 +2104,10 @@ RETURN_FALSE; } - php_stream_printf(out, "SQL: [%zd] %.*s\n", - stmt->query_stringlen, - (int) stmt->query_stringlen, stmt->query_string); + /* break into multiple operations so query string won't be truncated at FORMAT_CONV_MAX_PRECISION */ + php_stream_printf(out, "SQL: [%zd] ", stmt->query_stringlen); + php_stream_write(out, stmt->query_string, stmt->query_stringlen); + php_stream_write(out, "\n", 1); php_stream_printf(out, "Params: %d\n", stmt->bound_params ? zend_hash_num_elements(stmt->bound_params) : 0); diff -Nru php7.1-7.1.6/ext/pdo/tests/bug_69356.phpt php7.1-7.1.8/ext/pdo/tests/bug_69356.phpt --- php7.1-7.1.6/ext/pdo/tests/bug_69356.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/pdo/tests/bug_69356.phpt 2017-08-01 17:36:49.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +PDO Common: Bug #69356 (PDOStatement::debugDumpParams() truncates query) +--SKIPIF-- + +--FILE-- +setAttribute(PDO::ATTR_EMULATE_PREPARES, true); +$stmt = $db->query(" + SELECT ' + Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + This is a debug function, which dump directly the data on the normal output. + Tip: + As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). + This will only dumps the parameters in the statement at the moment of the dump. Extra parameters are not stored in the statement, and not displayed. + ' +"); +var_dump($stmt->debugDumpParams()); +?> +--EXPECT-- +SQL: [835] + SELECT ' + Dumps the informations contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1). + This is a debug function, which dump directly the data on the normal output. + Tip: + As with anything that outputs its result directly to the browser, the output-control functions can be used to capture the output of this function, and save it in a string (for example). + This will only dumps the parameters in the statement at the moment of the dump. Extra parameters are not stored in the statement, and not displayed. + ' + +Params: 0 +NULL diff -Nru php7.1-7.1.6/ext/pdo_oci/config.m4 php7.1-7.1.8/ext/pdo_oci/config.m4 --- php7.1-7.1.6/ext/pdo_oci/config.m4 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/ext/pdo_oci/config.m4 2017-08-01 17:36:48.000000000 +0000 @@ -2,16 +2,31 @@ dnl config.m4 for extension pdo_oci dnl vim:et:sw=2:ts=2: -SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped +if test -z "$SED"; then + PHP_PDO_OCI_SED="sed"; +else + PHP_PDO_OCI_SED="$SED"; +fi + +PHP_PDO_OCI_TAIL1=`echo a | tail -n1 2>/dev/null` +if test "$PHP_PDO_OCI_TAIL1" = "a"; then + PHP_PDO_OCI_TAIL1="tail -n1" +else + PHP_PDO_OCI_TAIL1="tail -1" +fi + AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) - for OCI_VER in $SUPPORTED_LIB_VERS; do - if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then - PDO_OCI_VERSION="$OCI_VER" - fi - done - if test -z "$PDO_OCI_VERSION"; then - AC_MSG_ERROR([Oracle required OCI8 libraries not found under $PDO_OCI_DIR]) + PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME + PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1` # Oracle 10g, 11g, 12c etc + if test -f "$PDO_OCI_LCS"; then + dnl Oracle 10g, 11g 12c etc. The x.2 version libraries are named x.1 for drop in compatibility + PDO_OCI_VERSION=`echo $PDO_OCI_LCS | $PHP_PDO_OCI_SED -e 's/.*\.\(.*\)\.1$/\1.1/'` + elif test -f $PDO_OCI_LCS_BASE.9.0; then + dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix for drop-in compatibility with Oracle 9.0 + PDO_OCI_VERSION=9.0 + else + AC_MSG_ERROR(Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9) fi AC_MSG_RESULT($PDO_OCI_VERSION) ]) @@ -147,12 +162,11 @@ fi case $PDO_OCI_VERSION in - 9.0|10.1|10.2|11.1|11.2|12.1) - PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) + 7.3|8.0|8.1) + AC_MSG_ERROR(Unsupported Oracle version $PDO_OCI_VERSION) ;; - *) - AC_MSG_ERROR(Unsupported Oracle version $PDO_OCI_VERSION) + PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; esac diff -Nru php7.1-7.1.6/ext/pdo_oci/tests/bug60994.phpt php7.1-7.1.8/ext/pdo_oci/tests/bug60994.phpt --- php7.1-7.1.6/ext/pdo_oci/tests/bug60994.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/pdo_oci/tests/bug60994.phpt 2017-08-01 17:36:48.000000000 +0000 @@ -0,0 +1,124 @@ +--TEST-- +PDO OCI Bug #60994 (Reading a multibyte CLOB caps at 8192 characters) +--CREDITS-- +Chuck Burgess +ashnazg@php.net +--SKIPIF-- + +--FILE-- +setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL); +$dbh->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); + +@$dbh->exec('DROP TABLE pdo_oci_bug60994'); +$dbh->exec('CREATE TABLE pdo_oci_bug60994 (id NUMBER, data CLOB)'); + +$id = null; +$insert = $dbh->prepare('INSERT INTO pdo_oci_bug60994 (id, data) VALUES (:id, :data)'); +$insert->bindParam(':id', $id, \PDO::PARAM_STR); +$select = $dbh->prepare("SELECT data FROM pdo_oci_bug60994 WHERE id = :id"); + + +echo PHP_EOL, 'Test 1: j', PHP_EOL; +$string1 = 'abc' . str_repeat('j', 8187) . 'xyz'; // 8193 chars total works fine here (even 1 million works fine, subject to memory_limit) +$id = 1; +$insert->bindParam(':data', $string1, \PDO::PARAM_STR, strlen($string1)); // length in bytes +$insert->execute(); +$select->bindParam(':id', $id, \PDO::PARAM_STR); +$select->execute(); +$row = $select->fetch(); +$stream1 = stream_get_contents($row['DATA']); +$start1 = mb_substr($stream1, 0, 10); +$ending1 = mb_substr($stream1, -10); +echo 'size of string1 is ', strlen($string1), ' bytes, ', mb_strlen($string1), ' chars.', PHP_EOL; +echo 'size of stream1 is ', strlen($stream1), ' bytes, ', mb_strlen($stream1), ' chars.', PHP_EOL; +echo 'beg of stream1 is ', $start1, PHP_EOL; +echo 'end of stream1 is ', $ending1, PHP_EOL; + + +echo PHP_EOL, 'Test 2: £', PHP_EOL; +$string2 = 'abc' . str_repeat('£', 8187) . 'xyz'; // 8193 chars total is when it breaks +$id = 2; +$insert->bindParam(':data', $string2, \PDO::PARAM_STR, strlen($string2)); // length in bytes +$insert->execute(); +$select->bindParam(':id', $id, \PDO::PARAM_STR); +$select->execute(); +$row = $select->fetch(); +$stream2 = stream_get_contents($row['DATA']); +$start2 = mb_substr($stream2, 0, 10); +$ending2 = mb_substr($stream2, -10); +echo 'size of string2 is ', strlen($string2), ' bytes, ', mb_strlen($string2), ' chars.', PHP_EOL; +echo 'size of stream2 is ', strlen($stream2), ' bytes, ', mb_strlen($stream2), ' chars.', PHP_EOL; +echo 'beg of stream2 is ', $start2, PHP_EOL; +echo 'end of stream2 is ', $ending2, PHP_EOL; + + +echo PHP_EOL, 'Test 3: Җ', PHP_EOL; +$string3 = 'abc' . str_repeat('Җ', 8187) . 'xyz'; // 8193 chars total is when it breaks +$id = 3; +$insert->bindParam(':data', $string3, \PDO::PARAM_STR, strlen($string3)); // length in bytes +$insert->execute(); +$select->bindParam(':id', $id, \PDO::PARAM_STR); +$select->execute(); +$row = $select->fetch(); +$stream3 = stream_get_contents($row['DATA']); +$start3 = mb_substr($stream3, 0, 10); +$ending3 = mb_substr($stream3, -10); +echo 'size of string3 is ', strlen($string3), ' bytes, ', mb_strlen($string3), ' chars.', PHP_EOL; +echo 'size of stream3 is ', strlen($stream3), ' bytes, ', mb_strlen($stream3), ' chars.', PHP_EOL; +echo 'beg of stream3 is ', $start3, PHP_EOL; +echo 'end of stream3 is ', $ending3, PHP_EOL; + + +echo PHP_EOL, 'Test 4: の', PHP_EOL; +$string4 = 'abc' . str_repeat('の', 8187) . 'xyz'; // 8193 chars total is when it breaks +$id = 4; +$insert->bindParam(':data', $string4, \PDO::PARAM_STR, strlen($string4)); // length in bytes +$insert->execute(); +$select->bindParam(':id', $id, \PDO::PARAM_STR); +$select->execute(); +$row = $select->fetch(); +$stream4 = stream_get_contents($row['DATA']); +$start4 = mb_substr($stream4, 0, 10); +$ending4 = mb_substr($stream4, -10); +echo 'size of string4 is ', strlen($string4), ' bytes, ', mb_strlen($string4), ' chars.', PHP_EOL; +echo 'size of stream4 is ', strlen($stream4), ' bytes, ', mb_strlen($stream4), ' chars.', PHP_EOL; +echo 'beg of stream4 is ', $start4, PHP_EOL; +echo 'end of stream4 is ', $ending4, PHP_EOL; + +--XFAIL-- +Fails due to Bug 60994 +--EXPECTF-- + +Test 1: j +size of string1 is 1000006 bytes, 1000006 chars. +size of stream1 is 1000006 bytes, 1000006 chars. +beg of stream1 is abcjjjjjjj +end of stream1 is jjjjjjjxyz + +Test 2: £ +size of string2 is 16380 bytes, 8193 chars. +size of stream2 is 16380 bytes, 8193 chars. +beg of stream2 is abc£££££££ +end of stream2 is £££££££xyz + +Test 3: Җ +size of string3 is 16380 bytes, 8193 chars. +size of stream3 is 16380 bytes, 8193 chars. +beg of stream3 is abcҖҖҖҖҖҖҖ +end of stream3 is ҖҖҖҖҖҖҖxyz + +Test 4: の +size of string4 is 24567 bytes, 8193 chars. +size of stream4 is 24567 bytes, 8193 chars. +beg of stream4 is abcののののののの +end of stream4 is のののののののxyz + diff -Nru php7.1-7.1.6/ext/phar/phar_object.c php7.1-7.1.8/ext/phar/phar_object.c --- php7.1-7.1.6/ext/phar/phar_object.c 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/phar/phar_object.c 2017-08-01 17:36:54.000000000 +0000 @@ -5101,7 +5101,6 @@ ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) ZEND_ARG_INFO(0, alias) - ZEND_ARG_INFO(0, fileformat) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_createDS, 0, 0, 0) @@ -5311,6 +5310,75 @@ PHP_FE_END }; + +ZEND_BEGIN_ARG_INFO_EX(arginfo_data___construct, 0, 0, 1) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, flags) + ZEND_ARG_INFO(0, alias) + ZEND_ARG_INFO(0, fileformat) +ZEND_END_ARG_INFO() + +zend_function_entry php_data_methods[] = { + PHP_ME(Phar, __construct, arginfo_data___construct, ZEND_ACC_PUBLIC) + PHP_ME(Phar, __destruct, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, addEmptyDir, arginfo_phar_emptydir, ZEND_ACC_PUBLIC) + PHP_ME(Phar, addFile, arginfo_phar_addfile, ZEND_ACC_PUBLIC) + PHP_ME(Phar, addFromString, arginfo_phar_fromstring, ZEND_ACC_PUBLIC) + PHP_ME(Phar, buildFromDirectory, arginfo_phar_fromdir, ZEND_ACC_PUBLIC) + PHP_ME(Phar, buildFromIterator, arginfo_phar_build, ZEND_ACC_PUBLIC) + PHP_ME(Phar, compressFiles, arginfo_phar_comp, ZEND_ACC_PUBLIC) + PHP_ME(Phar, decompressFiles, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, compress, arginfo_phar_comps, ZEND_ACC_PUBLIC) + PHP_ME(Phar, decompress, arginfo_phar_decomp, ZEND_ACC_PUBLIC) + PHP_ME(Phar, convertToExecutable, arginfo_phar_conv, ZEND_ACC_PUBLIC) + PHP_ME(Phar, convertToData, arginfo_phar_conv, ZEND_ACC_PUBLIC) + PHP_ME(Phar, copy, arginfo_phar_copy, ZEND_ACC_PUBLIC) + PHP_ME(Phar, count, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, delete, arginfo_phar_delete, ZEND_ACC_PUBLIC) + PHP_ME(Phar, delMetadata, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, extractTo, arginfo_phar_extract, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getAlias, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getPath, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getMetadata, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getModified, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getSignature, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getStub, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, getVersion, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, hasMetadata, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, isBuffering, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, isCompressed, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, isFileFormat, arginfo_phar_isff, ZEND_ACC_PUBLIC) + PHP_ME(Phar, isWritable, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, offsetExists, arginfo_phar_offsetExists, ZEND_ACC_PUBLIC) + PHP_ME(Phar, offsetGet, arginfo_phar_offsetExists, ZEND_ACC_PUBLIC) + PHP_ME(Phar, offsetSet, arginfo_phar_offsetSet, ZEND_ACC_PUBLIC) + PHP_ME(Phar, offsetUnset, arginfo_phar_offsetExists, ZEND_ACC_PUBLIC) + PHP_ME(Phar, setAlias, arginfo_phar_setAlias, ZEND_ACC_PUBLIC) + PHP_ME(Phar, setDefaultStub, arginfo_phar_createDS, ZEND_ACC_PUBLIC) + PHP_ME(Phar, setMetadata, arginfo_phar_setMetadata, ZEND_ACC_PUBLIC) + PHP_ME(Phar, setSignatureAlgorithm, arginfo_phar_setSigAlgo, ZEND_ACC_PUBLIC) + PHP_ME(Phar, setStub, arginfo_phar_setStub, ZEND_ACC_PUBLIC) + PHP_ME(Phar, startBuffering, arginfo_phar__void, ZEND_ACC_PUBLIC) + PHP_ME(Phar, stopBuffering, arginfo_phar__void, ZEND_ACC_PUBLIC) + /* static member functions */ + PHP_ME(Phar, apiVersion, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, canCompress, arginfo_phar_cancompress, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, canWrite, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, createDefaultStub, arginfo_phar_createDS, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, getSupportedCompression,arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, getSupportedSignatures,arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, interceptFileFuncs, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, isValidPharFilename, arginfo_phar_isvalidpharfilename, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, loadPhar, arginfo_phar_loadPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, mapPhar, arginfo_phar_mapPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, running, arginfo_phar_running, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, mount, arginfo_phar_mount, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, mungServer, arginfo_phar_mungServer, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, unlinkArchive, arginfo_phar_ua, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_ME(Phar, webPhar, arginfo_phar_webPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) + PHP_FE_END +}; + ZEND_BEGIN_ARG_INFO_EX(arginfo_entry___construct, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() @@ -5358,7 +5426,7 @@ zend_class_implements(phar_ce_archive, 2, spl_ce_Countable, zend_ce_arrayaccess); - INIT_CLASS_ENTRY(ce, "PharData", php_archive_methods); + INIT_CLASS_ENTRY(ce, "PharData", php_data_methods); phar_ce_data = zend_register_internal_class_ex(&ce, spl_ce_RecursiveDirectoryIterator); zend_class_implements(phar_ce_data, 2, spl_ce_Countable, zend_ce_arrayaccess); diff -Nru php7.1-7.1.6/ext/phar/tests/bug74386.phpt php7.1-7.1.8/ext/phar/tests/bug74386.phpt --- php7.1-7.1.6/ext/phar/tests/bug74386.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/phar/tests/bug74386.phpt 2017-08-01 17:36:54.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Phar: bug #74386: Phar::__construct(): wrong number of parameters by reflection +--SKIPIF-- + +--FILE-- +getNumberOfRequiredParameters()); +var_dump($r->getNumberOfParameters()); + +$r = new ReflectionMethod(PharData::class, '__construct'); +var_dump($r->getNumberOfRequiredParameters()); +var_dump($r->getNumberOfParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +int(3) +int(1) +int(4) +===DONE=== diff -Nru php7.1-7.1.6/ext/reflection/php_reflection.c php7.1-7.1.8/ext/reflection/php_reflection.c --- php7.1-7.1.6/ext/reflection/php_reflection.c 2017-06-07 08:09:33.000000000 +0000 +++ php7.1-7.1.8/ext/reflection/php_reflection.c 2017-08-01 17:36:52.000000000 +0000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: a06522d025b0af3e6ba10a0f6964086b7e6f5458 $ */ +/* $Id: db7056e03b7071d15858224c1c6c472ec58ef401 $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -468,6 +468,9 @@ ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) { _class_const_string(str, ZSTR_VAL(key), c, ZSTR_VAL(sub_indent.buf)); + if (UNEXPECTED(EG(exception))) { + return; + } } ZEND_HASH_FOREACH_END(); } string_printf(str, "%s }\n", indent); @@ -732,7 +735,10 @@ string_write(str, " = ", sizeof(" = ")-1); ZVAL_DUP(&zv, RT_CONSTANT(&fptr->op_array, precv->op2)); - zval_update_constant_ex(&zv, fptr->common.scope); + if (UNEXPECTED(zval_update_constant_ex(&zv, fptr->common.scope) == FAILURE)) { + zval_ptr_dtor(&zv); + return; + } if (Z_TYPE(zv) == IS_TRUE) { string_write(str, "true", sizeof("true")-1); } else if (Z_TYPE(zv) == IS_FALSE) { @@ -6919,7 +6925,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: a06522d025b0af3e6ba10a0f6964086b7e6f5458 $"); + php_info_print_table_row(2, "Version", "$Id: db7056e03b7071d15858224c1c6c472ec58ef401 $"); php_info_print_table_end(); } /* }}} */ diff -Nru php7.1-7.1.6/ext/reflection/tests/bug74673.phpt php7.1-7.1.8/ext/reflection/tests/bug74673.phpt --- php7.1-7.1.6/ext/reflection/tests/bug74673.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/reflection/tests/bug74673.phpt 2017-08-01 17:36:52.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Bug #74673 (Segfault when cast Reflection object to string with undefined constant) +--FILE-- + +--EXPECTF-- +Fatal error: Method ReflectionClass::__toString() must not throw an exception, caught Exception: in %sbug74673.php on line %d diff -Nru php7.1-7.1.6/ext/snmp/snmp.c php7.1-7.1.8/ext/snmp/snmp.c --- php7.1-7.1.6/ext/snmp/snmp.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/ext/snmp/snmp.c 2017-08-01 17:36:55.000000000 +0000 @@ -38,9 +38,9 @@ #if HAVE_SNMP #include +#include #ifdef PHP_WIN32 #include -#include #include #include "win32/time.h" #elif defined(NETWARE) @@ -49,17 +49,11 @@ #else #include #endif -#include #include #else #include #include #include -#ifndef _OSD_POSIX -#include -#else -#include /* BS2000/OSD uses , not */ -#endif #include #endif #ifdef HAVE_UNISTD_H diff -Nru php7.1-7.1.6/ext/soap/php_sdl.c php7.1-7.1.8/ext/soap/php_sdl.c --- php7.1-7.1.6/ext/soap/php_sdl.c 2017-06-07 08:09:32.000000000 +0000 +++ php7.1-7.1.8/ext/soap/php_sdl.c 2017-08-01 17:36:51.000000000 +0000 @@ -2623,7 +2623,7 @@ pattr->extraAttributes = malloc(sizeof(HashTable)); zend_hash_init(pattr->extraAttributes, zend_hash_num_elements(attr->extraAttributes), NULL, delete_extra_attribute_persistent, 1); - ZEND_HASH_FOREACH_STR_KEY_PTR(pattr->extraAttributes, key, tmp) { + ZEND_HASH_FOREACH_STR_KEY_PTR(attr->extraAttributes, key, tmp) { if (key) { pextra = malloc(sizeof(sdlExtraAttribute)); memset(pextra, 0, sizeof(sdlExtraAttribute)); diff -Nru php7.1-7.1.6/ext/spl/internal/splfileobject.inc php7.1-7.1.8/ext/spl/internal/splfileobject.inc --- php7.1-7.1.6/ext/spl/internal/splfileobject.inc 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/spl/internal/splfileobject.inc 2017-08-01 17:36:54.000000000 +0000 @@ -54,7 +54,7 @@ */ function eof() { - return eof($this->fp); + return feof($this->fp); } /** increase current line number diff -Nru php7.1-7.1.6/ext/spl/spl_fixedarray.c php7.1-7.1.8/ext/spl/spl_fixedarray.c --- php7.1-7.1.6/ext/spl/spl_fixedarray.c 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/spl/spl_fixedarray.c 2017-08-01 17:36:54.000000000 +0000 @@ -346,6 +346,21 @@ intern = Z_SPLFIXEDARRAY_P(object); + if (type == BP_VAR_IS && intern->fptr_offset_has) { + SEPARATE_ARG_IF_REF(offset); + zend_call_method_with_1_params(object, intern->std.ce, &intern->fptr_offset_has, "offsetexists", rv, offset); + if (UNEXPECTED(Z_ISUNDEF_P(rv))) { + zval_ptr_dtor(offset); + return NULL; + } + if (!i_zend_is_true(rv)) { + zval_ptr_dtor(offset); + zval_ptr_dtor(rv); + return &EG(uninitialized_zval); + } + zval_ptr_dtor(rv); + } + if (intern->fptr_offset_get) { zval tmp; if (!offset) { diff -Nru php7.1-7.1.6/ext/spl/spl_iterators.c php7.1-7.1.8/ext/spl/spl_iterators.c --- php7.1-7.1.6/ext/spl/spl_iterators.c 2017-06-07 08:09:35.000000000 +0000 +++ php7.1-7.1.8/ext/spl/spl_iterators.c 2017-08-01 17:36:54.000000000 +0000 @@ -3374,7 +3374,12 @@ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) { return; } - spl_array_iterator_append(&intern->u.append.zarrayit, it); + if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) == SUCCESS) { + spl_array_iterator_append(&intern->u.append.zarrayit, it); + intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator); + }else{ + spl_array_iterator_append(&intern->u.append.zarrayit, it); + } if (!intern->inner.iterator || spl_dual_it_valid(intern) != SUCCESS) { if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) != SUCCESS) { diff -Nru php7.1-7.1.6/ext/spl/tests/bug73471.phpt php7.1-7.1.8/ext/spl/tests/bug73471.phpt --- php7.1-7.1.6/ext/spl/tests/bug73471.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/spl/tests/bug73471.phpt 2017-08-01 17:36:54.000000000 +0000 @@ -0,0 +1,15 @@ +--TEST-- +Bug #73471 PHP freezes with AppendIterator +--FILE-- +append($events); +foreach($events as $event){} +$iterator->append($events2); +?> +===DONE=== +--EXPECT-- +===DONE=== diff -Nru php7.1-7.1.6/ext/spl/tests/bug74478.phpt php7.1-7.1.8/ext/spl/tests/bug74478.phpt --- php7.1-7.1.6/ext/spl/tests/bug74478.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/spl/tests/bug74478.phpt 2017-08-01 17:36:54.000000000 +0000 @@ -0,0 +1,62 @@ +--TEST-- +Bug #74478: null coalescing operator failing with SplFixedArray +--FILE-- +foo)); +var_dump($fixedData[0] ?? 42); +var_dump($fixedData[0][1][2] ?? 42); + +$fixedData[0] = new MyFixedArray(10); +$fixedData[0][1] = new MyFixedArray(10); +var_dump(isset($fixedData[0][1][2])); +var_dump($fixedData[0][1][2] ?? 42); + +?> +--EXPECT-- +offsetExists(0) +bool(false) +offsetExists(0) +bool(false) +offsetExists(0) +int(42) +offsetExists(0) +int(42) +offsetSet(0) +offsetGet(0) +offsetSet(1) +offsetExists(0) +offsetGet(0) +offsetExists(1) +offsetGet(1) +offsetExists(2) +bool(false) +offsetExists(0) +offsetGet(0) +offsetExists(1) +offsetGet(1) +offsetExists(2) +int(42) \ No newline at end of file diff -Nru php7.1-7.1.6/ext/sqlite3/php_sqlite3.h php7.1-7.1.8/ext/sqlite3/php_sqlite3.h --- php7.1-7.1.6/ext/sqlite3/php_sqlite3.h 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/ext/sqlite3/php_sqlite3.h 2017-08-01 17:36:48.000000000 +0000 @@ -21,7 +21,7 @@ #ifndef PHP_SQLITE3_H #define PHP_SQLITE3_H -#define PHP_SQLITE3_VERSION "0.7-dev" +#define PHP_SQLITE3_VERSION PHP_VERSION extern zend_module_entry sqlite3_module_entry; #define phpext_sqlite3_ptr &sqlite3_module_entry diff -Nru php7.1-7.1.6/ext/sqlite3/sqlite3.c php7.1-7.1.8/ext/sqlite3/sqlite3.c --- php7.1-7.1.6/ext/sqlite3/sqlite3.c 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/ext/sqlite3/sqlite3.c 2017-08-01 17:36:48.000000000 +0000 @@ -103,6 +103,7 @@ char *filename, *encryption_key, *fullpath; size_t filename_len, encryption_key_len = 0; zend_long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; + int rc; db_obj = Z_SQLITE3_DB_P(object); @@ -133,11 +134,13 @@ } #if SQLITE_VERSION_NUMBER >= 3005000 - if (sqlite3_open_v2(fullpath, &(db_obj->db), flags, NULL) != SQLITE_OK) { + rc = sqlite3_open_v2(fullpath, &(db_obj->db), flags, NULL); #else - if (sqlite3_open(fullpath, &(db_obj->db)) != SQLITE_OK) { + rc = sqlite3_open(fullpath, &(db_obj->db)); #endif - zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s", sqlite3_errmsg(db_obj->db)); + if (rc != SQLITE_OK) { + zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s", + db_obj->db ? sqlite3_errmsg(db_obj->db) : sqlite3_errstr(rc)); if (fullpath != filename) { efree(fullpath); } diff -Nru php7.1-7.1.6/ext/standard/basic_functions.c php7.1-7.1.8/ext/standard/basic_functions.c --- php7.1-7.1.6/ext/standard/basic_functions.c 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/standard/basic_functions.c 2017-08-01 17:36:49.000000000 +0000 @@ -1903,11 +1903,11 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ random.c */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_random_bytes, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_random_bytes, 0, 0, 1) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_random_int, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_random_int, 0, 0, 2) ZEND_ARG_INFO(0, min) ZEND_ARG_INFO(0, max) ZEND_END_ARG_INFO() diff -Nru php7.1-7.1.6/ext/standard/ftp_fopen_wrapper.c php7.1-7.1.8/ext/standard/ftp_fopen_wrapper.c --- php7.1-7.1.6/ext/standard/ftp_fopen_wrapper.c 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/standard/ftp_fopen_wrapper.c 2017-08-01 17:36:49.000000000 +0000 @@ -908,7 +908,7 @@ int result; char tmp_line[512]; - stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, NULL, NULL, &resource, NULL, NULL); + stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL); if (!stream) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Unable to connect to %s", url); @@ -979,7 +979,7 @@ goto rename_errexit; } - stream = php_ftp_fopen_connect(wrapper, url_from, "r", 0, NULL, NULL, NULL, NULL, NULL, NULL); + stream = php_ftp_fopen_connect(wrapper, url_from, "r", 0, NULL, context, NULL, NULL, NULL, NULL); if (!stream) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Unable to connect to %s", resource_from->host); @@ -1037,7 +1037,7 @@ int result, recursive = options & PHP_STREAM_MKDIR_RECURSIVE; char tmp_line[512]; - stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, NULL, NULL, &resource, NULL, NULL); + stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL); if (!stream) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Unable to connect to %s", url); @@ -1131,7 +1131,7 @@ int result; char tmp_line[512]; - stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, NULL, NULL, &resource, NULL, NULL); + stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL); if (!stream) { if (options & REPORT_ERRORS) { php_error_docref(NULL, E_WARNING, "Unable to connect to %s", url); diff -Nru php7.1-7.1.6/ext/standard/php_smart_string.h php7.1-7.1.8/ext/standard/php_smart_string.h --- php7.1-7.1.6/ext/standard/php_smart_string.h 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/standard/php_smart_string.h 2017-08-01 17:36:51.000000000 +0000 @@ -50,7 +50,7 @@ #endif #define SMART_STRING_DO_REALLOC(d, what) \ - (d)->c = SMART_STRING_REALLOC((d)->c, (d)->a + 1, (what)) + (d)->c = (char *) SMART_STRING_REALLOC((d)->c, (d)->a + 1, (what)) #define smart_string_alloc4(d, n, what, newlen) do { \ if (!(d)->c) { \ diff -Nru php7.1-7.1.6/ext/standard/streamsfuncs.c php7.1-7.1.8/ext/standard/streamsfuncs.c --- php7.1-7.1.6/ext/standard/streamsfuncs.c 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/standard/streamsfuncs.c 2017-08-01 17:36:51.000000000 +0000 @@ -314,6 +314,11 @@ RETURN_FALSE; } + if (!ZSTR_LEN(name)) { + zend_string_release(name); + RETURN_FALSE; + } + RETVAL_STR(name); } /* }}} */ diff -Nru php7.1-7.1.6/ext/standard/tests/file/windows_mb_path/bug74923.phpt php7.1-7.1.8/ext/standard/tests/file/windows_mb_path/bug74923.phpt --- php7.1-7.1.6/ext/standard/tests/file/windows_mb_path/bug74923.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/file/windows_mb_path/bug74923.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +Bug #74923 Crash when crawling through network share +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECTF-- +string(271) "%s" +bool(false) +===DONE=== diff -Nru php7.1-7.1.6/ext/standard/tests/general_functions/proc_open-win32-mb0.phpt php7.1-7.1.8/ext/standard/tests/general_functions/proc_open-win32-mb0.phpt --- php7.1-7.1.6/ext/standard/tests/general_functions/proc_open-win32-mb0.phpt 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/general_functions/proc_open-win32-mb0.phpt 2017-08-01 17:36:49.000000000 +0000 @@ -29,10 +29,16 @@ array("bypass_shell" => true) ); -echo fread($pipes[1], 1024); +$out = ""; + +while (!feof($pipes[1])) { + $out .= fread($pipes[1], 1024); +} proc_close($p); +echo $out; + ?> ==DONE== --EXPECTF-- diff -Nru php7.1-7.1.6/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt php7.1-7.1.8/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt --- php7.1-7.1.6/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt 2017-08-01 17:36:49.000000000 +0000 @@ -26,10 +26,16 @@ $pipes ); -echo fread($pipes[1], 1024); +$out = ""; + +while (!feof($pipes[1])) { + $out .= fread($pipes[1], 1024); +} proc_close($p); +echo $out; + ?> ==DONE== --EXPECTF-- diff -Nru php7.1-7.1.6/ext/standard/tests/network/bug73594a.phpt php7.1-7.1.8/ext/standard/tests/network/bug73594a.phpt --- php7.1-7.1.6/ext/standard/tests/network/bug73594a.phpt 2017-06-07 08:09:30.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/network/bug73594a.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -18,8 +18,9 @@ --FILE-- --EXPECT-- bool(false) diff -Nru php7.1-7.1.6/ext/standard/tests/network/bug73594.phpt php7.1-7.1.8/ext/standard/tests/network/bug73594.phpt --- php7.1-7.1.6/ext/standard/tests/network/bug73594.phpt 2017-06-07 08:09:30.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/network/bug73594.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -19,8 +19,9 @@ --EXPECT-- bool(false) diff -Nru php7.1-7.1.6/ext/standard/tests/random/reflection.phpt php7.1-7.1.8/ext/standard/tests/random/reflection.phpt --- php7.1-7.1.6/ext/standard/tests/random/reflection.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/random/reflection.phpt 2017-08-01 17:36:49.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +Bug #74708 Wrong reflection on random_bytes and random_int +--FILE-- +getNumberOfParameters()); +var_dump($rf->getNumberOfRequiredParameters()); + +$rf = new ReflectionFunction('random_int'); +var_dump($rf->getNumberOfParameters()); +var_dump($rf->getNumberOfRequiredParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +int(1) +int(2) +int(2) +===DONE=== diff -Nru php7.1-7.1.6/ext/standard/tests/serialize/bug25378.phpt php7.1-7.1.8/ext/standard/tests/serialize/bug25378.phpt --- php7.1-7.1.6/ext/standard/tests/serialize/bug25378.phpt 2017-06-07 08:09:30.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/serialize/bug25378.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -42,7 +42,7 @@ Notice: unserialize(): Error at offset 17 of 33 bytes in %sbug25378.php on line %d bool(false) -Notice: unserialize(): Error at offset 33 of 32 bytes in %sbug25378.php on line %d +Notice: unserialize(): Error at offset 32 of 32 bytes in %sbug25378.php on line %d bool(false) Notice: unserialize(): Error at offset 2 of 13 bytes in %sbug25378.php on line %d diff -Nru php7.1-7.1.6/ext/standard/tests/serialize/bug74101.phpt php7.1-7.1.8/ext/standard/tests/serialize/bug74101.phpt --- php7.1-7.1.6/ext/standard/tests/serialize/bug74101.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/serialize/bug74101.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,10 @@ +--TEST-- +Bug #74101: Unserialize Heap Use-After-Free (READ: 1) in zval_get_type +--FILE-- + +--EXPECTF-- +Notice: unserialize(): Error at offset 48 of 74 bytes in %s on line %d +bool(false) diff -Nru php7.1-7.1.6/ext/standard/tests/serialize/bug74111.phpt php7.1-7.1.8/ext/standard/tests/serialize/bug74111.phpt --- php7.1-7.1.6/ext/standard/tests/serialize/bug74111.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/serialize/bug74111.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,10 @@ +--TEST-- +Bug #74111: Heap buffer overread (READ: 1) finish_nested_data from unserialize +--FILE-- + +--EXPECTF-- +Notice: unserialize(): Error at offset 25 of 23 bytes in %s on line %d +bool(false) diff -Nru php7.1-7.1.6/ext/standard/tests/serialize/bug74614.phpt php7.1-7.1.8/ext/standard/tests/serialize/bug74614.phpt --- php7.1-7.1.6/ext/standard/tests/serialize/bug74614.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/serialize/bug74614.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,10 @@ +--TEST-- +Bug #74614: Use-after-free in PHP7's unserialize() +--FILE-- + +--EXPECTF-- +Notice: unserialize(): Error at offset %d of 113 bytes in %s on line %d diff -Nru php7.1-7.1.6/ext/standard/tests/streams/bug74556.phpt php7.1-7.1.8/ext/standard/tests/streams/bug74556.phpt --- php7.1-7.1.6/ext/standard/tests/streams/bug74556.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/streams/bug74556.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Bug #74556 stream_socket_get_name() on unix socket returns "\0" +--SKIPIF-- + DONE --EXPECTF-- -Notice: unserialize(): Error at offset 51 of 50 bytes in %sbug72663_3.php on line %d +Notice: unserialize(): Error at offset 50 of 50 bytes in %sbug72663_3.php on line %d DONE diff -Nru php7.1-7.1.6/ext/standard/tests/url/bug74780.phpt php7.1-7.1.8/ext/standard/tests/url/bug74780.phpt --- php7.1-7.1.6/ext/standard/tests/url/bug74780.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/standard/tests/url/bug74780.phpt 2017-08-01 17:36:50.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +Bug #74780 parse_url() borks when query string contains colon +--FILE-- + +--EXPECT-- +array(3) { + ["host"]=> + string(7) "php.net" + ["path"]=> + string(5) "/path" + ["query"]=> + string(9) "query=1:2" +} +array(3) { + ["host"]=> + string(7) "php.net" + ["path"]=> + string(9) "/path.php" + ["query"]=> + string(9) "query=a:b" +} +array(4) { + ["host"]=> + string(7) "php.net" + ["user"]=> + string(8) "username" + ["path"]=> + string(5) "/path" + ["query"]=> + string(9) "query=1:2" +} \ No newline at end of file diff -Nru php7.1-7.1.6/ext/standard/url.c php7.1-7.1.8/ext/standard/url.c --- php7.1-7.1.6/ext/standard/url.c 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/standard/url.c 2017-08-01 17:36:51.000000000 +0000 @@ -112,6 +112,10 @@ if (!isalpha(*p) && !isdigit(*p) && *p != '+' && *p != '.' && *p != '-') { if (e + 1 < ue && e < s + strcspn(s, "?#")) { goto parse_port; + } else if (s + 1 < ue && *s == '/' && *(s + 1) == '/') { /* relative-scheme URL */ + s += 2; + e = 0; + goto parse_host; } else { goto just_path; } @@ -208,6 +212,7 @@ goto just_path; } + parse_host: /* Binary-safe strcspn(s, "/?#") */ e = ue; if ((p = memchr(s, '/', e - s))) { diff -Nru php7.1-7.1.6/ext/standard/var_unserializer.c php7.1-7.1.8/ext/standard/var_unserializer.c --- php7.1-7.1.6/ext/standard/var_unserializer.c 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/standard/var_unserializer.c 2017-08-01 17:36:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.16 */ +/* Generated by re2c 0.15.3 */ /* +----------------------------------------------------------------------+ | PHP Version 7 | @@ -471,13 +471,12 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER) { - if (*((*p)++) == '}') - return 1; + if (*p >= max || **p != '}') { + return 0; + } -#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE - zval_ptr_dtor(rval); -#endif - return 0; + (*p)++; + return 1; } static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) @@ -546,6 +545,10 @@ && zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1); ht = Z_OBJPROP_P(rval); + if (elements >= HT_MAX_SIZE - zend_hash_num_elements(ht)) { + return 0; + } + zend_hash_extend(ht, zend_hash_num_elements(ht) + elements, (ht->u.flags & HASH_FLAG_PACKED)); if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) { if (has_wakeup) { @@ -655,398 +658,520 @@ yych = *YYCURSOR; switch (yych) { case 'C': - case 'O': goto yy4; + case 'O': goto yy13; case 'N': goto yy5; - case 'R': goto yy6; - case 'S': goto yy7; - case 'a': goto yy8; - case 'b': goto yy9; - case 'd': goto yy10; - case 'i': goto yy11; + case 'R': goto yy2; + case 'S': goto yy10; + case 'a': goto yy11; + case 'b': goto yy6; + case 'd': goto yy8; + case 'i': goto yy7; case 'o': goto yy12; - case 'r': goto yy13; - case 's': goto yy14; - case '}': goto yy15; - default: goto yy2; + case 'r': goto yy4; + case 's': goto yy9; + case '}': goto yy14; + default: goto yy16; } yy2: - ++YYCURSOR; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy95; yy3: { return 0; } yy4: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy17; + if (yych == ':') goto yy89; goto yy3; yy5: yych = *++YYCURSOR; - if (yych == ';') goto yy19; + if (yych == ';') goto yy87; goto yy3; yy6: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy21; + if (yych == ':') goto yy83; goto yy3; yy7: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy22; + if (yych == ':') goto yy77; goto yy3; yy8: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy23; + if (yych == ':') goto yy53; goto yy3; yy9: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy24; + if (yych == ':') goto yy46; goto yy3; yy10: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy25; + if (yych == ':') goto yy39; goto yy3; yy11: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy26; + if (yych == ':') goto yy32; goto yy3; yy12: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy27; + if (yych == ':') goto yy25; goto yy3; yy13: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy28; + if (yych == ':') goto yy17; goto yy3; yy14: - yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy29; - goto yy3; -yy15: ++YYCURSOR; { /* this is the case where we have less data than planned */ php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } +yy16: + yych = *++YYCURSOR; + goto yy3; yy17: yych = *++YYCURSOR; if (yybm[0+yych] & 128) { - goto yy31; + goto yy20; } - if (yych == '+') goto yy30; + if (yych == '+') goto yy19; yy18: YYCURSOR = YYMARKER; goto yy3; yy19: - ++YYCURSOR; - { - *p = YYCURSOR; - ZVAL_NULL(rval); - return 1; -} -yy21: yych = *++YYCURSOR; - if (yych <= ',') { - if (yych == '+') goto yy33; - goto yy18; - } else { - if (yych <= '-') goto yy33; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy34; - goto yy18; + if (yybm[0+yych] & 128) { + goto yy20; } -yy22: - yych = *++YYCURSOR; - if (yych == '+') goto yy36; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy37; - goto yy18; -yy23: - yych = *++YYCURSOR; - if (yych == '+') goto yy39; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy40; goto yy18; -yy24: - yych = *++YYCURSOR; +yy20: + ++YYCURSOR; + if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if (yybm[0+yych] & 128) { + goto yy20; + } if (yych <= '/') goto yy18; - if (yych <= '1') goto yy42; - goto yy18; -yy25: + if (yych >= ';') goto yy18; yych = *++YYCURSOR; - if (yych <= '/') { - if (yych <= ',') { - if (yych == '+') goto yy43; - goto yy18; - } else { - if (yych <= '-') goto yy44; - if (yych <= '.') goto yy45; - goto yy18; + if (yych != '"') goto yy18; + ++YYCURSOR; + { + size_t len, len2, len3, maxlen; + zend_long elements; + char *str; + zend_string *class_name; + zend_class_entry *ce; + int incomplete_class = 0; + + int custom_object = 0; + + zval user_func; + zval retval; + zval args[1]; + + if (!var_hash) return 0; + if (*start == 'C') { + custom_object = 1; + } + + len2 = len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len || len == 0) { + *p = start + 2; + return 0; + } + + str = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; + } + if (*(YYCURSOR+1) != ':') { + *p = YYCURSOR+1; + return 0; + } + + len3 = strspn(str, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\"); + if (len3 != len) + { + *p = YYCURSOR + len3 - len; + return 0; + } + + class_name = zend_string_init(str, len, 0); + + do { + if(!unserialize_allowed_class(class_name, var_hash)) { + incomplete_class = 1; + ce = PHP_IC_ENTRY; + break; } - } else { - if (yych <= 'I') { - if (yych <= '9') goto yy46; - if (yych <= 'H') goto yy18; - goto yy48; - } else { - if (yych == 'N') goto yy49; - goto yy18; + + /* Try to find class directly */ + BG(serialize_lock)++; + ce = zend_lookup_class(class_name); + if (ce) { + BG(serialize_lock)--; + if (EG(exception)) { + zend_string_release(class_name); + return 0; + } + break; + } + BG(serialize_lock)--; + + if (EG(exception)) { + zend_string_release(class_name); + return 0; + } + + /* Check for unserialize callback */ + if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { + incomplete_class = 1; + ce = PHP_IC_ENTRY; + break; + } + + /* Call unserialize callback */ + ZVAL_STRING(&user_func, PG(unserialize_callback_func)); + + ZVAL_STR_COPY(&args[0], class_name); + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) { + BG(serialize_lock)--; + if (EG(exception)) { + zend_string_release(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + return 0; + } + php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + break; + } + BG(serialize_lock)--; + zval_ptr_dtor(&retval); + if (EG(exception)) { + zend_string_release(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + return 0; + } + + /* The callback function may have defined the class */ + BG(serialize_lock)++; + if ((ce = zend_lookup_class(class_name)) == NULL) { + php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + } + BG(serialize_lock)--; + + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + break; + } while (1); + + *p = YYCURSOR; + + if (custom_object) { + int ret; + + ret = object_custom(UNSERIALIZE_PASSTHRU, ce); + + if (ret && incomplete_class) { + php_store_class_name(rval, ZSTR_VAL(class_name), len2); } + zend_string_release(class_name); + return ret; } -yy26: - yych = *++YYCURSOR; - if (yych <= ',') { - if (yych == '+') goto yy50; - goto yy18; - } else { - if (yych <= '-') goto yy50; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy51; - goto yy18; + + elements = object_common1(UNSERIALIZE_PASSTHRU, ce); + + if (elements < 0) { + zend_string_release(class_name); + return 0; } -yy27: - yych = *++YYCURSOR; - if (yych <= ',') { - if (yych == '+') goto yy53; - goto yy18; - } else { - if (yych <= '-') goto yy53; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy54; - goto yy18; + + if (incomplete_class) { + php_store_class_name(rval, ZSTR_VAL(class_name), len2); } -yy28: + zend_string_release(class_name); + + return object_common2(UNSERIALIZE_PASSTHRU, elements); +} +yy25: yych = *++YYCURSOR; if (yych <= ',') { - if (yych == '+') goto yy56; - goto yy18; + if (yych != '+') goto yy18; } else { - if (yych <= '-') goto yy56; + if (yych <= '-') goto yy26; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy57; + if (yych <= '9') goto yy27; goto yy18; } -yy29: +yy26: yych = *++YYCURSOR; - if (yych == '+') goto yy59; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy60; - goto yy18; -yy30: - yych = *++YYCURSOR; - if (yybm[0+yych] & 128) { - goto yy31; - } - goto yy18; -yy31: + if (yych >= ':') goto yy18; +yy27: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; - if (yybm[0+yych] & 128) { - goto yy31; - } if (yych <= '/') goto yy18; - if (yych <= ':') goto yy62; - goto yy18; -yy33: + if (yych <= '9') goto yy27; + if (yych >= ';') goto yy18; yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy34: + if (yych != '"') goto yy18; ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + { + zend_long elements; + if (!var_hash) return 0; + + elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); + if (elements < 0 || elements >= HT_MAX_SIZE) { + return 0; + } + return object_common2(UNSERIALIZE_PASSTHRU, elements); +} +yy32: + yych = *++YYCURSOR; + if (yych == '+') goto yy33; if (yych <= '/') goto yy18; if (yych <= '9') goto yy34; - if (yych == ';') goto yy63; goto yy18; -yy36: +yy33: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy37: +yy34: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy37; - if (yych <= ':') goto yy65; - goto yy18; -yy39: + if (yych <= '9') goto yy34; + if (yych >= ';') goto yy18; yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy40: + if (yych != '{') goto yy18; ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy40; - if (yych <= ':') goto yy66; - goto yy18; -yy42: - yych = *++YYCURSOR; - if (yych == ';') goto yy67; - goto yy18; -yy43: - yych = *++YYCURSOR; - if (yych == '.') goto yy45; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy46; - goto yy18; -yy44: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych != '.') goto yy18; - } else { - if (yych <= '9') goto yy46; - if (yych == 'I') goto yy48; - goto yy18; + { + zend_long elements = parse_iv(start + 2); + /* use iv() not uiv() in order to check data range */ + *p = YYCURSOR; + if (!var_hash) return 0; + + if (elements < 0 || elements >= HT_MAX_SIZE) { + return 0; } -yy45: - yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy69; - goto yy18; -yy46: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); - yych = *YYCURSOR; - if (yych <= ':') { - if (yych <= '.') { - if (yych <= '-') goto yy18; - goto yy69; - } else { - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy46; - goto yy18; - } - } else { - if (yych <= 'E') { - if (yych <= ';') goto yy71; - if (yych <= 'D') goto yy18; - goto yy73; - } else { - if (yych == 'e') goto yy73; - goto yy18; - } + + array_init_size(rval, elements); + if (elements) { + /* we can't convert from packed to hash during unserialization, because + reference to some zvals might be keept in var_hash (to support references) */ + zend_hash_real_init(Z_ARRVAL_P(rval), 0); } -yy48: - yych = *++YYCURSOR; - if (yych == 'N') goto yy74; - goto yy18; -yy49: - yych = *++YYCURSOR; - if (yych == 'A') goto yy75; - goto yy18; -yy50: + + if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) { + return 0; + } + + return finish_nested_data(UNSERIALIZE_PASSTHRU); +} +yy39: yych = *++YYCURSOR; + if (yych == '+') goto yy40; if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy51: - ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy51; - if (yych == ';') goto yy76; + if (yych <= '9') goto yy41; goto yy18; -yy53: +yy40: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy54: +yy41: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy54; - if (yych <= ':') goto yy78; - goto yy18; -yy56: + if (yych <= '9') goto yy41; + if (yych >= ';') goto yy18; yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy57: + if (yych != '"') goto yy18; ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + { + size_t len, maxlen; + zend_string *str; + + len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len) { + *p = start + 2; + return 0; + } + + if ((str = unserialize_str(&YYCURSOR, len, maxlen)) == NULL) { + return 0; + } + + if (*(YYCURSOR) != '"') { + zend_string_free(str); + *p = YYCURSOR; + return 0; + } + + if (*(YYCURSOR + 1) != ';') { + efree(str); + *p = YYCURSOR + 1; + return 0; + } + + YYCURSOR += 2; + *p = YYCURSOR; + + ZVAL_STR(rval, str); + return 1; +} +yy46: + yych = *++YYCURSOR; + if (yych == '+') goto yy47; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy57; - if (yych == ';') goto yy79; + if (yych <= '9') goto yy48; goto yy18; -yy59: +yy47: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy60: +yy48: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy60; - if (yych <= ':') goto yy81; - goto yy18; -yy62: + if (yych <= '9') goto yy48; + if (yych >= ';') goto yy18; yych = *++YYCURSOR; - if (yych == '"') goto yy82; - goto yy18; -yy63: + if (yych != '"') goto yy18; ++YYCURSOR; { - zend_long id; - - *p = YYCURSOR; - if (!var_hash) return 0; + size_t len, maxlen; + char *str; - id = parse_iv(start + 2) - 1; - if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { + len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len) { + *p = start + 2; return 0; } - zval_ptr_dtor(rval); - if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { - ZVAL_UNDEF(rval); - return 1; + str = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; } - if (Z_ISREF_P(rval_ref)) { - ZVAL_COPY(rval, rval_ref); - } else { - ZVAL_NEW_REF(rval_ref, rval_ref); - ZVAL_COPY(rval, rval_ref); + + if (*(YYCURSOR + 1) != ';') { + *p = YYCURSOR + 1; + return 0; } + YYCURSOR += 2; + *p = YYCURSOR; + + ZVAL_STRINGL(rval, str, len); return 1; } -yy65: +yy53: + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych <= ',') { + if (yych == '+') goto yy57; + goto yy18; + } else { + if (yych <= '-') goto yy55; + if (yych <= '.') goto yy60; + goto yy18; + } + } else { + if (yych <= 'I') { + if (yych <= '9') goto yy58; + if (yych <= 'H') goto yy18; + goto yy56; + } else { + if (yych != 'N') goto yy18; + } + } yych = *++YYCURSOR; - if (yych == '"') goto yy84; + if (yych == 'A') goto yy76; goto yy18; -yy66: +yy55: + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych == '.') goto yy60; + goto yy18; + } else { + if (yych <= '9') goto yy58; + if (yych != 'I') goto yy18; + } +yy56: yych = *++YYCURSOR; - if (yych == '{') goto yy86; + if (yych == 'N') goto yy72; goto yy18; -yy67: +yy57: + yych = *++YYCURSOR; + if (yych == '.') goto yy60; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy58: ++YYCURSOR; - { - *p = YYCURSOR; - ZVAL_BOOL(rval, parse_iv(start + 2)); - return 1; -} -yy69: + if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); + yych = *YYCURSOR; + if (yych <= ':') { + if (yych <= '.') { + if (yych <= '-') goto yy18; + goto yy70; + } else { + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy58; + goto yy18; + } + } else { + if (yych <= 'E') { + if (yych <= ';') goto yy63; + if (yych <= 'D') goto yy18; + goto yy65; + } else { + if (yych == 'e') goto yy65; + goto yy18; + } + } +yy60: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy61: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; if (yych <= ';') { if (yych <= '/') goto yy18; - if (yych <= '9') goto yy69; + if (yych <= '9') goto yy61; if (yych <= ':') goto yy18; } else { if (yych <= 'E') { if (yych <= 'D') goto yy18; - goto yy73; + goto yy65; } else { - if (yych == 'e') goto yy73; + if (yych == 'e') goto yy65; goto yy18; } } -yy71: +yy63: ++YYCURSOR; { #if SIZEOF_ZEND_LONG == 4 @@ -1056,384 +1181,238 @@ ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } -yy73: +yy65: yych = *++YYCURSOR; if (yych <= ',') { - if (yych == '+') goto yy88; - goto yy18; + if (yych != '+') goto yy18; } else { - if (yych <= '-') goto yy88; + if (yych <= '-') goto yy66; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy89; + if (yych <= '9') goto yy67; goto yy18; } -yy74: +yy66: yych = *++YYCURSOR; - if (yych == 'F') goto yy91; + if (yych <= ',') { + if (yych == '+') goto yy69; + goto yy18; + } else { + if (yych <= '-') goto yy69; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; + } +yy67: + ++YYCURSOR; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy67; + if (yych == ';') goto yy63; goto yy18; -yy75: +yy69: yych = *++YYCURSOR; - if (yych == 'N') goto yy91; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy67; goto yy18; -yy76: +yy70: ++YYCURSOR; - { -#if SIZEOF_ZEND_LONG == 4 - int digits = YYCURSOR - start - 3; - - if (start[2] == '-' || start[2] == '+') { - digits--; - } - - /* Use double for large zend_long values that were serialized on a 64-bit system */ - if (digits >= MAX_LENGTH_OF_LONG - 1) { - if (digits == MAX_LENGTH_OF_LONG - 1) { - int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1); - - if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) { - goto use_double; - } + if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); + yych = *YYCURSOR; + if (yych <= ';') { + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy70; + if (yych <= ':') goto yy18; + goto yy63; + } else { + if (yych <= 'E') { + if (yych <= 'D') goto yy18; + goto yy65; } else { - goto use_double; + if (yych == 'e') goto yy65; + goto yy18; } } -#endif - *p = YYCURSOR; - ZVAL_LONG(rval, parse_iv(start + 2)); - return 1; -} -yy78: +yy72: yych = *++YYCURSOR; - if (yych == '"') goto yy92; - goto yy18; -yy79: + if (yych != 'F') goto yy18; +yy73: + yych = *++YYCURSOR; + if (yych != ';') goto yy18; ++YYCURSOR; { - zend_long id; - - *p = YYCURSOR; - if (!var_hash) return 0; - - id = parse_iv(start + 2) - 1; - if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { - return 0; - } - - if (rval_ref == rval) { - return 0; - } + *p = YYCURSOR; - if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { - ZVAL_UNDEF(rval); - return 1; + if (!strncmp((char*)start + 2, "NAN", 3)) { + ZVAL_DOUBLE(rval, php_get_nan()); + } else if (!strncmp((char*)start + 2, "INF", 3)) { + ZVAL_DOUBLE(rval, php_get_inf()); + } else if (!strncmp((char*)start + 2, "-INF", 4)) { + ZVAL_DOUBLE(rval, -php_get_inf()); + } else { + ZVAL_NULL(rval); } - ZVAL_COPY(rval, rval_ref); - return 1; } -yy81: +yy76: yych = *++YYCURSOR; - if (yych == '"') goto yy94; + if (yych == 'N') goto yy73; goto yy18; -yy82: +yy77: + yych = *++YYCURSOR; + if (yych <= ',') { + if (yych != '+') goto yy18; + } else { + if (yych <= '-') goto yy78; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy79; + goto yy18; + } +yy78: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy79: + ++YYCURSOR; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy79; + if (yych != ';') goto yy18; ++YYCURSOR; { - size_t len, len2, len3, maxlen; - zend_long elements; - char *str; - zend_string *class_name; - zend_class_entry *ce; - int incomplete_class = 0; - - int custom_object = 0; - - zval user_func; - zval retval; - zval args[1]; - - if (!var_hash) return 0; - if (*start == 'C') { - custom_object = 1; - } - - len2 = len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len || len == 0) { - *p = start + 2; - return 0; - } - - str = (char*)YYCURSOR; - - YYCURSOR += len; - - if (*(YYCURSOR) != '"') { - *p = YYCURSOR; - return 0; - } - if (*(YYCURSOR+1) != ':') { - *p = YYCURSOR+1; - return 0; - } +#if SIZEOF_ZEND_LONG == 4 + int digits = YYCURSOR - start - 3; - len3 = strspn(str, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\"); - if (len3 != len) - { - *p = YYCURSOR + len3 - len; - return 0; + if (start[2] == '-' || start[2] == '+') { + digits--; } - class_name = zend_string_init(str, len, 0); - - do { - if(!unserialize_allowed_class(class_name, var_hash)) { - incomplete_class = 1; - ce = PHP_IC_ENTRY; - break; - } - - /* Try to find class directly */ - BG(serialize_lock)++; - ce = zend_lookup_class(class_name); - if (ce) { - BG(serialize_lock)--; - if (EG(exception)) { - zend_string_release(class_name); - return 0; - } - break; - } - BG(serialize_lock)--; - - if (EG(exception)) { - zend_string_release(class_name); - return 0; - } - - /* Check for unserialize callback */ - if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { - incomplete_class = 1; - ce = PHP_IC_ENTRY; - break; - } - - /* Call unserialize callback */ - ZVAL_STRING(&user_func, PG(unserialize_callback_func)); + /* Use double for large zend_long values that were serialized on a 64-bit system */ + if (digits >= MAX_LENGTH_OF_LONG - 1) { + if (digits == MAX_LENGTH_OF_LONG - 1) { + int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1); - ZVAL_STR_COPY(&args[0], class_name); - BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) { - BG(serialize_lock)--; - if (EG(exception)) { - zend_string_release(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - return 0; + if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) { + goto use_double; } - php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); - incomplete_class = 1; - ce = PHP_IC_ENTRY; - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - break; - } - BG(serialize_lock)--; - zval_ptr_dtor(&retval); - if (EG(exception)) { - zend_string_release(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - return 0; - } - - /* The callback function may have defined the class */ - BG(serialize_lock)++; - if ((ce = zend_lookup_class(class_name)) == NULL) { - php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); - incomplete_class = 1; - ce = PHP_IC_ENTRY; - } - BG(serialize_lock)--; - - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - break; - } while (1); - - *p = YYCURSOR; - - if (custom_object) { - int ret; - - ret = object_custom(UNSERIALIZE_PASSTHRU, ce); - - if (ret && incomplete_class) { - php_store_class_name(rval, ZSTR_VAL(class_name), len2); + } else { + goto use_double; } - zend_string_release(class_name); - return ret; - } - - elements = object_common1(UNSERIALIZE_PASSTHRU, ce); - - if (elements < 0) { - zend_string_release(class_name); - return 0; } - - if (incomplete_class) { - php_store_class_name(rval, ZSTR_VAL(class_name), len2); - } - zend_string_release(class_name); - - return object_common2(UNSERIALIZE_PASSTHRU, elements); +#endif + *p = YYCURSOR; + ZVAL_LONG(rval, parse_iv(start + 2)); + return 1; } -yy84: +yy83: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych >= '2') goto yy18; + yych = *++YYCURSOR; + if (yych != ';') goto yy18; ++YYCURSOR; { - size_t len, maxlen; - zend_string *str; - - len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len) { - *p = start + 2; - return 0; - } - - if ((str = unserialize_str(&YYCURSOR, len, maxlen)) == NULL) { - return 0; - } - - if (*(YYCURSOR) != '"') { - zend_string_free(str); - *p = YYCURSOR; - return 0; - } - - if (*(YYCURSOR + 1) != ';') { - efree(str); - *p = YYCURSOR + 1; - return 0; - } - - YYCURSOR += 2; *p = YYCURSOR; - - ZVAL_STR(rval, str); + ZVAL_BOOL(rval, parse_iv(start + 2)); return 1; } -yy86: +yy87: ++YYCURSOR; { - zend_long elements = parse_iv(start + 2); - /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; - if (!var_hash) return 0; - - if (elements < 0) { - return 0; - } - - array_init_size(rval, elements); - if (elements) { - /* we can't convert from packed to hash during unserialization, because - reference to some zvals might be keept in var_hash (to support references) */ - zend_hash_real_init(Z_ARRVAL_P(rval), 0); - } - - if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) { - return 0; - } - - return finish_nested_data(UNSERIALIZE_PASSTHRU); + ZVAL_NULL(rval); + return 1; } -yy88: +yy89: yych = *++YYCURSOR; if (yych <= ',') { - if (yych == '+') goto yy96; - goto yy18; + if (yych != '+') goto yy18; } else { - if (yych <= '-') goto yy96; + if (yych <= '-') goto yy90; if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; + if (yych <= '9') goto yy91; + goto yy18; } -yy89: +yy90: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy91: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy89; - if (yych == ';') goto yy71; - goto yy18; -yy91: - yych = *++YYCURSOR; - if (yych == ';') goto yy97; - goto yy18; -yy92: + if (yych <= '9') goto yy91; + if (yych != ';') goto yy18; ++YYCURSOR; { - long elements; - if (!var_hash) return 0; + zend_long id; - elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); - if (elements < 0) { - return 0; - } - return object_common2(UNSERIALIZE_PASSTHRU, elements); -} -yy94: - ++YYCURSOR; - { - size_t len, maxlen; - char *str; + *p = YYCURSOR; + if (!var_hash) return 0; - len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len) { - *p = start + 2; + id = parse_iv(start + 2) - 1; + if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { return 0; } - str = (char*)YYCURSOR; - - YYCURSOR += len; - - if (*(YYCURSOR) != '"') { - *p = YYCURSOR; + if (rval_ref == rval) { return 0; } - if (*(YYCURSOR + 1) != ';') { - *p = YYCURSOR + 1; - return 0; + if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { + ZVAL_UNDEF(rval); + return 1; } - YYCURSOR += 2; - *p = YYCURSOR; + ZVAL_COPY(rval, rval_ref); - ZVAL_STRINGL(rval, str, len); return 1; } +yy95: + yych = *++YYCURSOR; + if (yych <= ',') { + if (yych != '+') goto yy18; + } else { + if (yych <= '-') goto yy96; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy97; + goto yy18; + } yy96: yych = *++YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy89; - goto yy18; + if (yych >= ':') goto yy18; yy97: ++YYCURSOR; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy97; + if (yych != ';') goto yy18; + ++YYCURSOR; { - *p = YYCURSOR; + zend_long id; - if (!strncmp((char*)start + 2, "NAN", 3)) { - ZVAL_DOUBLE(rval, php_get_nan()); - } else if (!strncmp((char*)start + 2, "INF", 3)) { - ZVAL_DOUBLE(rval, php_get_inf()); - } else if (!strncmp((char*)start + 2, "-INF", 4)) { - ZVAL_DOUBLE(rval, -php_get_inf()); + *p = YYCURSOR; + if (!var_hash) return 0; + + id = parse_iv(start + 2) - 1; + if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { + return 0; + } + + zval_ptr_dtor(rval); + if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { + ZVAL_UNDEF(rval); + return 1; + } + if (Z_ISREF_P(rval_ref)) { + ZVAL_COPY(rval, rval_ref); } else { - ZVAL_NULL(rval); + ZVAL_NEW_REF(rval_ref, rval_ref); + ZVAL_COPY(rval, rval_ref); } return 1; diff -Nru php7.1-7.1.6/ext/standard/var_unserializer.re php7.1-7.1.8/ext/standard/var_unserializer.re --- php7.1-7.1.6/ext/standard/var_unserializer.re 2017-06-07 08:09:31.000000000 +0000 +++ php7.1-7.1.8/ext/standard/var_unserializer.re 2017-08-01 17:36:51.000000000 +0000 @@ -477,13 +477,12 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER) { - if (*((*p)++) == '}') - return 1; + if (*p >= max || **p != '}') { + return 0; + } -#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE - zval_ptr_dtor(rval); -#endif - return 0; + (*p)++; + return 1; } static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) @@ -552,6 +551,10 @@ && zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1); ht = Z_OBJPROP_P(rval); + if (elements >= HT_MAX_SIZE - zend_hash_num_elements(ht)) { + return 0; + } + zend_hash_extend(ht, zend_hash_num_elements(ht) + elements, (ht->u.flags & HASH_FLAG_PACKED)); if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) { if (has_wakeup) { @@ -808,7 +811,7 @@ *p = YYCURSOR; if (!var_hash) return 0; - if (elements < 0) { + if (elements < 0 || elements >= HT_MAX_SIZE) { return 0; } @@ -827,11 +830,11 @@ } "o:" iv ":" ["] { - long elements; + zend_long elements; if (!var_hash) return 0; elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); - if (elements < 0) { + if (elements < 0 || elements >= HT_MAX_SIZE) { return 0; } return object_common2(UNSERIALIZE_PASSTHRU, elements); diff -Nru php7.1-7.1.6/ext/wddx/tests/bug73173.phpt php7.1-7.1.8/ext/wddx/tests/bug73173.phpt --- php7.1-7.1.6/ext/wddx/tests/bug73173.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/wddx/tests/bug73173.phpt 2017-08-01 17:36:48.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #73173: huge memleak when wddx_unserialize +--SKIPIF-- + +--FILE-- + + + + + +XML; +var_dump(wddx_deserialize($xml)); + +?> +--EXPECT-- +NULL diff -Nru php7.1-7.1.6/ext/wddx/tests/bug74145.phpt php7.1-7.1.8/ext/wddx/tests/bug74145.phpt --- php7.1-7.1.6/ext/wddx/tests/bug74145.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/wddx/tests/bug74145.phpt 2017-08-01 17:36:48.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +Bug #74145 (wddx parsing empty boolean tag leads to SIGSEGV) +--SKIPIF-- + +--FILE-- + +DONE +--EXPECTF-- +NULL +DONE \ No newline at end of file diff -Nru php7.1-7.1.6/ext/wddx/tests/bug74145.xml php7.1-7.1.8/ext/wddx/tests/bug74145.xml --- php7.1-7.1.6/ext/wddx/tests/bug74145.xml 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/wddx/tests/bug74145.xml 2017-08-01 17:36:48.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru php7.1-7.1.6/ext/wddx/wddx.c php7.1-7.1.8/ext/wddx/wddx.c --- php7.1-7.1.6/ext/wddx/wddx.c 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/ext/wddx/wddx.c 2017-08-01 17:36:48.000000000 +0000 @@ -241,6 +241,9 @@ } efree(stack->elements); } + if (stack->varname) { + efree(stack->varname); + } return SUCCESS; } /* }}} */ @@ -471,10 +474,6 @@ */ if (call_user_function_ex(CG(function_table), obj, &fname, &retval, 0, 0, 1, NULL) == SUCCESS) { if (!Z_ISUNDEF(retval) && (sleephash = HASH_OF(&retval))) { - PHP_CLASS_ATTRIBUTES; - - PHP_SET_CLASS_ATTRIBUTES(obj); - php_wddx_add_chunk_static(packet, WDDX_STRUCT_S); snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, PHP_CLASS_NAME_VAR); php_wddx_add_chunk(packet, tmp_buf); @@ -762,19 +761,16 @@ } else if (!strcmp((char *)name, EL_BOOLEAN)) { int i; + ent.type = ST_BOOLEAN; + SET_STACK_VARNAME; if (atts) for (i = 0; atts[i]; i++) { if (!strcmp((char *)atts[i], EL_VALUE) && atts[i+1] && atts[i+1][0]) { - ent.type = ST_BOOLEAN; - SET_STACK_VARNAME; - ZVAL_TRUE(&ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); php_wddx_process_data(user_data, atts[i+1], strlen((char *)atts[i+1])); break; } } else { - ent.type = ST_BOOLEAN; - SET_STACK_VARNAME; ZVAL_FALSE(&ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); } Binary files /tmp/tmpF6lqJH/ZLhZG9Uhj6/php7.1-7.1.6/ext/zlib/tests/bug73944_fixture1 and /tmp/tmpF6lqJH/Id1YO4MrVJ/php7.1-7.1.8/ext/zlib/tests/bug73944_fixture1 differ Binary files /tmp/tmpF6lqJH/ZLhZG9Uhj6/php7.1-7.1.6/ext/zlib/tests/bug73944_fixture2 and /tmp/tmpF6lqJH/Id1YO4MrVJ/php7.1-7.1.8/ext/zlib/tests/bug73944_fixture2 differ diff -Nru php7.1-7.1.6/ext/zlib/tests/bug73944.phpt php7.1-7.1.8/ext/zlib/tests/bug73944.phpt --- php7.1-7.1.6/ext/zlib/tests/bug73944.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.8/ext/zlib/tests/bug73944.phpt 2017-08-01 17:36:49.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +Bug #73944: Dictionary option of intflate_init() does not work +--FILE-- + str_repeat("\00", 32768))); +$a = inflate_add($in, file_get_contents(__DIR__.'/bug73944_fixture1')); +echo '1 block: '.strlen($a).PHP_EOL; + +$in = inflate_init(ZLIB_ENCODING_RAW, array('dictionary' => $a)); +$b = inflate_add($in, file_get_contents(__DIR__.'/bug73944_fixture2')); +echo '2 block: '.($b === false ? 'failed' : strlen($b)).PHP_EOL; + +?> +--EXPECTF-- +1 block: 32768 +2 block: 32768 diff -Nru php7.1-7.1.6/ext/zlib/zlib.c php7.1-7.1.8/ext/zlib/zlib.c --- php7.1-7.1.6/ext/zlib/zlib.c 2017-06-07 08:09:29.000000000 +0000 +++ php7.1-7.1.8/ext/zlib/zlib.c 2017-08-01 17:36:49.000000000 +0000 @@ -761,24 +761,6 @@ switch (Z_TYPE_P(option_buffer)) { case IS_STRING: { zend_string *str = Z_STR_P(option_buffer); - size_t i; - zend_bool last_null = 1; - - for (i = 0; i < ZSTR_LEN(str); i++) { - if (ZSTR_VAL(str)[i]) { - last_null = 0; - } else { - if (last_null) { - php_error_docref(NULL, E_WARNING, "dictionary string must not contain empty entries (two consecutive NULL-bytes or one at the very beginning)"); - return 0; - } - last_null = 1; - } - } - if (!last_null) { - php_error_docref(NULL, E_WARNING, "dictionary string must be NULL-byte terminated (each dictionary entry has to be NULL-terminated)"); - } - *dict = emalloc(ZSTR_LEN(str)); memcpy(*dict, ZSTR_VAL(str), ZSTR_LEN(str)); *dictlen = ZSTR_LEN(str); @@ -894,6 +876,21 @@ } if (Z_OK == inflateInit2(ctx, encoding)) { + if (encoding == PHP_ZLIB_ENCODING_RAW && dictlen > 0) { + php_zlib_context *php_ctx = (php_zlib_context *) ctx; + switch (inflateSetDictionary(ctx, (Bytef *) php_ctx->inflateDict, php_ctx->inflateDictlen)) { + case Z_OK: + efree(php_ctx->inflateDict); + php_ctx->inflateDict = NULL; + break; + case Z_DATA_ERROR: + php_error_docref(NULL, E_WARNING, "dictionary does not match expected dictionary (incorrect adler32 hash)"); + efree(php_ctx->inflateDict); + php_ctx->inflateDict = NULL; + RETURN_FALSE; + EMPTY_SWITCH_DEFAULT_CASE() + } + } RETURN_RES(zend_register_resource(ctx, le_inflate)); } else { efree(ctx); diff -Nru php7.1-7.1.6/main/network.c php7.1-7.1.8/main/network.c --- php7.1-7.1.6/main/network.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/main/network.c 2017-08-01 17:36:55.000000000 +0000 @@ -661,7 +661,7 @@ if (ua->sun_path[0] == '\0') { /* abstract name */ - int len = strlen(ua->sun_path + 1) + 1; + int len = sl - sizeof(sa_family_t); *textaddr = zend_string_init((char*)ua->sun_path, len, 0); } else { int len = strlen(ua->sun_path); diff -Nru php7.1-7.1.6/main/php_ini.c php7.1-7.1.8/main/php_ini.c --- php7.1-7.1.6/main/php_ini.c 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/main/php_ini.c 2017-08-01 17:36:55.000000000 +0000 @@ -280,7 +280,7 @@ size_t key_len; /* PATH sections */ - if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { + if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) { key = Z_STRVAL_P(arg1); key = key + sizeof("PATH") - 1; key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1; @@ -291,7 +291,7 @@ TRANSLATE_SLASHES_LOWER(key); /* HOST sections */ - } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { + } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) { key = Z_STRVAL_P(arg1); key = key + sizeof("HOST") - 1; key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; @@ -328,7 +328,9 @@ zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1); entry = zend_hash_str_update(target_hash, key, key_len, §ion_arr); } - active_ini_hash = Z_ARRVAL_P(entry); + if (Z_TYPE_P(entry) == IS_ARRAY) { + active_ini_hash = Z_ARRVAL_P(entry); + } } } break; diff -Nru php7.1-7.1.6/main/php_version.h php7.1-7.1.8/main/php_version.h --- php7.1-7.1.6/main/php_version.h 2017-06-07 08:09:36.000000000 +0000 +++ php7.1-7.1.8/main/php_version.h 2017-08-01 17:36:55.000000000 +0000 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 6 +#define PHP_RELEASE_VERSION 8 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "7.1.6" -#define PHP_VERSION_ID 70106 +#define PHP_VERSION "7.1.8" +#define PHP_VERSION_ID 70108 diff -Nru php7.1-7.1.6/NEWS php7.1-7.1.8/NEWS --- php7.1-7.1.6/NEWS 2017-06-07 08:09:28.000000000 +0000 +++ php7.1-7.1.8/NEWS 2017-08-01 17:36:48.000000000 +0000 @@ -1,6 +1,131 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -7 Jun 2017, PHP 7.1.6 +03 Aug 2017, PHP 7.1.8 + +- Core: + . Fixed bug #74832 (Loading PHP extension with already registered function + name leads to a crash). (jpauli) + . Fixed bug #74780 (parse_url() broken when query string contains colon). + (jhdxr) + . Fixed bug #74761 (Unary operator expected error on some systems). (petk) + . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) + . Fixed bug #74923 (Crash when crawling through network share). (Anatol) + . Fixed bug #74913 (fixed incorrect poll.h include). (petk) + . Fixed bug #74906 (fixed incorrect errno.h include). (petk) + +- Date: + . Fixed bug #74852 (property_exists returns true on unknown DateInterval + property). (jhdxr) + +- OCI8: + . Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge) + +- Opcache: + . Fixed bug #74623 (Infinite loop in type inference when using HTMLPurifier). + (nikic) + +- OpenSSL: + . Fixed bug #74798 (pkcs7_en/decrypt does not work if \x0a is used in content). + (Anatol) + . Added OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding and fix bug + #71917 (openssl_open() returns junk on envelope < 16 bytes) and bug #72362 + (OpenSSL Blowfish encryption is incorrect for short keys). (Jakub Zelenka) + +- PDO: + . Fixed bug #69356 (PDOStatement::debugDumpParams() truncates query). (Adam + Baratz) + +- SPL: + . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr) + +- SQLite3: + . Fixed bug #74883 (SQLite3::__construct() produces "out of memory" exception + with invalid flags). (Anatol) + +- Wddx: + . Fixed bug #73173 (huge memleak when wddx_unserialize). + (tloi at fortinet dot com) + +- zlib: + . Fixed bug #73944 (dictionary option of inflate_init() does not work). + (wapmorgan) + +06 Jul 2017, PHP 7.1.7 + +- Core: + . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly + parsed). (Manuel Mausz) + . Fixed bug #74658 (Undefined constants in array properties result in broken + properties). (Laruence) + . Fixed misparsing of abstract unix domain socket names. (Sara) + . Fixed bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability). + (Stas) + . Fixed bug #74101, bug #74614 (Unserialize Heap Use-After-Free (READ: 1) in + zval_get_type). (Nikita) + . Fixed bug #74111 (Heap buffer overread (READ: 1) finish_nested_data from + unserialize). (Nikita) + . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via + php_parse_date()). (Derick) + +- Date: + . Fixed bug #74639 (implement clone for DatePeriod and DateInterval). + (andrewnester) + +- DOM: + . Fixed bug #69373 (References to deleted XPath query results). (ttoohey) + +- GD: + . Fixed bug #74435 (Buffer over-read into uninitialized memory). (cmb) + +- Intl: + . Fixed bug #73473 (Stack Buffer Overflow in msgfmt_parse_message). (libnex) + . Fixed bug #74705 (Wrong reflection on Collator::getSortKey and + collator_get_sort_key). (Tyson Andre, Remi) + +- Mbstring: + . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227, + CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA) + +- OCI8: + . Add TAF callback (PR #2459). (KoenigsKind) + +- Opcache: + . Fixed bug #74663 (Segfault with opcache.memory_protect and + validate_timestamp). (Laruence) + . Revert opcache.enable_cli to default disabled. (Nikita) + +- OpenSSL: + . Fixed bug #74720 (pkcs7_en/decrypt does not work if \x1a is used in + content). (Anatol) + . Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()). + (Stas) + +- PDO_OCI: + . Support Instant Client 12.2 in --with-pdo-oci configure option. + (Tianfang Yang) + +- Reflection: + . Fixed bug #74673 (Segfault when cast Reflection object to string with + undefined constant). (Laruence) + +- SPL: + . Fixed bug #74478 (null coalescing operator failing with SplFixedArray). + (jhdxr) + +- FTP: + . Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara) + +- PHAR: + . Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa) + +- SOAP + . Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY). + (Dmitry) + +- Streams: + . Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara) + +8 Jun 2017, PHP 7.1.6 - Core: . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i). @@ -239,6 +364,8 @@ anonymous classes). (Adam Saponara) . Fixed bug #74105 (PHP on Linux should use /dev/urandom when getrandom is not available). (Benjamin Robin) + . Fixed bug #74708 (Invalid Reflection signatures for random_bytes and + random_int). (Tyson Andre, Remi) - Streams: . Fixed bug #73496 (Invalid memory access in zend_inline_hash_func). diff -Nru php7.1-7.1.6/pear/install-pear-nozlib.phar php7.1-7.1.8/pear/install-pear-nozlib.phar --- php7.1-7.1.6/pear/install-pear-nozlib.phar 2017-04-26 18:58:41.000000000 +0000 +++ php7.1-7.1.8/pear/install-pear-nozlib.phar 2017-06-27 12:35:56.000000000 +0000 @@ -1269,9 +1269,8 @@ require_once 'phar://install-pear-nozlib.phar/index.php'; -__HALT_COMPILER();Finstall-pear-nozlib.pharArchive/Tar.php3EY3E@κmArchive_Tar-1.4.2.tarYdmConsole/Getopt.php4Y4XQ2mConsole_Getopt-1.4.1.tartYtHm index.phpL+YL+5pZm OS/Guess.php)Y)/ mPEAR-1.10.4.tar Y @mPEAR.phpYFZFmPEAR/ChannelFile.phpY QmPEAR/ChannelFile/Parser.phpYj(mPEAR/Command.php0Y0*mPEAR/Command/Common.phpB YB .mPEAR/Command/Install.phpYXmPEAR/Command/Install.xml~!Y~!2VmPEAR/Common.phphYhemPEAR/Config.phpdYd:ShmPEAR/Dependency2.phpY#mPEAR/DependencyDB.phpB^YB^EmPEAR/Downloader.php4Y4mPEAR/Downloader/Package.php*Y*cmPEAR/ErrorStack.php)Y)~)-mPEAR/Frontend.phpYU!mPEAR/Frontend/CLI.phpqdYqdՔ\mPEAR/Installer.phpYmmPEAR/Installer/Role.php*Y*gmPEAR/Installer/Role/Common.phpFYFA$mPEAR/Installer/Role/Data.phpYNĂmPEAR/Installer/Role/Data.xmlYfszmPEAR/Installer/Role/Doc.php Y y:.mPEAR/Installer/Role/Doc.xmlYh&P*mPEAR/Installer/Role/Php.php Y 7PmPEAR/Installer/Role/Php.xmlYzqmPEAR/Installer/Role/Script.phpYކmPEAR/Installer/Role/Script.xmlY@vmPEAR/Installer/Role/Test.phpY8PmPEAR/Installer/Role/Test.xmlYB] mPEAR/PackageFile.php>Y>pm!PEAR/PackageFile/Generator/v1.phpY m!PEAR/PackageFile/Generator/v2.php5Y5ymPEAR/PackageFile/Parser/v1.php@Y@EmPEAR/PackageFile/Parser/v2.php Y 9mPEAR/PackageFile/v1.php%Y%BmPEAR/PackageFile/v2.phpYYYvCm!PEAR/PackageFile/v2/Validator.phpzLYzLJB`bmPEAR/Proxy.phpqYqQj}mPEAR/Registry.php^*Y^*´m PEAR/REST.php>BY>BE8mPEAR/REST/10.phpYVY>VNmPEAR/Validator/PECL.php]Y]vmPEAR/XMLParser.phpHYHJ-YqmStructures/Graph.phpiYiC}m,Structures/Graph/Manipulator/AcyclicTest.phpY1m2Structures/Graph/Manipulator/TopologicalSorter.phpYv?mStructures/Graph/Node.phpj+Yj+]#imStructures_Graph-1.1.1.tar6Y6jm -System.phpOYOm XML/Util.php}Y},mXML_Util-1.4.2.tar:Y:WmLRY>Um!PEAR/PackageFile/Generator/v1.phpLRYm!PEAR/PackageFile/Generator/v2.php5LRY5H0mPEAR/PackageFile/Parser/v1.php@LRY@v&mPEAR/PackageFile/Parser/v2.php LRY ]mPEAR/PackageFile/v1.php%LRY%8smPEAR/PackageFile/v2.phpYLRYYK m!PEAR/PackageFile/v2/Validator.phpzLLRYzL̘mPEAR/Proxy.phpqLRYqQj}mPEAR/Registry.php^*LRY^*0 m PEAR/REST.php>BLRY>B|')mPEAR/REST/10.phpLRYmPEAR/Start.php :LRY :mPEAR/Start/CLI.phpTSLRYTS$\dmPEAR/Task/Common.phpCLRYC9mPEAR/Task/Postinstallscript.php9LRY9]m"PEAR/Task/Postinstallscript/rw.php@LRY@ZWmPEAR/Task/Replace.phpLRY#5mPEAR/Task/Replace/rw.php;LRY;ZmPEAR/Task/Unixeol.php# LRY# /,@mPEAR/Task/Unixeol/rw.php@LRY@$mPEAR/Task/Windowseol.php LRY ҵmPEAR/Task/Windowseol/rw.phpMLRYMmPEAR/Validate.php>VLRY>VmPEAR/Validator/PECL.php]LRY]6NmPEAR/XMLParser.phpHLRYHڶmStructures/Graph.phpiLRYiC}m,Structures/Graph/Manipulator/AcyclicTest.phpLRY1m2Structures/Graph/Manipulator/TopologicalSorter.phpLRYv?mStructures/Graph/Node.phpj+LRYj+]#imStructures_Graph-1.1.1.tar6LRY6jm +System.phpOLRYOm XML/Util.php}LRY},mXML_Util-1.4.2.tar:LRY:Wm - +package.xml0000644000175000017500000003524613117276643013025 0ustar michielmichiel + Archive_Tar pear.php.net Tar file management class @@ -3725,10 +3724,10 @@ stig@php.net no - 2016-02-25 - + 2017-06-11 + - 1.4.2 + 1.4.3 1.4.0 @@ -3737,13 +3736,12 @@ New BSD License -* Fix reading of archives with files > 8GB -* Performance optimizations -* Do not try to call require_once on PEAR.php if it has already been loaded by the autoloader +* Fix Bug #21218: Cannot use result of built-in function in write context in PHP + 7.2.0alpha1 [mrook] - + @@ -3767,6 +3765,23 @@ + 1.4.2 + 1.4.0 + + + stable + stable + + 2016-02-25 + New BSD License + +* Fix reading of archives with files > 8GB +* Performance optimizations +* Do not try to call require_once on PEAR.php if it has already been loaded by the autoloader + + + + 1.4.1 1.4.0 @@ -4216,7 +4231,7 @@ -Archive_Tar-1.4.2/Archive/Tar.php0000664000175000017500000024241612663553324016357 0ustar michielmichiel 'phar://install-pear-nozlib.phar/Archive_Tar-1.4.2.tar', +$install_files = array('Archive_Tar' => 'phar://install-pear-nozlib.phar/Archive_Tar-1.4.3.tar', 'Console_Getopt' => 'phar://install-pear-nozlib.phar/Console_Getopt-1.4.1.tar', 'Structures_Graph' => 'phar://install-pear-nozlib.phar/Structures_Graph-1.1.1.tar', 'XML_Util' => 'phar://install-pear-nozlib.phar/XML_Util-1.4.2.tar', -'PEAR' => 'phar://install-pear-nozlib.phar/PEAR-1.10.4.tar', +'PEAR' => 'phar://install-pear-nozlib.phar/PEAR-1.10.5.tar', ); array_shift($argv); $debug = false; @@ -8721,7 +8736,7 @@ * @author Gregory Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -8970,7 +8985,7 @@ * c-basic-offset: 4 * End: */ -package.xml0000664000175000017500000015242413100165201013042 0ustar ashnazgashnazg +package.xml0000664000175000017500000015317113124445427013063 0ustar ashnazgashnazg PEAR pear.php.net @@ -9065,10 +9080,10 @@ mj@php.net no - 2017-04-26 - + 2017-06-27 + - 1.10.4 + 1.10.5 1.10.1 @@ -9077,43 +9092,41 @@ New BSD License -* Bug #18102: pear install does not fail on error - -* PR #67: fix warning during pecl list-all +* Bug #21222: PHP 7.2 compatibility: Upgrade to Archive_Tar 1.4.3 needed - + - + - + - + - + - + - + - + - + @@ -9122,77 +9135,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9201,115 +9214,115 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9366,11 +9379,11 @@ - + - + @@ -9388,7 +9401,7 @@ Archive_Tar pear.php.net 1.4.0 - 1.4.2 + 1.4.3 Structures_Graph @@ -10107,9 +10120,24 @@ * Bug #21188: Class 'PEAR_Proxy' not found + + 2017-04-25 + + 1.10.4 + 1.10.1 + + + stable + stable + + New BSD License + +* Bug #18102: pear install does not fail on error + + -PEAR-1.10.4/OS/Guess.php0000664000175000017500000002453213100165201014311 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -10446,7 +10474,7 @@ * c-basic-offset: 4 * End: */ -PEAR-1.10.4/PEAR/ChannelFile/Parser.php0000664000175000017500000000325313100165201017032 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -10512,7 +10540,7 @@ $ret->setPackagefile($file, $archive); return $ret; } -}PEAR-1.10.4/PEAR/Command/Auth.xml0000664000175000017500000000231413100165201015713 0ustar ashnazgashnazg +}PEAR-1.10.5/PEAR/Command/Auth.xml0000664000175000017500000000231413124445427015735 0ustar ashnazgashnazg Connects and authenticates to remote server [Deprecated in favor of channel-login] doLogin @@ -10541,7 +10569,7 @@ connect to the remote server, it only deletes the stored username and password from your user configuration. -PEAR-1.10.4/PEAR/Command/Auth.php0000664000175000017500000000501213100165201015700 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Auth.php0000664000175000017500000000501213124445427015722 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 * @deprecated since 1.8.0alpha1 @@ -10621,7 +10649,7 @@ parent::__construct($ui, $config); } } -PEAR-1.10.4/PEAR/Command/Build.xml0000664000175000017500000000040413100165201016047 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Build.xml0000664000175000017500000000040413124445427016071 0ustar ashnazgashnazg Build an Extension From C Source doBuild @@ -10630,7 +10658,7 @@ [package.xml] Builds one or more extensions contained in a package. -PEAR-1.10.4/PEAR/Command/Build.php0000664000175000017500000000432613100165201016045 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Build.php0000664000175000017500000000432613124445427016067 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -10714,7 +10742,7 @@ } } } -PEAR-1.10.4/PEAR/Command/Channels.xml0000664000175000017500000001017213100165201016546 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Channels.xml0000664000175000017500000001017213124445427016570 0ustar ashnazgashnazg List Available Channels doList @@ -10836,7 +10864,7 @@ remote server, it only deletes the stored username and password from your user configuration. -PEAR-1.10.4/PEAR/Command/Channels.php0000664000175000017500000010124413100165201016536 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Channels.php0000664000175000017500000010124413124445427016560 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -11718,7 +11746,7 @@ return true; } } -PEAR-1.10.4/PEAR/Command/Common.php0000664000175000017500000002003513100165201016231 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -11990,7 +12018,7 @@ return $this->$func($command, $options, $params); } } -PEAR-1.10.4/PEAR/Command/Config.xml0000664000175000017500000000646613100165201016233 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Config.xml0000664000175000017500000000646613124445427016255 0ustar ashnazgashnazg Show All Settings doConfigShow @@ -12081,7 +12109,7 @@ and uninstall). -PEAR-1.10.4/PEAR/Command/Config.php0000664000175000017500000003615213100165201016215 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Config.php0000664000175000017500000003615213124445427016237 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -12495,7 +12523,7 @@ return false; } } -PEAR-1.10.4/PEAR/Command/Install.xml0000664000175000017500000002057613100165201016432 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Install.xml0000664000175000017500000002057613124445427016454 0ustar ashnazgashnazg Install Package doInstall @@ -12770,7 +12798,7 @@ Run post-installation scripts in package <package>, if any exist. -PEAR-1.10.4/PEAR/Command/Install.php0000664000175000017500000014310713100165201016415 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Install.php0000664000175000017500000014310713124445427016437 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -14038,7 +14066,7 @@ return $ret; } } -PEAR-1.10.4/PEAR/Command/Mirror.xml0000664000175000017500000000115113100165201016262 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Mirror.xml0000664000175000017500000000115113124445427016304 0ustar ashnazgashnazg Downloads each available package from the default channel doDownloadAll @@ -14055,7 +14083,7 @@ and downloads them to current working directory. Note: only packages within preferred_state ({config preferred_state}) will be downloaded -PEAR-1.10.4/PEAR/Command/Mirror.php0000664000175000017500000001063513100165201016260 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Mirror.php0000664000175000017500000001063513124445427016302 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.2.0 */ @@ -14193,7 +14221,7 @@ return true; } } -PEAR-1.10.4/PEAR/Command/Package.xml0000664000175000017500000001606613100165201016356 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Package.xml0000664000175000017500000001606613124445427016400 0ustar ashnazgashnazg Build Package doPackage @@ -14429,7 +14457,7 @@ used for automated conversion or learning the format. -PEAR-1.10.4/PEAR/Command/Package.php0000664000175000017500000011643113100165201016342 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Package.php0000664000175000017500000011643113124445427016364 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Pickle.xml0000664000175000017500000000223313124445427016243 0ustar ashnazgashnazg Build PECL Package doPackage @@ -15587,7 +15615,7 @@ generate both package.xml. -PEAR-1.10.4/PEAR/Command/Pickle.php0000664000175000017500000003702613100165201016220 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Pickle.php0000664000175000017500000003702613124445427016242 0ustar ashnazgashnazg * @copyright 2005-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.1 */ @@ -16007,7 +16035,7 @@ $gen->toPackageFile('.'); } } -PEAR-1.10.4/PEAR/Command/Registry.xml0000664000175000017500000000337613100165201016633 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Registry.xml0000664000175000017500000000337613124445427016655 0ustar ashnazgashnazg List Installed Packages In The Default Channel doList @@ -16064,7 +16092,7 @@ local package file, an URL to a package file, or the name of an installed package. -PEAR-1.10.4/PEAR/Command/Registry.php0000664000175000017500000013226213100165201016617 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Registry.php0000664000175000017500000013226213124445427016641 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -17208,7 +17236,7 @@ $this->ui->outputData($data, 'package-info'); } } -PEAR-1.10.4/PEAR/Command/Remote.xml0000664000175000017500000000635713100165201016260 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Remote.xml0000664000175000017500000000635713124445427016302 0ustar ashnazgashnazg Information About Remote Packages doRemoteInfo @@ -17316,7 +17344,7 @@ parameter. -PEAR-1.10.4/PEAR/Command/Remote.php0000664000175000017500000007243613100165201016250 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Remote.php0000664000175000017500000007243613124445427016272 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -18125,7 +18153,7 @@ return $num; } } -PEAR-1.10.4/PEAR/Command/Test.xml0000664000175000017500000000315113100165201015731 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Command/Test.xml0000664000175000017500000000315113124445427015753 0ustar ashnazgashnazg Run Regression Tests doRunTests @@ -18178,7 +18206,7 @@ [testfile|dir ...] Run regression tests with PHP's regression testing script (run-tests.php). -PEAR-1.10.4/PEAR/Command/Test.php0000664000175000017500000002754713100165201015737 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Command/Test.php0000664000175000017500000002754713124445427015761 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -18521,7 +18549,7 @@ return $this->raiseError('Some tests failed'); } } -PEAR-1.10.4/PEAR/Downloader/Package.php0000664000175000017500000022460413100165201017064 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -20502,7 +20530,7 @@ return $info; } } -PEAR-1.10.4/PEAR/Frontend/CLI.php0000664000175000017500000006211413100165201015615 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -21252,7 +21280,7 @@ print $text; } } -PEAR-1.10.4/PEAR/Installer/Role/Common.php0000664000175000017500000001410613100165201017513 0ustar ashnazgashnazg * @copyright 1997-2006 The PHP Group * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -21425,7 +21453,7 @@ } } ?> -PEAR-1.10.4/PEAR/Installer/Role/Cfg.xml0000664000175000017500000000064513100165201016776 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Installer/Role/Cfg.xml0000664000175000017500000000064513124445427017020 0ustar ashnazgashnazg php extsrc extbin @@ -21439,7 +21467,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Cfg.php0000664000175000017500000000757613100165201016777 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Cfg.php0000664000175000017500000000757613124445427017021 0ustar ashnazgashnazg * @copyright 2007-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.7.0 */ @@ -21543,7 +21571,7 @@ return $test; } -}PEAR-1.10.4/PEAR/Installer/Role/Data.xml0000664000175000017500000000062213100165201017143 0ustar ashnazgashnazg +}PEAR-1.10.5/PEAR/Installer/Role/Data.xml0000664000175000017500000000062213124445427017165 0ustar ashnazgashnazg php extsrc extbin @@ -21557,7 +21585,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Data.php0000664000175000017500000000141613100165201017134 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Data.php0000664000175000017500000000141613124445427017156 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Doc.xml0000664000175000017500000000062113100165201016776 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Doc.xml0000664000175000017500000000062113124445427017020 0ustar ashnazgashnazg php extsrc extbin @@ -21597,7 +21625,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Doc.php0000664000175000017500000000141413100165201016766 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Doc.php0000664000175000017500000000141413124445427017010 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Ext.xml0000664000175000017500000000050213100165201017027 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Ext.xml0000664000175000017500000000050213124445427017051 0ustar ashnazgashnazg extbin zendextbin 1 @@ -21634,7 +21662,7 @@ 1 -PEAR-1.10.4/PEAR/Installer/Role/Ext.php0000664000175000017500000000141413100165201017021 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Ext.php0000664000175000017500000000141413124445427017043 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Man.xml0000664000175000017500000000064513100165201017012 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Man.xml0000664000175000017500000000064513124445427017034 0ustar ashnazgashnazg php extsrc extbin @@ -21675,7 +21703,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Man.php0000664000175000017500000000144413100165201016777 0ustar ashnazgashnazg * @copyright 2011 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.10.0 */ class PEAR_Installer_Role_Man extends PEAR_Installer_Role_Common {} ?> -PEAR-1.10.4/PEAR/Installer/Role/Php.xml0000664000175000017500000000065513100165201017027 0ustar ashnazgashnazg +PEAR-1.10.5/PEAR/Installer/Role/Php.xml0000664000175000017500000000065513124445427017051 0ustar ashnazgashnazg php extsrc extbin @@ -21717,7 +21745,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Php.php0000664000175000017500000000141413100165201017010 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Php.php0000664000175000017500000000141413124445427017032 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Script.xml0000664000175000017500000000066013100165201017540 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Script.xml0000664000175000017500000000066013124445427017562 0ustar ashnazgashnazg php extsrc extbin @@ -21757,7 +21785,7 @@ 1 -PEAR-1.10.4/PEAR/Installer/Role/Script.php0000664000175000017500000000142213100165201017524 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Script.php0000664000175000017500000000142213124445427017546 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Script extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Src.xml0000664000175000017500000000044213100165201017021 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Src.xml0000664000175000017500000000044213124445427017043 0ustar ashnazgashnazg extsrc zendextsrc 1 @@ -21794,7 +21822,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Src.php0000664000175000017500000000156113100165201017013 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Src.php0000664000175000017500000000156113124445427017035 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -21826,7 +21854,7 @@ $installer->source_files++; } } -?>PEAR-1.10.4/PEAR/Installer/Role/Test.xml0000664000175000017500000000062213100165201017211 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Test.xml0000664000175000017500000000062213124445427017233 0ustar ashnazgashnazg php extsrc extbin @@ -21840,7 +21868,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Test.php0000664000175000017500000000141613100165201017202 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Test.php0000664000175000017500000000141613124445427017224 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role/Www.xml0000664000175000017500000000064413100165201017062 0ustar ashnazgashnazg +?>PEAR-1.10.5/PEAR/Installer/Role/Www.xml0000664000175000017500000000064413124445427017104 0ustar ashnazgashnazg php extsrc extbin @@ -21880,7 +21908,7 @@ -PEAR-1.10.4/PEAR/Installer/Role/Www.php0000664000175000017500000000141013100165201017041 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role/Www.php0000664000175000017500000000141013124445427017063 0ustar ashnazgashnazg * @copyright 2007-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.7.0 */ class PEAR_Installer_Role_Www extends PEAR_Installer_Role_Common {} -?>PEAR-1.10.4/PEAR/Installer/Role.php0000664000175000017500000001727313100165201016273 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Installer/Role.php0000664000175000017500000001727313124445427016315 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -22171,7 +22199,7 @@ PEAR_Installer_Role::getValidRoles('****', true); return true; } -}PEAR-1.10.4/PEAR/PackageFile/Generator/v1.php0000664000175000017500000014214513100165201020041 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -22218,7 +22246,7 @@ function getPackagerVersion() { - return '1.10.4'; + return '1.10.5'; } /** @@ -22369,7 +22397,7 @@ ); $ret = "\n"; $ret .= "\n"; - $ret .= "\n" . + $ret .= "\n" . " $pkginfo[package]"; if (isset($pkginfo['extends'])) { $ret .= "\n$pkginfo[extends]"; @@ -23455,7 +23483,7 @@ } } ?> -PEAR-1.10.4/PEAR/PackageFile/Generator/v2.php0000664000175000017500000010070613100165201020037 0ustar ashnazgashnazgoptions['beautifyFilelist'] = true; } - $arr['attribs']['packagerversion'] = '1.10.4'; + $arr['attribs']['packagerversion'] = '1.10.5'; if ($this->serialize($arr, $options)) { return $this->_serializedData . "\n"; } @@ -24341,7 +24369,7 @@ return $tag; } } -PEAR-1.10.4/PEAR/PackageFile/Parser/v1.php0000664000175000017500000004020713100165201017343 0ustar ashnazgashnazgPEAR-1.10.4/PEAR/PackageFile/Parser/v2.php0000664000175000017500000000611013100165201017337 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/PackageFile/Parser/v2.php0000664000175000017500000000611013124445427017361 0ustar ashnazgashnazgsetPackagefile($file, $archive); return $ret; } -}PEAR-1.10.4/PEAR/PackageFile/v2/rw.php0000664000175000017500000017313613100165201016550 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a8 */ @@ -26511,7 +26539,7 @@ { unset($this->_packageInfo['changelog']); } -}PEAR-1.10.4/PEAR/PackageFile/v2/Validator.php0000664000175000017500000024617213100165201020046 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a8 * @access private @@ -26624,8 +26652,8 @@ isset($test['dependencies']['required']) && isset($test['dependencies']['required']['pearinstaller']) && isset($test['dependencies']['required']['pearinstaller']['min']) && - '1.10.4' != '@package' . '_version@' && - version_compare('1.10.4', + '1.10.5' != '@package' . '_version@' && + version_compare('1.10.5', $test['dependencies']['required']['pearinstaller']['min'], '<') ) { $this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']); @@ -27863,7 +27891,7 @@ $this->_stack->push(__FUNCTION__, 'error', array('version' => $version), 'This package.xml requires PEAR version %version% to parse properly, we are ' . - 'version 1.10.4'); + 'version 1.10.5'); } function _invalidTagOrder($oktags, $actual, $root) @@ -28646,7 +28674,7 @@ return $providesret; } } -PEAR-1.10.4/PEAR/PackageFile/v1.php0000664000175000017500000014266613100165201016123 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -30248,7 +30276,7 @@ // }}} } ?> -PEAR-1.10.4/PEAR/PackageFile/v2.php0000664000175000017500000021046513100165201016115 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -32307,7 +32335,7 @@ } } ?> -PEAR-1.10.4/PEAR/REST/10.php0000664000175000017500000007762013100165201014434 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a12 */ @@ -33177,7 +33205,7 @@ } } } -PEAR-1.10.4/PEAR/REST/11.php0000664000175000017500000002575013100165201014432 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.3 */ @@ -33517,7 +33545,7 @@ } } ?> -PEAR-1.10.4/PEAR/REST/13.php0000664000175000017500000003542613100165201014435 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a12 */ @@ -33912,7 +33940,7 @@ return $ret; } -}PEAR-1.10.4/PEAR/Task/Postinstallscript/rw.php0000664000175000017500000001403313100165201020517 0ustar ashnazgashnazg - read/write version * @@ -33937,7 +33965,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a10 */ @@ -34094,7 +34122,7 @@ ); } } -PEAR-1.10.4/PEAR/Task/Replace/rw.php0000664000175000017500000000302613100165201016331 0ustar ashnazgashnazg - read/write version * @@ -34119,7 +34147,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a10 */ @@ -34153,7 +34181,7 @@ return $this->_params; } } -PEAR-1.10.4/PEAR/Task/Unixeol/rw.php0000664000175000017500000000243313100165201016402 0ustar ashnazgashnazg - read/write version * @@ -34178,7 +34206,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a10 */ @@ -34208,7 +34236,7 @@ } } ?> -PEAR-1.10.4/PEAR/Task/Windowseol/rw.php0000664000175000017500000000245013100165201017110 0ustar ashnazgashnazg - read/write version * @@ -34234,7 +34262,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a10 */ @@ -34264,7 +34292,7 @@ } } ?> -PEAR-1.10.4/PEAR/Task/Common.php0000664000175000017500000001403613100165201015561 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 * @abstract @@ -34471,7 +34499,7 @@ return PEAR::raiseError($msg, $code); } } -PEAR-1.10.4/PEAR/Task/Postinstallscript.php0000664000175000017500000003456713100165201020105 0ustar ashnazgashnazg * @@ -34500,7 +34528,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -34821,7 +34849,7 @@ { } } -PEAR-1.10.4/PEAR/Task/Replace.php0000664000175000017500000001537013100165201015706 0ustar ashnazgashnazg * @@ -34846,7 +34874,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -35007,7 +35035,7 @@ return $contents; } } -PEAR-1.10.4/PEAR/Task/Unixeol.php0000664000175000017500000000437613100165201015762 0ustar ashnazgashnazg * @@ -35032,7 +35060,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -35086,7 +35114,7 @@ return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents); } } -PEAR-1.10.4/PEAR/Task/Windowseol.php0000664000175000017500000000436213100165201016464 0ustar ashnazgashnazg * @@ -35112,7 +35140,7 @@ * @author Greg Beaver * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -35166,7 +35194,7 @@ return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents); } } -PEAR-1.10.4/PEAR/Validator/PECL.php0000664000175000017500000000407013100165201016074 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a5 */ @@ -35227,7 +35255,7 @@ return $ret; } } -?>PEAR-1.10.4/PEAR/Builder.php0000664000175000017500000004136013100165201015015 0ustar ashnazgashnazgPEAR-1.10.5/PEAR/Builder.php0000664000175000017500000004136013124445427015037 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since PHP 4.0.2 * @see http://pear.php.net/manual/en/core.ppm.pear-builder.php @@ -35614,7 +35642,7 @@ if (!file_exists($build_dir) || !is_dir($build_dir) || !chdir($build_dir)) { return $this->raiseError("could not chdir to $build_dir"); } - putenv('PHP_PEAR_VERSION=1.10.4'); + putenv('PHP_PEAR_VERSION=1.10.5'); foreach ($to_run as $cmd) { $err = $this->_runCommand($cmd, $callback); if (PEAR::isError($err)) { @@ -35726,7 +35754,7 @@ return parent::log($level, $msg, $append_crlf); } } -PEAR-1.10.4/PEAR/ChannelFile.php0000664000175000017500000014323313100165201015601 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -37286,7 +37314,7 @@ return time(); } } -PEAR-1.10.4/PEAR/Command.php0000664000175000017500000003021213100165201014777 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -37674,7 +37702,7 @@ return false; } // }}} -}PEAR-1.10.4/PEAR/Common.php0000664000175000017500000006351513100165201014665 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 * @deprecated This class will disappear, and its components will be spread @@ -38512,7 +38540,7 @@ require_once 'PEAR/Config.php'; require_once 'PEAR/PackageFile.php'; -PEAR-1.10.4/PEAR/Config.php0000664000175000017500000020754113100165201014641 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -40643,7 +40671,7 @@ } } } -PEAR-1.10.4/PEAR/DependencyDB.php0000664000175000017500000005677013100165201015726 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -41407,7 +41435,7 @@ } } } -PEAR-1.10.4/PEAR/Dependency2.php0000664000175000017500000014237513100165201015577 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -41949,7 +41977,7 @@ */ function getPEARVersion() { - return '1.10.4'; + return '1.10.5'; } function validatePearinstallerDependency($dep) @@ -42764,7 +42792,7 @@ $this->_currentPackage, true))); } } -PEAR-1.10.4/PEAR/Downloader.php0000664000175000017500000020041113100165201015517 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.3.0 */ @@ -44401,7 +44429,7 @@ } $request .= $ifmodifiedsince . - "User-Agent: PEAR/1.10.4/PHP/" . PHP_VERSION . "\r\n"; + "User-Agent: PEAR/1.10.5/PHP/" . PHP_VERSION . "\r\n"; if ($object !== null) { // only pass in authentication for non-static calls $username = $config->get('username', null, $channel); @@ -44527,7 +44555,7 @@ return $dest_file; } } -PEAR-1.10.4/PEAR/ErrorStack.php0000664000175000017500000010200413100165201015477 0ustar ashnazgashnazg * @author Greg Beaver - * @version 1.10.4 + * @version 1.10.5 * @package PEAR_ErrorStack * @category Debugging * @copyright 2004-2008 Greg Beaver @@ -45506,7 +45534,7 @@ $stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack'); $stack->pushCallback(array('PEAR_ErrorStack', '_handleError')); ?> -PEAR-1.10.4/PEAR/Exception.php0000664000175000017500000003315413100165201015367 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.3.3 * @@ -45893,7 +45921,7 @@ } return $causeMsg . $this->getTraceAsString(); } -}PEAR-1.10.4/PEAR/Frontend.php0000664000175000017500000001476113100165201015213 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -46115,7 +46143,7 @@ function userDialog($command, $prompts, $types = array(), $defaults = array()) { } -}PEAR-1.10.4/PEAR/Installer.php0000664000175000017500000020744613100165201015375 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -47909,7 +47937,7 @@ // }}} } -PEAR-1.10.4/PEAR/PackageFile.php0000664000175000017500000003673613100165201015575 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -48400,7 +48428,7 @@ return $info; } } -PEAR-1.10.4/PEAR/Packager.php0000664000175000017500000001703713100165201015150 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 0.1 */ @@ -48599,7 +48627,7 @@ return $dest_package; } -}PEAR-1.10.4/PEAR/Proxy.php0000664000175000017500000001256113100165201014551 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -51174,7 +51202,7 @@ return $ret; } } -PEAR-1.10.4/PEAR/REST.php0000664000175000017500000004071713100165201014211 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -51560,7 +51588,7 @@ } $request .= $ifmodifiedsince . - "User-Agent: PEAR/1.10.4/PHP/" . PHP_VERSION . "\r\n"; + "User-Agent: PEAR/1.10.5/PHP/" . PHP_VERSION . "\r\n"; $username = $this->config->get('username', null, $channel); $password = $this->config->get('password', null, $channel); @@ -51649,7 +51677,7 @@ return $data; } } -PEAR-1.10.4/PEAR/RunTest.php0000664000175000017500000010617713100165201015043 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.3.3 */ @@ -52621,7 +52649,7 @@ } } } -PEAR-1.10.4/PEAR/Validate.php0000664000175000017500000005276413100165201015172 0ustar ashnazgashnazg * @copyright 1997-2009 The Authors * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: 1.10.4 + * @version Release: 1.10.5 * @link http://pear.php.net/package/PEAR * @since Class available since Release 1.4.0a1 */ @@ -53245,7 +53273,7 @@ { return true; } -}PEAR-1.10.4/PEAR/XMLParser.php0000664000175000017500000001537613100165201015254 0ustar ashnazgashnazg_dataStack[$this->_depth] .= $cdata; } -}PEAR-1.10.4/scripts/pear.bat0000775000175000017500000001036113100165201015275 0ustar ashnazgashnazg@ECHO OFF +}PEAR-1.10.5/scripts/pear.bat0000775000175000017500000001036113124445427015317 0ustar ashnazgashnazg@ECHO OFF REM ---------------------------------------------------------------------- REM PHP version 5 @@ -53601,7 +53629,7 @@ :RUN "%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d register_argc_argv="On" -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9 :END -@ECHO ONPEAR-1.10.4/scripts/peardev.bat0000664000175000017500000001113713100165201015773 0ustar ashnazgashnazg@ECHO OFF +@ECHO ONPEAR-1.10.5/scripts/peardev.bat0000664000175000017500000001113713124445427016015 0ustar ashnazgashnazg@ECHO OFF REM ---------------------------------------------------------------------- REM PHP version 5 @@ -53715,7 +53743,7 @@ :RUN "%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -d output_buffering=1 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9 :END -@ECHO ONPEAR-1.10.4/scripts/pecl.bat0000664000175000017500000001103013100165201015260 0ustar ashnazgashnazg@ECHO OFF +@ECHO ONPEAR-1.10.5/scripts/pecl.bat0000664000175000017500000001103013124445427015302 0ustar ashnazgashnazg@ECHO OFF REM ---------------------------------------------------------------------- REM PHP version 5 @@ -53829,7 +53857,7 @@ :RUN "%PHP_PEAR_PHP_BIN%" -C -n -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9 :END -@ECHO ONPEAR-1.10.4/scripts/pear.sh0000775000175000017500000000140413100165201015137 0ustar ashnazgashnazg#!/bin/sh +@ECHO ONPEAR-1.10.5/scripts/pear.sh0000775000175000017500000000140413124445427015161 0ustar ashnazgashnazg#!/bin/sh # first find which PHP binary to use if test "x$PHP_PEAR_PHP_BIN" != "x"; then @@ -53857,7 +53885,7 @@ fi exec $PHP -C -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@" -PEAR-1.10.4/scripts/peardev.sh0000775000175000017500000000143113100165201015636 0ustar ashnazgashnazg#!/bin/sh +PEAR-1.10.5/scripts/peardev.sh0000775000175000017500000000143113124445427015660 0ustar ashnazgashnazg#!/bin/sh # first find which PHP binary to use if test "x$PHP_PEAR_PHP_BIN" != "x"; then @@ -53885,7 +53913,7 @@ fi exec $PHP -d date.timezone=UTC -d memory_limit="-1" -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d variables_order=EGPCS -d auto_append_file="" $INCDIR/pearcmd.php "$@" -PEAR-1.10.4/scripts/pecl.sh0000775000175000017500000000130513100165201015133 0ustar ashnazgashnazg#!/bin/sh +PEAR-1.10.5/scripts/pecl.sh0000775000175000017500000000130513124445427015155 0ustar ashnazgashnazg#!/bin/sh # first find which PHP binary to use if test "x$PHP_PEAR_PHP_BIN" != "x"; then @@ -53913,7 +53941,7 @@ fi exec $PHP -C -n -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d safe_mode=0 -d register_argc_argv="On" $INCDIR/peclcmd.php "$@" -PEAR-1.10.4/scripts/pearcmd.php0000664000175000017500000003551013100165201016002 0ustar ashnazgashnazg -PEAR-1.10.4/LICENSE0000664000175000017500000000270513100165201013174 0ustar ashnazgashnazgCopyright (c) 1997-2009, +PEAR-1.10.5/LICENSE0000664000175000017500000000270513124445427013216 0ustar ashnazgashnazgCopyright (c) 1997-2009, Stig Bakken , Gregory Beaver , Helgi Þormar Þorbjörnsson , @@ -54479,7 +54507,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PEAR-1.10.4/INSTALL0000664000175000017500000000417013100165201013216 0ustar ashnazgashnazgPEAR - The PEAR Installer +PEAR-1.10.5/INSTALL0000664000175000017500000000417013124445427013240 0ustar ashnazgashnazgPEAR - The PEAR Installer ========================= Installing the PEAR Installer. @@ -54531,7 +54559,7 @@ related issues. Happy PHPing, we hope PEAR will be a great tool for your development work! -PEAR-1.10.4/package.dtd0000664000175000017500000000647713100165201014271 0ustar ashnazgashnazg